diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 02a34a2541eb..088dd23ebb4d 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -1,18918 +1,18921 @@
 #
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS, MOVED_LIBS)
 # and directories (OLD_DIRS) which should get removed after an update.
 # Recently removed entries should be listed first (with the date as a
 # comment). OLD_LIBS and MOVED_LIBS should only list dynamic libraries.
 # Static libraries, links to dynamic libraries (lib*.so), and linker scripts
 # should be listed in OLD_FILES. OLD_LIBS and MOVED_LIBS are removed by the
 # delete-old-libs target, whereas OLD_FILES and OLD_DIRS are removed by the
 # delete-old target. This separation allows users to avoid deleting old
 # dynamic libraries still required by existing binaries.
 #
 # MOVED_LIBS should be used instead of OLD_LIBS when a library is moved
 # from usr/lib to lib or vice versa.  This avoids removing libraries for
 # alternate ABIs (such as lib32) which store all libraries in a single
 # directory (e.g. usr/lib32).
 #
 # For files listed in OLD_FILES, OLD_LIBS, and MOVED_LIBS, the check-old*
 # and delete-old* targets will also delete associated debug symbols from
 # usr/lib/debug.
 #
 # In case of a complete directory hierarchy the sorting is in depth first
 # order.
 #
 # Files that are installed or removed depending on some build option
 # should be listed in /usr/src/tools/build/mk/OptionalObsoleteFiles.inc
 # instead of in this file.
 #
 # Before you commit changes to this file please check if any entries in
 # tools/build/mk/OptionalObsoleteFiles.inc can be removed. The following
 # command tells which files are listed more than once regardless of some
 # architecture specific conditionals, so you can not blindly trust the
 # output:
 # ( grep '+=' /usr/src/ObsoleteFiles.inc | sort -u ; \
 # grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \
 # sort | uniq -d
 #
 # To find regular duplicates not dependent on optional components, you can
 # also use something that will not give you false positives, e.g.:
 # for t in `make -V TARGETS universe`; do
 #   __MAKE_CONF=/dev/null make -f Makefile.inc1 TARGET=$t \
 #   -V OLD_FILES -V OLD_LIBS -V MOVED_LIBS -V OLD_DIRS check-old | \
 #   xargs -n1 | sort | uniq -d;
 # done
 #
 # For optional components, you can use the following to see if some entries
 # in OptionalObsoleteFiles.inc have been obsoleted by ObsoleteFiles.inc
 # for o in tools/build/options/WITH*; do
 #   __MAKE_CONF=/dev/null make -f Makefile.inc1 -D${o##*/} \
 #   -V OLD_FILES -V OLD_LIBS -V MOVED_LIBS -V OLD_DIRS check-old | \
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20240726: deprecate contigfree(9)
+OLD_FILES+=usr/share/man/man9/contigfree.9.gz
+
 # 20240721: retire vm_page_alloc_freelist
 OLD_FILES+=usr/share/man/man9/vm_page_alloc_freelist.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_alloc_freelist_domain.9.gz
 
 # 20240716: retire mergemaster
 OLD_FILES+=usr/sbin/mergemaster
 OLD_FILES+=usr/share/man/man8/mergemaster.8.gz
 
 # 20240527: csh: Remove hardlink /.cshrc
 OLD_FILES+=.cshrc
 
 # 20240511: move file system driver manuals to section four
 OLD_FILES+=usr/share/man/man5/autofs.5.gz
 OLD_FILES+=usr/share/man/man5/cd9660.5.gz
 OLD_FILES+=usr/share/man/man5/devfs.5.gz
 OLD_FILES+=usr/share/man/man5/ext2fs.5.gz
 OLD_FILES+=usr/share/man/man5/ext4fs.5.gz
 OLD_FILES+=usr/share/man/man5/fdescfs.5.gz
 OLD_FILES+=usr/share/man/man5/fusefs.5.gz
 OLD_FILES+=usr/share/man/man5/lindebugfs.5.gz
 OLD_FILES+=usr/share/man/man5/linprocfs.5.gz
 OLD_FILES+=usr/share/man/man5/linsysfs.5.gz
 OLD_FILES+=usr/share/man/man5/mqueuefs.5.gz
 OLD_FILES+=usr/share/man/man5/msdosfs.5.gz
 OLD_FILES+=usr/share/man/man5/msdos.5.gz
 OLD_FILES+=usr/share/man/man5/nullfs.5.gz
 OLD_FILES+=usr/share/man/man5/procfs.5.gz
 OLD_FILES+=usr/share/man/man5/smbfs.5.gz
 OLD_FILES+=usr/share/man/man5/tarfs.5.gz
 OLD_FILES+=usr/share/man/man5/tmpfs.5.gz
 OLD_FILES+=usr/share/man/man5/unionfs.5.gz
 OLD_FILES+=usr/share/man/man7/ffs.7.gz
 
 # 20240508: Remove remnants of portsnap(8)
 OLD_DIRS+=var/db/portsnap
 
 # 20240507: remove gbde
 OLD_FILES+=boot/kernel/geom_bde.ko
 OLD_FILES+=etc/rc.d/gbde
 OLD_FILES+=sbin/gbde
 OLD_FILES+=usr/share/man/man4/gbde.4.gz
 OLD_FILES+=usr/share/man/man8/gbde.8.gz
 
 # 20240422: remove improperly installed libcxxrt.so.1
 MOVED_LIBS+=usr/lib/libcxxrt.so.1
 
 # 20240414: unix_socketpair_test renamed
 OLD_FILES+=usr/tests/sys/kern/unix_socketpair_test
 
 # 20240406: new clang import which bumps version from 17 to 18
 OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/17/include/__clang_cuda_texture_intrinsics.h
 OLD_FILES+=usr/lib/clang/17/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/17/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/17/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/17/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/17/include/__clang_hip_stdlib.h
 OLD_FILES+=usr/lib/clang/17/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/17/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/17/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/17/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/17/include/altivec.h
 OLD_FILES+=usr/lib/clang/17/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/17/include/amxcomplexintrin.h
 OLD_FILES+=usr/lib/clang/17/include/amxfp16intrin.h
 OLD_FILES+=usr/lib/clang/17/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/17/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/17/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/17/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/17/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/17/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/17/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/17/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/17/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/17/include/arm_neon_sve_bridge.h
 OLD_FILES+=usr/lib/clang/17/include/arm_sme_draft_spec_subject_to_change.h
 OLD_FILES+=usr/lib/clang/17/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/17/include/armintr.h
 OLD_FILES+=usr/lib/clang/17/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512fp16intrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vlfp16intrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avxifmaintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avxneconvertintrin.h
 OLD_FILES+=usr/lib/clang/17/include/avxvnniint16intrin.h
 OLD_FILES+=usr/lib/clang/17/include/avxvnniint8intrin.h
 OLD_FILES+=usr/lib/clang/17/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/17/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/17/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/17/include/builtins.h
 OLD_FILES+=usr/lib/clang/17/include/cet.h
 OLD_FILES+=usr/lib/clang/17/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/17/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/17/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/17/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/17/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/17/include/cmpccxaddintrin.h
 OLD_FILES+=usr/lib/clang/17/include/cpuid.h
 OLD_FILES+=usr/lib/clang/17/include/crc32intrin.h
 OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/basic_string.h
 OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/basic_string.tcc
 OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/bits/shared_ptr_base.h
 OLD_DIRS+=usr/lib/clang/17/include/cuda_wrappers/bits
 OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/cmath
 OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/new
 OLD_FILES+=usr/lib/clang/17/include/cuda_wrappers/shared_ptr_base.h
 OLD_DIRS+=usr/lib/clang/17/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/17/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/17/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/17/include/float.h
 OLD_FILES+=usr/lib/clang/17/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/17/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/17/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/17/include/fuzzer
 OLD_FILES+=usr/lib/clang/17/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/17/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/17/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/17/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/17/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/17/include/hlsl/hlsl_basic_types.h
 OLD_FILES+=usr/lib/clang/17/include/hlsl/hlsl_intrinsics.h
 OLD_DIRS+=usr/lib/clang/17/include/hlsl
 OLD_FILES+=usr/lib/clang/17/include/hlsl.h
 OLD_FILES+=usr/lib/clang/17/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/17/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/17/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/17/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/17/include/immintrin.h
 OLD_FILES+=usr/lib/clang/17/include/intrin.h
 OLD_FILES+=usr/lib/clang/17/include/inttypes.h
 OLD_FILES+=usr/lib/clang/17/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/17/include/iso646.h
 OLD_FILES+=usr/lib/clang/17/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/17/include/larchintrin.h
 OLD_FILES+=usr/lib/clang/17/include/limits.h
 OLD_FILES+=usr/lib/clang/17/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/17/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/17/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/17/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/17/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/module.modulemap
 OLD_FILES+=usr/lib/clang/17/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/17/include/msa.h
 OLD_FILES+=usr/lib/clang/17/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/17/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/17/include/omp.h
 OLD_FILES+=usr/lib/clang/17/include/ompt.h
 OLD_FILES+=usr/lib/clang/17/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/17/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/17/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/17/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/17/include/orc_rt/c_api.h
 OLD_DIRS+=usr/lib/clang/17/include/orc_rt
 OLD_FILES+=usr/lib/clang/17/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/17/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/17/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/bmiintrin.h
 OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/immintrin.h
 OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/x86intrin.h
 OLD_FILES+=usr/lib/clang/17/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/17/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/17/include/prfchiintrin.h
 OLD_FILES+=usr/lib/clang/17/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/17/include/profile/InstrProfData.inc
 OLD_FILES+=usr/lib/clang/17/include/profile/MemProfData.inc
 OLD_DIRS+=usr/lib/clang/17/include/profile
 OLD_FILES+=usr/lib/clang/17/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/17/include/raointintrin.h
 OLD_FILES+=usr/lib/clang/17/include/rdpruintrin.h
 OLD_FILES+=usr/lib/clang/17/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/17/include/riscv_ntlh.h
 OLD_FILES+=usr/lib/clang/17/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/17/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/17/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/17/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/17/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/17/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/17/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/17/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/17/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/17/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/17/include/sanitizer/memprof_interface.h
 OLD_FILES+=usr/lib/clang/17/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/17/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/17/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/17/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/17/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/17/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/17/include/sanitizer
 OLD_FILES+=usr/lib/clang/17/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/17/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/17/include/sha512intrin.h
 OLD_FILES+=usr/lib/clang/17/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/17/include/sifive_vector.h
 OLD_FILES+=usr/lib/clang/17/include/sm3intrin.h
 OLD_FILES+=usr/lib/clang/17/include/sm4intrin.h
 OLD_FILES+=usr/lib/clang/17/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/stdalign.h
 OLD_FILES+=usr/lib/clang/17/include/stdarg.h
 OLD_FILES+=usr/lib/clang/17/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/17/include/stdbool.h
 OLD_FILES+=usr/lib/clang/17/include/stddef.h
 OLD_FILES+=usr/lib/clang/17/include/stdint.h
 OLD_FILES+=usr/lib/clang/17/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/17/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/tgmath.h
 OLD_FILES+=usr/lib/clang/17/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/17/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/17/include/unwind.h
 OLD_FILES+=usr/lib/clang/17/include/vadefs.h
 OLD_FILES+=usr/lib/clang/17/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/17/include/varargs.h
 OLD_FILES+=usr/lib/clang/17/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/17/include/velintrin.h
 OLD_FILES+=usr/lib/clang/17/include/velintrin_approx.h
 OLD_FILES+=usr/lib/clang/17/include/velintrin_gen.h
 OLD_FILES+=usr/lib/clang/17/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/17/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/17/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/17/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/17/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/17/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/17/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/17/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/17/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/17/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/17/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/17/include/xray
 OLD_FILES+=usr/lib/clang/17/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/17/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/17/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/17/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/17/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/17/include
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-powerpc64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-powerpc64.so
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-powerpc64le.so
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-powerpc64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-riscv64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-riscv64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-riscv64.so
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-riscv64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-i386.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-powerpc64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-riscv64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.asan_static-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_interceptors-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan-powerpc64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-riscv64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-powerpc64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-riscv64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-powerpc64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-riscv64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan-powerpc64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-riscv64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-riscv64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-riscv64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-basic-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-fdr-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-profiling-powerpc64le.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/17/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/17/lib/freebsd
 OLD_DIRS+=usr/lib/clang/17/lib
 OLD_FILES+=usr/lib/clang/17/share/asan_ignorelist.txt
 OLD_FILES+=usr/lib/clang/17/share/cfi_ignorelist.txt
 OLD_FILES+=usr/lib/clang/17/share/msan_ignorelist.txt
 OLD_DIRS+=usr/lib/clang/17/share
 OLD_DIRS+=usr/lib/clang/17
 
 # 20240406: new libc++ import which bumps version from 17 to 18
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/algorithm_fwd.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/algorithm_impl.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/execution_defs.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/execution_impl.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/glue_algorithm_defs.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/glue_algorithm_impl.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/glue_memory_defs.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/glue_memory_impl.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/glue_numeric_defs.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/glue_numeric_impl.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/memory_impl.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/numeric_fwd.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/numeric_impl.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_for.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_for_each.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_invoke.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_merge.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_scan.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_stable_partial_sort.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_stable_sort.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_transform_reduce.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/parallel_transform_scan.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/omp/util.h
 OLD_DIRS+=usr/include/c++/v1/__pstl/internal/omp
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/parallel_backend.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/parallel_backend_omp.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/parallel_backend_serial.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/parallel_backend_tbb.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/parallel_backend_utils.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/unseq_backend_simd.h
 OLD_FILES+=usr/include/c++/v1/__pstl/internal/utils.h
 OLD_DIRS+=usr/include/c++/v1/__pstl/internal
 OLD_DIRS+=usr/include/c++/v1/__pstl
 OLD_FILES+=usr/include/c++/v1/__pstl_algorithm
 OLD_FILES+=usr/include/c++/v1/__pstl_memory
 OLD_FILES+=usr/include/c++/v1/__pstl_numeric
 OLD_FILES+=usr/include/c++/v1/__type_traits/predicate_traits.h
 OLD_FILES+=usr/include/c++/v1/__utility/terminate_on_exception.h
 OLD_FILES+=usr/include/c++/v1/experimental/deque
 OLD_FILES+=usr/include/c++/v1/experimental/forward_list
 OLD_FILES+=usr/include/c++/v1/experimental/list
 OLD_FILES+=usr/include/c++/v1/experimental/map
 OLD_FILES+=usr/include/c++/v1/experimental/memory_resource
 OLD_FILES+=usr/include/c++/v1/experimental/regex
 OLD_FILES+=usr/include/c++/v1/experimental/set
 OLD_FILES+=usr/include/c++/v1/experimental/string
 OLD_FILES+=usr/include/c++/v1/experimental/unordered_map
 OLD_FILES+=usr/include/c++/v1/experimental/unordered_set
 OLD_FILES+=usr/include/c++/v1/experimental/vector
 OLD_FILES+=usr/include/c++/v1/limits.h
 OLD_FILES+=usr/include/c++/v1/setjmp.h
 
 # 20240321: remove empty /usr/libdata/gcc directory
 OLD_DIRS+=usr/libdata/gcc
 
 # 20240307: Improperly installed awk tests removed
 OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/missing-precision.ok
 OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/negative-nf.ok
 OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/pfile-overflow.ok
 OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.awk
 OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.bad
 OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.ok
 OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.ok2
 
 # 20240211: caroot bundle updated
 OLD_FILES+=usr/share/certs/trusted/Security_Communication_Root_CA.pem
 
 # 20240122: callout_async_drain() removed
 OLD_FILES+=usr/share/man/man9/callout_async_drain.9.gz
 
 # 20240114: Removal of geom_map(4)
 OLD_FILES+=usr/share/man/man4/geom_map.4
 
 # 20240112: remove pmap_init2()
 OLD_FILES+=usr/share/man/man9/pmap_init2.9.gz
 
 # 20240112: remove pmap_pinit2()
 OLD_FILES+=usr/share/man/man9/pmap_pinit2.9.gz
 
 # 20240112: replaced NetBSD tests for uniq with our own
 OLD_FILES+=usr/tests/usr.bin/uniq/d_basic.in
 OLD_FILES+=usr/tests/usr.bin/uniq/d_basic.out
 OLD_FILES+=usr/tests/usr.bin/uniq/d_counts.out
 OLD_FILES+=usr/tests/usr.bin/uniq/d_input.in
 OLD_FILES+=usr/tests/usr.bin/uniq/d_show_duplicates.out
 OLD_FILES+=usr/tests/usr.bin/uniq/d_show_uniques.out
 
 # 20231208: new clang import which bumps version from 16 to 17
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_cuda_texture_intrinsics.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/16/include/__clang_hip_stdlib.h
 OLD_FILES+=usr/lib/clang/16/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/16/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/16/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/16/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/16/include/altivec.h
 OLD_FILES+=usr/lib/clang/16/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/16/include/amxfp16intrin.h
 OLD_FILES+=usr/lib/clang/16/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/16/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/16/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/16/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/16/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/16/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/16/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/16/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/16/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/16/include/arm_neon_sve_bridge.h
 OLD_FILES+=usr/lib/clang/16/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/16/include/armintr.h
 OLD_FILES+=usr/lib/clang/16/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512fp16intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlfp16intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avxifmaintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avxneconvertintrin.h
 OLD_FILES+=usr/lib/clang/16/include/avxvnniint8intrin.h
 OLD_FILES+=usr/lib/clang/16/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/16/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/16/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/16/include/builtins.h
 OLD_FILES+=usr/lib/clang/16/include/cet.h
 OLD_FILES+=usr/lib/clang/16/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/16/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/16/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/16/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/16/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/16/include/cmpccxaddintrin.h
 OLD_FILES+=usr/lib/clang/16/include/cpuid.h
 OLD_FILES+=usr/lib/clang/16/include/crc32intrin.h
 OLD_FILES+=usr/lib/clang/16/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/16/include/cuda_wrappers/cmath
 OLD_FILES+=usr/lib/clang/16/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/16/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/16/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/16/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/16/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/16/include/float.h
 OLD_FILES+=usr/lib/clang/16/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/16/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/16/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/16/include/fuzzer
 OLD_FILES+=usr/lib/clang/16/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/16/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/16/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/16/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/16/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/16/include/hlsl/hlsl_basic_types.h
 OLD_FILES+=usr/lib/clang/16/include/hlsl/hlsl_intrinsics.h
 OLD_DIRS+=usr/lib/clang/16/include/hlsl
 OLD_FILES+=usr/lib/clang/16/include/hlsl.h
 OLD_FILES+=usr/lib/clang/16/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/16/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/16/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/16/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/16/include/immintrin.h
 OLD_FILES+=usr/lib/clang/16/include/intrin.h
 OLD_FILES+=usr/lib/clang/16/include/inttypes.h
 OLD_FILES+=usr/lib/clang/16/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/16/include/iso646.h
 OLD_FILES+=usr/lib/clang/16/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/16/include/larchintrin.h
 OLD_FILES+=usr/lib/clang/16/include/limits.h
 OLD_FILES+=usr/lib/clang/16/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/16/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/16/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/16/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/16/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/module.modulemap
 OLD_FILES+=usr/lib/clang/16/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/16/include/msa.h
 OLD_FILES+=usr/lib/clang/16/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/16/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/16/include/omp.h
 OLD_FILES+=usr/lib/clang/16/include/ompt.h
 OLD_FILES+=usr/lib/clang/16/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/16/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/16/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/16/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/16/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/16/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/16/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/16/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/16/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/16/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/16/include/orc_rt/c_api.h
 OLD_DIRS+=usr/lib/clang/16/include/orc_rt
 OLD_FILES+=usr/lib/clang/16/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/16/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/16/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/bmiintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/immintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/x86intrin.h
 OLD_FILES+=usr/lib/clang/16/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/16/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/16/include/prfchiintrin.h
 OLD_FILES+=usr/lib/clang/16/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/16/include/profile/InstrProfData.inc
 OLD_FILES+=usr/lib/clang/16/include/profile/MemProfData.inc
 OLD_DIRS+=usr/lib/clang/16/include/profile
 OLD_FILES+=usr/lib/clang/16/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/16/include/raointintrin.h
 OLD_FILES+=usr/lib/clang/16/include/rdpruintrin.h
 OLD_FILES+=usr/lib/clang/16/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/16/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/16/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/memprof_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/16/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/16/include/sanitizer
 OLD_FILES+=usr/lib/clang/16/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/16/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/16/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/16/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/stdalign.h
 OLD_FILES+=usr/lib/clang/16/include/stdarg.h
 OLD_FILES+=usr/lib/clang/16/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/16/include/stdbool.h
 OLD_FILES+=usr/lib/clang/16/include/stddef.h
 OLD_FILES+=usr/lib/clang/16/include/stdint.h
 OLD_FILES+=usr/lib/clang/16/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/16/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/tgmath.h
 OLD_FILES+=usr/lib/clang/16/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/16/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/16/include/unwind.h
 OLD_FILES+=usr/lib/clang/16/include/vadefs.h
 OLD_FILES+=usr/lib/clang/16/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/16/include/varargs.h
 OLD_FILES+=usr/lib/clang/16/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/16/include/velintrin.h
 OLD_FILES+=usr/lib/clang/16/include/velintrin_approx.h
 OLD_FILES+=usr/lib/clang/16/include/velintrin_gen.h
 OLD_FILES+=usr/lib/clang/16/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/16/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/16/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/16/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/16/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/16/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/16/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/16/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/16/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/16/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/16/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/16/include/xray
 OLD_FILES+=usr/lib/clang/16/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/16/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/16/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/16/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/16/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/16/include
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-powerpc64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-powerpc64.so
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-powerpc64le.so
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-preinit-powerpc64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-preinit-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-preinit-riscv64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-riscv64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-riscv64.so
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_cxx-riscv64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_static-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_static-powerpc64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_static-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.asan_static-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.msan-powerpc64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.msan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.msan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.msan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-riscv64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats-powerpc64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats-riscv64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats_client-powerpc64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats_client-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats_client-riscv64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.tsan-powerpc64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.tsan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.tsan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.tsan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_minimal-riscv64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone-riscv64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone_cxx-riscv64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-basic-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-fdr-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-profiling-powerpc64le.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/16/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/16/lib/freebsd
 OLD_DIRS+=usr/lib/clang/16/lib
 OLD_FILES+=usr/lib/clang/16/share/asan_ignorelist.txt
 OLD_FILES+=usr/lib/clang/16/share/cfi_ignorelist.txt
 OLD_FILES+=usr/lib/clang/16/share/msan_ignorelist.txt
 OLD_DIRS+=usr/lib/clang/16/share
 OLD_DIRS+=usr/lib/clang/16
 
 # 20231208: new libc++ import which bumps version from 16 to 17
 OLD_FILES+=usr/include/c++/v1/__bsd_locale_defaults.h
 OLD_FILES+=usr/include/c++/v1/__bsd_locale_fallbacks.h
 OLD_FILES+=usr/include/c++/v1/__debug
 OLD_FILES+=usr/include/c++/v1/__errc
 OLD_FILES+=usr/include/c++/v1/__functional/unwrap_ref.h
 OLD_FILES+=usr/include/c++/v1/__mutex_base
 OLD_FILES+=usr/include/c++/v1/__ranges/copyable_box.h
 OLD_FILES+=usr/include/c++/v1/__std_stream
 OLD_FILES+=usr/include/c++/v1/__tuple_dir/apply_cv.h
 OLD_FILES+=usr/include/c++/v1/__tuple_dir/make_tuple_types.h
 OLD_FILES+=usr/include/c++/v1/__tuple_dir/pair_like.h
 OLD_FILES+=usr/include/c++/v1/__tuple_dir/sfinae_helpers.h
 OLD_FILES+=usr/include/c++/v1/__tuple_dir/tuple_element.h
 OLD_FILES+=usr/include/c++/v1/__tuple_dir/tuple_indices.h
 OLD_FILES+=usr/include/c++/v1/__tuple_dir/tuple_like.h
 OLD_FILES+=usr/include/c++/v1/__tuple_dir/tuple_like_ext.h
 OLD_FILES+=usr/include/c++/v1/__tuple_dir/tuple_size.h
 OLD_FILES+=usr/include/c++/v1/__tuple_dir/tuple_types.h
 OLD_DIRS+=usr/include/c++/v1/__tuple_dir
 OLD_FILES+=usr/include/c++/v1/experimental/algorithm
 OLD_FILES+=usr/include/c++/v1/experimental/coroutine
 OLD_FILES+=usr/include/c++/v1/experimental/functional
 
 # 20231117: libufs version bumped to 8
 OLD_LIBS+=lib/libufs.so.7
 
 # 20231018: pmc.k7(3) removed
 OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz
 
 # 20231018: Remove misspelled man page link
 OLD_FILES+=usr/share/man/man3/dbm_dirnfo.3.gz
 
 # 20231006: rename tcp6_v4unmapped_bind_test
 OLD_FILES+=usr/tests/sys/netinet/tcp6_v4unmapped_bind_test
 
 # 20231005: Remove man page link for now gone net80211 function.
 OLD_FILES+=usr/share/man/man9/ieee80211_unref_node.9.gz
 
 # 20231005: bsdconfig remove support for floppy and ftp
 OLD_FILES+=usr/share/bsdconfig/media/floppy.subr
 OLD_FILES+=usr/share/bsdconfig/media/ftp.subr
 
 # 20230927: Man pages renamed to match the actual functions
 OLD_FILES+=usr/share/man/man9/cr_seeothergids.9.gz
 OLD_FILES+=usr/share/man/man9/cr_seeotheruids.9.gz
 
 # 20230925
 OLD_FILES+=usr/share/examples/diskless/ME
 OLD_FILES+=usr/share/examples/diskless/README.BOOTP
 OLD_FILES+=usr/share/examples/diskless/README.TEMPLATING
 OLD_FILES+=usr/share/examples/diskless/clone_root
 
 # 20230905
 OLD_FILES+=usr/share/doc/legal/realtek_rtw88_firmware.LICENCE
 
 # 20230828
 MOVED_LIBS+=usr/lib/librt.so.1
 
 # 20230826:
 OLD_FILES+=usr/share/man/man9/knlist_remove_inevent.9.gz
 
 # 20230825: caroot bundle updated
 OLD_FILES+=usr/share/certs/trusted/E-Tugra_Certification_Authority.pem
 OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem
 OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem
 OLD_FILES+=usr/share/certs/trusted/Hongkong_Post_Root_CA_1.pem
 
 # 20230807: GoogleTest 1.14.0 upgrade.
 OLD_FILES+=usr/include/private/gmock/gmock-generated-actions.h
 OLD_FILES+=usr/include/private/gmock/gmock-generated-function-mockers.h
 OLD_FILES+=usr/include/private/gmock/gmock-generated-matchers.h
 OLD_FILES+=usr/include/private/gmock/gmock-generated-nice-strict.h
 OLD_FILES+=usr/include/private/gmock/internal/gmock-generated-internal-utils.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-linked_ptr.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-param-util-generated.h
 OLD_FILES+=usr/include/private/gtest/internal/gtest-tuple.h
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-actions_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-function-mockers_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-internal-utils_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-matchers_test
 OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-matchers_test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-linked-ptr-test
 
 # 20230807: Removal of the ath(4) AHB bus-frontend for MIPS
 OLD_FILES+=usr/share/man/man4/ath_ahb.4
 OLD_FILES+=usr/share/man/man4/ath_pci.4
 OLD_FILES+=usr/share/man/man4/if_ath_pci.4
 
 # 20230803: Removal of support for cloning pseudo interfaces from iflib(9)
 OLD_FILES+=usr/include/net/iflib_private.h
 
 # 20230802: Remove a copy of libdtrace.so installed to the wrong path
 MOVED_LIBS+=usr/lib/libdtrace.so.2
 
 # 20230726: Removal of support for the VTOC8 partitioning scheme
 OLD_FILES+=usr/include/sys/disk/vtoc.h
 OLD_FILES+=usr/include/sys/vtoc.h
 
 # 20230724: Remove unneeded arm headers
 .if ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/machine/atomic-v6.h
 OLD_FILES+=usr/include/machine/cpu-v6.h
 OLD_FILES+=usr/include/machine/pmap-v6.h
 OLD_FILES+=usr/include/machine/pte-v6.h
 OLD_FILES+=usr/include/machine/swi.h
 .endif
 
 # 20230714: gsignal
 OLD_FILES+=usr/share/man/man9/gsignal.9.gz
 
 # 20230626: Only install sys/dev/nvme/nvme.h to /usr/include
 OLD_FILES+=usr/include/dev/nvme/nvme_private.h
 
 # 20230623: OpenSSL 3.0.9
 OLD_LIBS+=lib/libcrypto.so.111
 OLD_FILES+=usr/include/openssl/rand_drbg.h
 OLD_LIBS+=usr/lib/engines/capi.so
 OLD_LIBS+=usr/lib/engines/padlock.so
 OLD_LIBS+=usr/lib/libssl.so.111
 OLD_DIRS+=usr/lib/engines
 .for libcompat in ${_ALL_libcompats}
 OLD_DIRS+=usr/lib${libcompat}/engines
 .endfor
 OLD_FILES+=usr/share/man/man1/list.1
 OLD_FILES+=usr/share/man/man1/openssl-tsget.1
 OLD_FILES+=usr/share/man/man3/ECDH_get_ex_data.3
 OLD_FILES+=usr/share/man/man3/ECDH_get_ex_new_index.3
 OLD_FILES+=usr/share/man/man3/ECDH_set_ex_data.3
 OLD_FILES+=usr/share/man/man3/ERR_GET_FUNC.3
 OLD_FILES+=usr/share/man/man3/EVP_PKEY_CTX_hkdf_mode.3
 OLD_FILES+=usr/share/man/man3/EVP_PKEY_set_alias_type.3
 OLD_FILES+=usr/share/man/man3/EVP_aes.3
 OLD_FILES+=usr/share/man/man3/EVP_aria.3
 OLD_FILES+=usr/share/man/man3/EVP_camellia.3
 OLD_FILES+=usr/share/man/man3/EVP_des.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_bytes.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_cleanup_entropy_fn.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_cleanup_nonce_fn.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_free.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_generate.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_get0_master.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_get0_private.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_get0_public.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_get_entropy_fn.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_get_ex_data.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_get_ex_new_index.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_get_nonce_fn.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_instantiate.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_new.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_reseed.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_secure_new.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_set.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_set_callbacks.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_set_defaults.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_set_ex_data.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_set_reseed_defaults.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_set_reseed_interval.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_set_reseed_time_interval.3
 OLD_FILES+=usr/share/man/man3/RAND_DRBG_uninstantiate.3
 OLD_FILES+=usr/share/man/man3/RSA_padding_add_SSLv23.3
 OLD_FILES+=usr/share/man/man3/RSA_padding_check_SSLv23.3
 OLD_FILES+=usr/share/man/man7/RAND_DRBG.7
 OLD_FILES+=usr/share/man/man7/scrypt.7
 
 # 20230622: new clang import which bumps version from 15.0.7 to 16.0.1
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_texture_intrinsics.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/altivec.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_neon_sve_bridge.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/armintr.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512fp16intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlfp16intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/builtins.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/cet.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/cpuid.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/crc32intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/15.0.7/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/15.0.7/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/15.0.7/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/15.0.7/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/float.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include/fuzzer
 OLD_FILES+=usr/lib/clang/15.0.7/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hlsl/hlsl_basic_types.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hlsl/hlsl_intrinsics.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include/hlsl
 OLD_FILES+=usr/lib/clang/15.0.7/include/hlsl.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/immintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/inttypes.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/iso646.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/limits.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/module.modulemap
 OLD_FILES+=usr/lib/clang/15.0.7/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/msa.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/omp.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ompt.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/15.0.7/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/15.0.7/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/bmiintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/immintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/x86intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/15.0.7/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/profile/InstrProfData.inc
 OLD_FILES+=usr/lib/clang/15.0.7/include/profile/MemProfData.inc
 OLD_DIRS+=usr/lib/clang/15.0.7/include/profile
 OLD_FILES+=usr/lib/clang/15.0.7/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/rdpruintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/memprof_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include/sanitizer
 OLD_FILES+=usr/lib/clang/15.0.7/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdalign.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdarg.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdbool.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stddef.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdint.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/tgmath.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/unwind.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/vadefs.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/varargs.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/velintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/velintrin_approx.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/velintrin_gen.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include/xray
 OLD_FILES+=usr/lib/clang/15.0.7/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-powerpc64.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-powerpc64le.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-riscv64.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-riscv64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/15.0.7/lib/freebsd
 OLD_DIRS+=usr/lib/clang/15.0.7/lib
 OLD_FILES+=usr/lib/clang/15.0.7/share/asan_ignorelist.txt
 OLD_FILES+=usr/lib/clang/15.0.7/share/cfi_ignorelist.txt
 OLD_FILES+=usr/lib/clang/15.0.7/share/msan_ignorelist.txt
 OLD_DIRS+=usr/lib/clang/15.0.7/share
 OLD_DIRS+=usr/lib/clang/15.0.7
 
 # 20230622: new libc++ import which bumps version from 15.0.7 to 16.0.1
 OLD_FILES+=usr/include/c++/v1/__bits
 OLD_FILES+=usr/include/c++/v1/__tuple
 OLD_FILES+=usr/include/c++/v1/__utility/transaction.h
 
 # 20230614: caroot bundle updated
 OLD_FILES+=usr/share/certs/trusted/Cybertrust_Global_Root.pem
 OLD_FILES+=usr/share/certs/trusted/DST_Root_CA_X3.pem
 OLD_FILES+=usr/share/certs/trusted/GlobalSign_Root_CA_-_R2.pem
 OLD_FILES+=usr/share/certs/trusted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem
 OLD_FILES+=usr/share/certs/trusted/Network_Solutions_Certificate_Authority.pem
 OLD_FILES+=usr/share/certs/trusted/Staat_der_Nederlanden_EV_Root_CA.pem
 OLD_FILES+=usr/share/certs/trusted/TrustCor_ECA-1.pem
 OLD_FILES+=usr/share/certs/trusted/TrustCor_RootCert_CA-1.pem
 OLD_FILES+=usr/share/certs/trusted/TrustCor_RootCert_CA-2.pem
 
 # 20230505: md5 tests are now self-contained
 OLD_FILES+=usr/tests/sbin/md5/1.inp
 OLD_FILES+=usr/tests/sbin/md5/1.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/1.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/2.inp
 OLD_FILES+=usr/tests/sbin/md5/2.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/2.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/3.inp
 OLD_FILES+=usr/tests/sbin/md5/3.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/3.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/4.inp
 OLD_FILES+=usr/tests/sbin/md5/4.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/4.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/5.inp
 OLD_FILES+=usr/tests/sbin/md5/5.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/5.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/6.inp
 OLD_FILES+=usr/tests/sbin/md5/6.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/6.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/7.inp
 OLD_FILES+=usr/tests/sbin/md5/7.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/7.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/8.inp
 OLD_FILES+=usr/tests/sbin/md5/8.sha512-p.chk
 OLD_FILES+=usr/tests/sbin/md5/8.sha512sum-p.chk
 OLD_FILES+=usr/tests/sbin/md5/algorithms.txt
 OLD_FILES+=usr/tests/sbin/md5/bsd-c-test
 OLD_FILES+=usr/tests/sbin/md5/bsd-p-test
 OLD_FILES+=usr/tests/sbin/md5/bsd-s-test
 OLD_FILES+=usr/tests/sbin/md5/coreutils-c-test
 OLD_FILES+=usr/tests/sbin/md5/md5.digest
 OLD_FILES+=usr/tests/sbin/md5/md5sum.digest
 OLD_FILES+=usr/tests/sbin/md5/rmd160.digest
 OLD_FILES+=usr/tests/sbin/md5/rmd160sum.digest
 OLD_FILES+=usr/tests/sbin/md5/self-test
 OLD_FILES+=usr/tests/sbin/md5/self-test.md5.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.rmd160.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.sh_inp
 OLD_FILES+=usr/tests/sbin/md5/self-test.sha1.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.sha224.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.sha256.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.sha384.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.sha512.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.sha512t224.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.sha512t256.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.skein1024.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.skein256.chk
 OLD_FILES+=usr/tests/sbin/md5/self-test.skein512.chk
 OLD_FILES+=usr/tests/sbin/md5/sha1.digest
 OLD_FILES+=usr/tests/sbin/md5/sha1sum.digest
 OLD_FILES+=usr/tests/sbin/md5/sha224.digest
 OLD_FILES+=usr/tests/sbin/md5/sha224sum.digest
 OLD_FILES+=usr/tests/sbin/md5/sha256.digest
 OLD_FILES+=usr/tests/sbin/md5/sha256sum.digest
 OLD_FILES+=usr/tests/sbin/md5/sha384.digest
 OLD_FILES+=usr/tests/sbin/md5/sha384sum.digest
 OLD_FILES+=usr/tests/sbin/md5/sha512.digest
 OLD_FILES+=usr/tests/sbin/md5/sha512sum.digest
 OLD_FILES+=usr/tests/sbin/md5/sha512t224.digest
 OLD_FILES+=usr/tests/sbin/md5/sha512t224sum.digest
 OLD_FILES+=usr/tests/sbin/md5/sha512t256.digest
 OLD_FILES+=usr/tests/sbin/md5/sha512t256sum.digest
 OLD_FILES+=usr/tests/sbin/md5/skein1024.digest
 OLD_FILES+=usr/tests/sbin/md5/skein1024sum.digest
 OLD_FILES+=usr/tests/sbin/md5/skein256.digest
 OLD_FILES+=usr/tests/sbin/md5/skein256sum.digest
 OLD_FILES+=usr/tests/sbin/md5/skein512.digest
 OLD_FILES+=usr/tests/sbin/md5/skein512sum.digest
 OLD_FILES+=usr/tests/sbin/md5/sum_a.in
 OLD_FILES+=usr/tests/sbin/md5/sum_b.in
 OLD_FILES+=usr/tests/sbin/md5/sum_c.in
 OLD_FILES+=usr/tests/sbin/md5/sum_sums.digest
 
 # 20230420: portsnap.8 removed
 OLD_FILES+=etc/portsnap.conf
 OLD_FILES+=usr/libexec/make_index
 OLD_FILES+=usr/sbin/portsnap
 OLD_FILES+=usr/share/examples/etc/portsnap.conf
 OLD_FILES+=usr/share/man/man8/portsnap.8.gz
 
 # 20230331: libpcap updated to 1.10.3
 OLD_FILES+=usr/include/fmtutils.h
 
 # 20230329: libcasper libraries moved to /lib
 MOVED_LIBS+=lib/casper/libcap_dns.so.2
 MOVED_LIBS+=lib/casper/libcap_fileargs.so.1
 MOVED_LIBS+=lib/casper/libcap_grp.so.1
 MOVED_LIBS+=lib/casper/libcap_net.so.1
 MOVED_LIBS+=lib/casper/libcap_netdb.so.1
 MOVED_LIBS+=lib/casper/libcap_pwd.so.1
 MOVED_LIBS+=lib/casper/libcap_sysctl.so.1
 MOVED_LIBS+=lib/casper/libcap_sysctl.so.2
 MOVED_LIBS+=lib/casper/libcap_syslog.so.1
 OLD_DIRS+=lib/casper
 
 # 20230324: libvmmapi shlib version bumped to 6
 OLD_LIBS+=usr/lib/libvmmapi.so.5
 
 # 20230323: tzdata 2023a imported
 OLD_FILES+=usr/share/zoneinfo/posixrules
 
 # 20230320: vcount.9 removed
 OLD_FILES+=usr/share/man/man9/count_dev.9.gz
 OLD_FILES+=usr/share/man/man9/vcount.9.gz
 
 # 20230320: case-sensitive conflicts removed
 OLD_FILES+=usr/tests/bin/pkill/pgrep-F_test
 OLD_FILES+=usr/tests/bin/pkill/pgrep-LF_test
 OLD_FILES+=usr/tests/bin/pkill/pgrep-P_test
 OLD_FILES+=usr/tests/bin/pkill/pgrep-U_test
 OLD_FILES+=usr/tests/bin/pkill/pkill-F_test
 OLD_FILES+=usr/tests/bin/pkill/pkill-LF_test
 OLD_FILES+=usr/tests/bin/pkill/pkill-P_test
 OLD_FILES+=usr/tests/bin/pkill/pkill-U_test
 
 # 20230309: remove remaining ATM support
 OLD_FILES+=usr/bin/sscop
 OLD_FILES+=usr/include/netgraph/atm/ng_ccatm.h
 OLD_FILES+=usr/include/netgraph/atm/ng_sscfu.h
 OLD_FILES+=usr/include/netgraph/atm/ng_sscop.h
 OLD_FILES+=usr/include/netgraph/atm/ng_uni.h
 OLD_FILES+=usr/include/netgraph/atm/ngatmbase.h
 OLD_FILES+=usr/include/netgraph/ng_atmllc.h
 OLD_FILES+=usr/include/netnatm/addr.h
 OLD_FILES+=usr/include/netnatm/api/atmapi.h
 OLD_FILES+=usr/include/netnatm/api/ccatm.h
 OLD_FILES+=usr/include/netnatm/api/unisap.h
 OLD_DIRS+=usr/include/netnatm/api
 OLD_FILES+=usr/include/netnatm/msg/uni_config.h
 OLD_FILES+=usr/include/netnatm/msg/uni_hdr.h
 OLD_FILES+=usr/include/netnatm/msg/uni_ie.h
 OLD_FILES+=usr/include/netnatm/msg/uni_msg.h
 OLD_FILES+=usr/include/netnatm/msg/unimsglib.h
 OLD_FILES+=usr/include/netnatm/msg/uniprint.h
 OLD_FILES+=usr/include/netnatm/msg/unistruct.h
 OLD_DIRS+=usr/include/netnatm/msg
 OLD_FILES+=usr/include/netnatm/saal/sscfu.h
 OLD_FILES+=usr/include/netnatm/saal/sscfudef.h
 OLD_FILES+=usr/include/netnatm/saal/sscop.h
 OLD_FILES+=usr/include/netnatm/saal/sscopdef.h
 OLD_DIRS+=usr/include/netnatm/saal
 OLD_FILES+=usr/include/netnatm/sig/uni.h
 OLD_FILES+=usr/include/netnatm/sig/unidef.h
 OLD_FILES+=usr/include/netnatm/sig/unisig.h
 OLD_DIRS+=usr/include/netnatm/sig
 OLD_FILES+=usr/include/netnatm/unimsg.h
 OLD_DIRS+=usr/include/netnatm
 OLD_FILES+=usr/lib/libngatm.a
 OLD_FILES+=usr/lib/libngatm.so
 OLD_LIBS+=usr/lib/libngatm.so.4
 OLD_FILES+=usr/lib/libngatm_p.a
 OLD_FILES+=usr/share/man/man1/sscop.1.gz
 OLD_FILES+=usr/share/man/man3/libngatm.3.gz
 OLD_FILES+=usr/share/man/man3/uniaddr.3.gz
 OLD_FILES+=usr/share/man/man3/unifunc.3.gz
 OLD_FILES+=usr/share/man/man3/unimsg.3.gz
 OLD_FILES+=usr/share/man/man3/unisap.3.gz
 OLD_FILES+=usr/share/man/man3/unistruct.3.gz
 OLD_FILES+=usr/share/man/man4/ng_atmllc.4.gz
 OLD_FILES+=usr/share/man/man4/ng_ccatm.4.gz
 OLD_FILES+=usr/share/man/man4/ng_sscfu.4.gz
 OLD_FILES+=usr/share/man/man4/ng_sscop.4.gz
 OLD_FILES+=usr/share/man/man4/ng_uni.4.gz
 OLD_FILES+=usr/share/man/man4/ngatmbase.4.gz
 
 # 20230308: machine-id merged into hostid_save
 OLD_FILES+=etc/rc.d/machine-id
 
 # 20230306: remove tzsetwall(3)
 OLD_FILES+=usr/share/man/man3/tzsetwall.3.gz
 
 # 20230208: new clang import which bumps version from 14.0.5 to 15.0.7
 OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.5/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/14.0.5/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/14.0.5/include/fuzzer
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.5/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.5/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/14.0.5/include/profile/InstrProfData.inc
 OLD_FILES+=usr/lib/clang/14.0.5/include/profile/MemProfData.inc
 OLD_DIRS+=usr/lib/clang/14.0.5/include/profile
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/memprof_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/14.0.5/include/sanitizer
 OLD_FILES+=usr/lib/clang/14.0.5/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/14.0.5/include/xray
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_texture_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/altivec.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_neon_sve_bridge.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/armintr.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512fp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlfp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/builtins.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/cet.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/cpuid.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/crc32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/float.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/immintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/inttypes.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/iso646.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/limits.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/module.modulemap
 OLD_FILES+=usr/lib/clang/14.0.5/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/msa.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/omp.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ompt.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdalign.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdarg.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdbool.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stddef.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdint.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/tgmath.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/unwind.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/vadefs.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/varargs.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.5/include
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-powerpc64.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-powerpc64le.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-riscv64.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-riscv64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/14.0.5/lib/freebsd
 OLD_DIRS+=usr/lib/clang/14.0.5/lib
 OLD_FILES+=usr/lib/clang/14.0.5/share/asan_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.5/share/cfi_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.5/share/msan_ignorelist.txt
 OLD_DIRS+=usr/lib/clang/14.0.5/share
 OLD_DIRS+=usr/lib/clang/14.0.5
 
 # 20230208: new libc++ import which bumps version from 14.0.5 to 15.0.7
 OLD_FILES+=usr/include/c++/v1/__functional_base
 OLD_FILES+=usr/include/c++/v1/__libcpp_version
 OLD_FILES+=usr/include/c++/v1/__nullptr
 OLD_FILES+=usr/include/c++/v1/__string
 OLD_FILES+=usr/include/c++/v1/experimental/filesystem
 
 # 20230203: loader help files renamed
 OLD_FILES+=boot/loader.help
 
 # 20230201: timeout moved from /usr/bin to /bin
 OLD_FILES+=usr/tests/usr.bin/timeout/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/timeout/timeout_test
 
 # 20230124: rtalloc.9 removed
 OLD_FILES+=usr/share/man/man9/rtalloc.9.gz
 OLD_FILES+=usr/share/man/man9/rtalloc_fib.9.gz
 OLD_FILES+=usr/share/man/man9/rtalloc_ign.9.gz
 OLD_FILES+=usr/share/man/man9/rtalloc_ign_fib.9.gz
 OLD_FILES+=usr/share/man/man9/rtalloc1.9.gz
 OLD_FILES+=usr/share/man/man9/rtalloc1_fib.9.gz
 OLD_FILES+=usr/share/man/man9/rtfree.9.gz
 OLD_FILES+=usr/share/man/man9/RT_ADDREF.9.gz
 OLD_FILES+=usr/share/man/man9/RT_LOCK.9.gz
 OLD_FILES+=usr/share/man/man9/RT_REMREF.9.gz
 OLD_FILES+=usr/share/man/man9/RT_RTFREE.9.gz
 OLD_FILES+=usr/share/man/man9/RT_UNLOCK.9.gz
 OLD_FILES+=usr/share/man/man9/RTFREE.9.gz
 OLD_FILES+=usr/share/man/man9/RTFREE_LOCKED.9.gz
 
 # 20230123: PCBGROUP.9 removed
 OLD_FILES+=usr/share/man/man9/PCBGROUP.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_byhash.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_byinpcb.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_destroy.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_enabled.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_init.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_remove.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_update.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_update_mbuf.9.gz
 OLD_FILES+=usr/share/man/man9/in6_pcbgroup_byhash.9.gz
 
 # 20221214: TCPDEBUG removed
 OLD_FILES+=usr/include/netinet/tcp_debug.h
 
 # 20221213: remove sync serial drivers and utilities
 OLD_FILES+=sbin/sconfig
 OLD_FILES+=usr/share/man/man4/ce.4
 OLD_FILES+=usr/share/man/man4/cp.4
 OLD_FILES+=usr/share/man/man8/sconfig.8.gz
 
 # 20221202: remove trpt(8)
 OLD_FILES+=usr/sbin/trpt
 OLD_FILES+=usr/share/man/man8/trpt.8.gz
 
 # 20221117: remove typo'd man page link
 OLD_FILES+=usr/share/man/man9/vm_map_wire_mapped.9.gz
 
 # 20221114: remove othermta
 OLD_FILES+=etc/rc.d/othermta
 
 # 20221109: remove rc.sendmail(8)
 OLD_FILES+=etc/rc.sendmail
 OLD_FILES+=usr/share/man/man8/rc.sendmail.8.gz
 
 # 20221015: update the ithread(9) man page
 OLD_FILES+=usr/share/man/man9/ithread.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_add_handler.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_create.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_destroy.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_priority.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_remove_handler.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_schedule.9.gz
 
 # 20221012: remove nls support from sort
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/sort.cat
 
 # 20221003: ip6protosw.h removed
 OLD_FILES+=usr/include/netinet6/ip6protosw.h
 
 # 20221001: deorbit opie
 OLD_FILES+=etc/opieaccess
 OLD_FILES+=etc/opiekeys
 OLD_FILES+=usr/bin/opieinfo
 OLD_FILES+=usr/bin/opiekey
 OLD_FILES+=usr/bin/opiepasswd
 OLD_FILES+=usr/bin/otp-md4
 OLD_FILES+=usr/bin/otp-md5
 OLD_FILES+=usr/bin/otp-sha1
 OLD_FILES+=usr/include/opie.h
 OLD_FILES+=usr/lib/libopie.a
 OLD_FILES+=usr/lib/libopie.so
 OLD_LIBS+=usr/lib/libopie.so.8
 OLD_FILES+=usr/lib/libopie_p.a
 OLD_FILES+=usr/lib/pam_opie.so
 OLD_LIBS+=usr/lib/pam_opie.so.6
 OLD_FILES+=usr/lib/pam_opieaccess.so
 OLD_LIBS+=usr/lib/pam_opieaccess.so.6
 OLD_FILES+=usr/share/man/man1/opieinfo.1.gz
 OLD_FILES+=usr/share/man/man1/opiekey.1.gz
 OLD_FILES+=usr/share/man/man1/opiepasswd.1.gz
 OLD_FILES+=usr/share/man/man1/otp-md4.1.gz
 OLD_FILES+=usr/share/man/man1/otp-md5.1.gz
 OLD_FILES+=usr/share/man/man1/otp-sha1.1.gz
 OLD_FILES+=usr/share/man/man4/opie.4.gz
 OLD_FILES+=usr/share/man/man4/skey.4.gz
 OLD_FILES+=usr/share/man/man5/opieaccess.5.gz
 OLD_FILES+=usr/share/man/man5/opiekeys.5.gz
 OLD_FILES+=usr/share/man/man8/pam_opie.8.gz
 OLD_FILES+=usr/share/man/man8/pam_opieaccess.8.gz
 
 # 20220928: telnetd(8) removed
 OLD_FILES+=etc/pam.d/telnetd
 OLD_FILES+=usr/libexec/telnetd
 OLD_FILES+=usr/share/man/man8/telnetd.8.gz
 
 # 20220914: domain(9) updated
 OLD_FILES+=usr/share/man/man9/domain_init.9.gz
 OLD_FILES+=usr/share/man/man9/pfctlinput.9.gz
 OLD_FILES+=usr/share/man/man9/pffinddomain.9.gz
 OLD_FILES+=usr/share/man/man9/pffindproto.9.gz
 OLD_FILES+=usr/share/man/man9/pffindtype.9.gz
 
 # 20220825: awk tests moved to subdirs
 OLD_FILES+=usr/tests/usr.bin/awk/awk_test
 OLD_FILES+=usr/tests/usr.bin/awk/d_assign_NF.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_assign_NF.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_assign_NF.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_big_regexp.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_big_regexp.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_big_regexp.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_end1.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_end1.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_end1.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_end2.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_end2.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_end2.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_period.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_period.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_period.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_string1.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_string1.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_tolower.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_tolower.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_tolower.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_toupper.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_toupper.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_toupper.out
 
 # 20220820: remove knlist_init_rw_reader()
 OLD_FILES+=usr/share/man/man9/knlist_init_rw_reader.9.gz
 
 # 20220813: minigzip(1) removed in favor of gzip(1)
 OLD_FILES+=usr/bin/minigzip
 OLD_FILES+=usr/share/man/man1/minigzip.1.gz
 
 # 20220811: MP_WATCHDOG removed
 OLD_FILES+=usr/include/machine/mp_watchdog.h
 
 # 20220811: new iconv encoder trait added
 OLD_LIBS+=usr/lib/i18n/libBIG5.so.4
 OLD_LIBS+=usr/lib/i18n/libDECHanyu.so.4
 OLD_LIBS+=usr/lib/i18n/libEUC.so.4
 OLD_LIBS+=usr/lib/i18n/libEUCTW.so.4
 OLD_LIBS+=usr/lib/i18n/libGBK2K.so.4
 OLD_LIBS+=usr/lib/i18n/libHZ.so.4
 OLD_LIBS+=usr/lib/i18n/libISO2022.so.4
 OLD_LIBS+=usr/lib/i18n/libJOHAB.so.4
 OLD_LIBS+=usr/lib/i18n/libMSKanji.so.4
 OLD_LIBS+=usr/lib/i18n/libUES.so.4
 OLD_LIBS+=usr/lib/i18n/libUTF1632.so.4
 OLD_LIBS+=usr/lib/i18n/libUTF7.so.4
 OLD_LIBS+=usr/lib/i18n/libUTF8.so.4
 OLD_LIBS+=usr/lib/i18n/libVIQR.so.4
 OLD_LIBS+=usr/lib/i18n/libZW.so.4
 OLD_LIBS+=usr/lib/i18n/libiconv_none.so.4
 OLD_LIBS+=usr/lib/i18n/libiconv_std.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_646.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_none.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_parallel.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_serial.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_std.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_zone.so.4
 
 # 20220811: raw socket layer removed
 OLD_FILES+=usr/include/net/raw_cb.h
 
 # 20220721: libnv version bumps
 OLD_LIBS+=lib/libnv.so.0
 
 # 20220624: unix_passfd_test -> unix_passfd_stream/unix_passfd_dgram
 OLD_FILES+=usr/tests/sys/kern/unix_passfd_test
 
 # 20220621: ISA sound card drivers removed
 OLD_FILES+=usr/share/man/man4/snd_ad1816.4.gz
 OLD_FILES+=usr/share/man/man4/snd_ess.4.gz
 OLD_FILES+=usr/share/man/man4/snd_gusc.4.gz
 OLD_FILES+=usr/share/man/man4/snd_mss.4.gz
 OLD_FILES+=usr/share/man/man4/snd_sb16.4.gz
 OLD_FILES+=usr/share/man/man4/snd_sb8.4.gz
 OLD_FILES+=usr/share/man/man4/snd_sbc.4.gz
 
 # 20220612: new clang import which bumps version from 14.0.4 to 14.0.5
 OLD_FILES+=usr/lib/clang/14.0.4/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/14.0.4/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.4/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.4/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/14.0.4/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/14.0.4/include/fuzzer
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.4/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.4/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/14.0.4/include/profile/InstrProfData.inc
 OLD_FILES+=usr/lib/clang/14.0.4/include/profile/MemProfData.inc
 OLD_DIRS+=usr/lib/clang/14.0.4/include/profile
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/memprof_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/14.0.4/include/sanitizer
 OLD_FILES+=usr/lib/clang/14.0.4/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/14.0.4/include/xray
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_texture_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/altivec.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_neon_sve_bridge.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/armintr.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512fp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlfp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/builtins.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/cet.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/cpuid.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/crc32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/float.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/immintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/inttypes.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/iso646.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/limits.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/module.modulemap
 OLD_FILES+=usr/lib/clang/14.0.4/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/msa.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/omp.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ompt.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdalign.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdarg.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdbool.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stddef.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdint.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/tgmath.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/unwind.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/vadefs.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/varargs.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.4/include
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_static-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_static-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/14.0.4/lib/freebsd
 OLD_DIRS+=usr/lib/clang/14.0.4/lib/share
 OLD_DIRS+=usr/lib/clang/14.0.4/lib
 OLD_FILES+=usr/lib/clang/14.0.4/share/asan_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.4/share/cfi_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.4/share/msan_ignorelist.txt
 OLD_DIRS+=usr/lib/clang/14.0.4/share
 OLD_DIRS+=usr/lib/clang/14.0.4
 
 # 20220605: new clang import which bumps version from 14.0.3 to 14.0.4
 OLD_FILES+=usr/lib/clang/14.0.3/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/14.0.3/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.3/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.3/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/14.0.3/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/14.0.3/include/fuzzer
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.3/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.3/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/14.0.3/include/profile/InstrProfData.inc
 OLD_FILES+=usr/lib/clang/14.0.3/include/profile/MemProfData.inc
 OLD_DIRS+=usr/lib/clang/14.0.3/include/profile
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/memprof_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/14.0.3/include/sanitizer
 OLD_FILES+=usr/lib/clang/14.0.3/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/14.0.3/include/xray
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_texture_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/altivec.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_neon_sve_bridge.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/armintr.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512fp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlfp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/builtins.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/cet.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/cpuid.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/crc32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/float.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/immintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/inttypes.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/iso646.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/limits.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/module.modulemap
 OLD_FILES+=usr/lib/clang/14.0.3/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/msa.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/omp.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ompt.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdalign.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdarg.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdbool.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stddef.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdint.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/tgmath.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/unwind.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/vadefs.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/varargs.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.3/include
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_static-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_static-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/14.0.3/lib/freebsd
 OLD_DIRS+=usr/lib/clang/14.0.3/lib/share
 OLD_DIRS+=usr/lib/clang/14.0.3/lib
 OLD_FILES+=usr/lib/clang/14.0.3/share/asan_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.3/share/cfi_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.3/share/msan_ignorelist.txt
 OLD_DIRS+=usr/lib/clang/14.0.3/share
 OLD_DIRS+=usr/lib/clang/14.0.3
 
 # 20220524: libkqueue test updates
 OLD_FILES+=usr/tests/sys/kqueue/libkqueue/kqtest
 
 # 20220514: new clang import which bumps version from 13.0.0 to 14.0.3
 OLD_FILES+=usr/lib/clang/13.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/13.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/13.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/13.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/13.0.0/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/13.0.0/include/fuzzer
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/13.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/13.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/13.0.0/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/13.0.0/include/profile
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/13.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/13.0.0/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/13.0.0/include/xray
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/builtins.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/cet.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/float.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/inttypes.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/iso646.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/limits.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/13.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/omp.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ompt.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdalign.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdarg.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdbool.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stddef.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdint.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/tgmath.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/unwind.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/varargs.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/13.0.0/include
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/13.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/13.0.0/lib
 OLD_DIRS+=usr/lib/clang/13.0.0
 
 # 20220514: new libc++ import which bumps version from 13.0.0 to 14.0.3
 OLD_FILES+=usr/include/c++/v1/__function_like.h
 OLD_FILES+=usr/include/c++/v1/__memory/pointer_safety.h
 OLD_FILES+=usr/include/c++/v1/__utility/__decay_copy.h
 
 # 20220418: uudecode merged into uuencode and renamed to bintrans
 OLD_FILES+=usr/lib/debug/usr/bin/uuencode.debug
 OLD_FILES+=usr/lib/debug/usr/bin/uudecode.debug
 OLD_FILES+=usr/tests/usr.bin/uuencode/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/uuencode/legacy_test
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.base64.in
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.traditional.out
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.traditional.in
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.out
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.sh
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.in
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.153276.in
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.base64.out
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.153276.out
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.base64.in
 OLD_FILES+=usr/tests/usr.bin/uudecode/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.out
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.sh
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.153276.out
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.traditional.in
 OLD_FILES+=usr/tests/usr.bin/uudecode/legacy_test
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.153276.in
 OLD_DIRS+=usr/tests/usr.bin/uuencode
 OLD_DIRS+=usr/tests/usr.bin/uudecode
 
 # 20220318: snd_ds1 and snd_maestro drivers removed
 OLD_FILES+=usr/share/man/man4/snd_ds1.4.gz
 OLD_FILES+=usr/share/man/man4/snd_maestro.4.gz
 
 # 20220307: remove 330.news
 OLD_FILES+=etc/periodic/daily/330.news
 
 # 20220210: unwind.h moved to /usr/include
 OLD_FILES+=usr/include/c++/v1/unwind-arm.h
 OLD_FILES+=usr/include/c++/v1/unwind-itanium.h
 OLD_FILES+=usr/include/c++/v1/unwind.h
 
 # 20220128: mips pmc events removed
 OLD_FILES+=usr/share/man/man3/pmc.mips24k.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.octeon.3.gz
 
 # 20220127: terasic_mtl.4 removed
 OLD_FILES+=usr/share/man/man4/terasic_mtl.4.gz
 
 # 20211229: libc++ moved to /lib
 MOVED_LIBS+=usr/lib/libc++.so.1
 
 # 20211221: efi_set_variables_supported.3 should be efi_variables_supported.3
 OLD_FILES+=usr/share/man/man3/efi_set_variables_supported.3.gz
 
 # 20211218: meteor.4 removed, see also 20200301 entry below
 OLD_FILES+=usr/share/man/man4/meteor.4.gz
 
 # 20211125: Old SCSI drivers removed
 OLD_FILES+=usr/include/dev/ic/esp.h
 OLD_FILES+=usr/share/man/man4/amr.4.gz
 OLD_FILES+=usr/share/man/man4/esp.4.gz
 OLD_FILES+=usr/share/man/man4/iir.4.gz
 OLD_FILES+=usr/share/man/man4/mly.4.gz
 OLD_FILES+=usr/share/man/man4/twa.4.gz
 
 # 20211120: kernel_vmount function removed
 OLD_FILES+=usr/share/man/man9/kernel_vmount.9.gz
 
 # 20211115: vm_page busy functions removed
 OLD_FILES+=share/man/man9/vm_page_sbusy.9.gz
 OLD_FILES+=share/man/man9/vm_page_xbusy.9.gz
 OLD_FILES+=share/man/man9/vm_page_sleep_if_busy.9.gz
 
 # 20211113: new clang import which bumps version from 12.0.1 to 13.0.0
 OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/12.0.1/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/12.0.1/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/12.0.1/include/fuzzer
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/12.0.1/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/12.0.1/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/12.0.1/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/12.0.1/include/profile
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/12.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/12.0.1/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/12.0.1/include/xray
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/cet.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/float.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/inttypes.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/iso646.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/limits.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/12.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/omp.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ompt.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdalign.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdarg.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdbool.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stddef.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdint.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/tgmath.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/unwind.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/varargs.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/12.0.1/include
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/12.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/12.0.1/lib
 OLD_DIRS+=usr/lib/clang/12.0.1
 
 # 20211113: new libc++ import which bumps version from 12.0.1 to 13.0.0
 OLD_FILES+=usr/include/c++/v1/__functional_03
 OLD_FILES+=usr/include/c++/v1/__functional_base_03
 OLD_FILES+=usr/include/c++/v1/__memory/base.h
 OLD_FILES+=usr/include/c++/v1/__memory/utilities.h
 OLD_FILES+=usr/include/c++/v1/__sso_allocator
 OLD_FILES+=usr/include/c++/v1/tr1/__availability
 OLD_FILES+=usr/include/c++/v1/tr1/__bit_reference
 OLD_FILES+=usr/include/c++/v1/tr1/__bits
 OLD_FILES+=usr/include/c++/v1/tr1/__bsd_locale_defaults.h
 OLD_FILES+=usr/include/c++/v1/tr1/__bsd_locale_fallbacks.h
 OLD_FILES+=usr/include/c++/v1/tr1/__config
 OLD_FILES+=usr/include/c++/v1/tr1/__debug
 OLD_FILES+=usr/include/c++/v1/tr1/__errc
 OLD_FILES+=usr/include/c++/v1/tr1/__functional_03
 OLD_FILES+=usr/include/c++/v1/tr1/__functional_base
 OLD_FILES+=usr/include/c++/v1/tr1/__functional_base_03
 OLD_FILES+=usr/include/c++/v1/tr1/__hash_table
 OLD_FILES+=usr/include/c++/v1/tr1/__libcpp_version
 OLD_FILES+=usr/include/c++/v1/tr1/__locale
 OLD_FILES+=usr/include/c++/v1/tr1/__mutex_base
 OLD_FILES+=usr/include/c++/v1/tr1/__node_handle
 OLD_FILES+=usr/include/c++/v1/tr1/__nullptr
 OLD_FILES+=usr/include/c++/v1/tr1/__split_buffer
 OLD_FILES+=usr/include/c++/v1/tr1/__sso_allocator
 OLD_FILES+=usr/include/c++/v1/tr1/__std_stream
 OLD_FILES+=usr/include/c++/v1/tr1/__string
 OLD_FILES+=usr/include/c++/v1/tr1/__threading_support
 OLD_FILES+=usr/include/c++/v1/tr1/__tree
 OLD_FILES+=usr/include/c++/v1/tr1/__tuple
 OLD_FILES+=usr/include/c++/v1/tr1/__undef_macros
 OLD_FILES+=usr/include/c++/v1/tr1/algorithm
 OLD_FILES+=usr/include/c++/v1/tr1/any
 OLD_FILES+=usr/include/c++/v1/tr1/array
 OLD_FILES+=usr/include/c++/v1/tr1/atomic
 OLD_FILES+=usr/include/c++/v1/tr1/barrier
 OLD_FILES+=usr/include/c++/v1/tr1/bit
 OLD_FILES+=usr/include/c++/v1/tr1/bitset
 OLD_FILES+=usr/include/c++/v1/tr1/cassert
 OLD_FILES+=usr/include/c++/v1/tr1/ccomplex
 OLD_FILES+=usr/include/c++/v1/tr1/cctype
 OLD_FILES+=usr/include/c++/v1/tr1/cerrno
 OLD_FILES+=usr/include/c++/v1/tr1/cfenv
 OLD_FILES+=usr/include/c++/v1/tr1/cfloat
 OLD_FILES+=usr/include/c++/v1/tr1/charconv
 OLD_FILES+=usr/include/c++/v1/tr1/chrono
 OLD_FILES+=usr/include/c++/v1/tr1/cinttypes
 OLD_FILES+=usr/include/c++/v1/tr1/ciso646
 OLD_FILES+=usr/include/c++/v1/tr1/climits
 OLD_FILES+=usr/include/c++/v1/tr1/clocale
 OLD_FILES+=usr/include/c++/v1/tr1/cmath
 OLD_FILES+=usr/include/c++/v1/tr1/codecvt
 OLD_FILES+=usr/include/c++/v1/tr1/compare
 OLD_FILES+=usr/include/c++/v1/tr1/complex
 OLD_FILES+=usr/include/c++/v1/tr1/complex.h
 OLD_FILES+=usr/include/c++/v1/tr1/concepts
 OLD_FILES+=usr/include/c++/v1/tr1/condition_variable
 OLD_FILES+=usr/include/c++/v1/tr1/csetjmp
 OLD_FILES+=usr/include/c++/v1/tr1/csignal
 OLD_FILES+=usr/include/c++/v1/tr1/cstdarg
 OLD_FILES+=usr/include/c++/v1/tr1/cstdbool
 OLD_FILES+=usr/include/c++/v1/tr1/cstddef
 OLD_FILES+=usr/include/c++/v1/tr1/cstdint
 OLD_FILES+=usr/include/c++/v1/tr1/cstdio
 OLD_FILES+=usr/include/c++/v1/tr1/cstdlib
 OLD_FILES+=usr/include/c++/v1/tr1/cstring
 OLD_FILES+=usr/include/c++/v1/tr1/ctgmath
 OLD_FILES+=usr/include/c++/v1/tr1/ctime
 OLD_FILES+=usr/include/c++/v1/tr1/ctype.h
 OLD_FILES+=usr/include/c++/v1/tr1/cwchar
 OLD_FILES+=usr/include/c++/v1/tr1/cwctype
 OLD_FILES+=usr/include/c++/v1/tr1/deque
 OLD_FILES+=usr/include/c++/v1/tr1/errno.h
 OLD_FILES+=usr/include/c++/v1/tr1/exception
 OLD_FILES+=usr/include/c++/v1/tr1/execution
 OLD_FILES+=usr/include/c++/v1/tr1/fenv.h
 OLD_FILES+=usr/include/c++/v1/tr1/filesystem
 OLD_FILES+=usr/include/c++/v1/tr1/float.h
 OLD_FILES+=usr/include/c++/v1/tr1/forward_list
 OLD_FILES+=usr/include/c++/v1/tr1/fstream
 OLD_FILES+=usr/include/c++/v1/tr1/functional
 OLD_FILES+=usr/include/c++/v1/tr1/future
 OLD_FILES+=usr/include/c++/v1/tr1/initializer_list
 OLD_FILES+=usr/include/c++/v1/tr1/inttypes.h
 OLD_FILES+=usr/include/c++/v1/tr1/iomanip
 OLD_FILES+=usr/include/c++/v1/tr1/ios
 OLD_FILES+=usr/include/c++/v1/tr1/iosfwd
 OLD_FILES+=usr/include/c++/v1/tr1/iostream
 OLD_FILES+=usr/include/c++/v1/tr1/istream
 OLD_FILES+=usr/include/c++/v1/tr1/iterator
 OLD_FILES+=usr/include/c++/v1/tr1/latch
 OLD_FILES+=usr/include/c++/v1/tr1/limits
 OLD_FILES+=usr/include/c++/v1/tr1/limits.h
 OLD_FILES+=usr/include/c++/v1/tr1/list
 OLD_FILES+=usr/include/c++/v1/tr1/locale
 OLD_FILES+=usr/include/c++/v1/tr1/locale.h
 OLD_FILES+=usr/include/c++/v1/tr1/map
 OLD_FILES+=usr/include/c++/v1/tr1/math.h
 OLD_FILES+=usr/include/c++/v1/tr1/memory
 OLD_FILES+=usr/include/c++/v1/tr1/mutex
 OLD_FILES+=usr/include/c++/v1/tr1/new
 OLD_FILES+=usr/include/c++/v1/tr1/numbers
 OLD_FILES+=usr/include/c++/v1/tr1/numeric
 OLD_FILES+=usr/include/c++/v1/tr1/optional
 OLD_FILES+=usr/include/c++/v1/tr1/ostream
 OLD_FILES+=usr/include/c++/v1/tr1/queue
 OLD_FILES+=usr/include/c++/v1/tr1/random
 OLD_FILES+=usr/include/c++/v1/tr1/ratio
 OLD_FILES+=usr/include/c++/v1/tr1/regex
 OLD_FILES+=usr/include/c++/v1/tr1/scoped_allocator
 OLD_FILES+=usr/include/c++/v1/tr1/semaphore
 OLD_FILES+=usr/include/c++/v1/tr1/set
 OLD_FILES+=usr/include/c++/v1/tr1/setjmp.h
 OLD_FILES+=usr/include/c++/v1/tr1/shared_mutex
 OLD_FILES+=usr/include/c++/v1/tr1/span
 OLD_FILES+=usr/include/c++/v1/tr1/sstream
 OLD_FILES+=usr/include/c++/v1/tr1/stack
 OLD_FILES+=usr/include/c++/v1/tr1/stdbool.h
 OLD_FILES+=usr/include/c++/v1/tr1/stddef.h
 OLD_FILES+=usr/include/c++/v1/tr1/stdexcept
 OLD_FILES+=usr/include/c++/v1/tr1/stdint.h
 OLD_FILES+=usr/include/c++/v1/tr1/stdio.h
 OLD_FILES+=usr/include/c++/v1/tr1/stdlib.h
 OLD_FILES+=usr/include/c++/v1/tr1/streambuf
 OLD_FILES+=usr/include/c++/v1/tr1/string
 OLD_FILES+=usr/include/c++/v1/tr1/string.h
 OLD_FILES+=usr/include/c++/v1/tr1/string_view
 OLD_FILES+=usr/include/c++/v1/tr1/strstream
 OLD_FILES+=usr/include/c++/v1/tr1/system_error
 OLD_FILES+=usr/include/c++/v1/tr1/tgmath.h
 OLD_FILES+=usr/include/c++/v1/tr1/thread
 OLD_FILES+=usr/include/c++/v1/tr1/tuple
 OLD_FILES+=usr/include/c++/v1/tr1/type_traits
 OLD_FILES+=usr/include/c++/v1/tr1/typeindex
 OLD_FILES+=usr/include/c++/v1/tr1/typeinfo
 OLD_FILES+=usr/include/c++/v1/tr1/unordered_map
 OLD_FILES+=usr/include/c++/v1/tr1/unordered_set
 OLD_FILES+=usr/include/c++/v1/tr1/utility
 OLD_FILES+=usr/include/c++/v1/tr1/valarray
 OLD_FILES+=usr/include/c++/v1/tr1/variant
 OLD_FILES+=usr/include/c++/v1/tr1/vector
 OLD_FILES+=usr/include/c++/v1/tr1/version
 OLD_FILES+=usr/include/c++/v1/tr1/wchar.h
 OLD_FILES+=usr/include/c++/v1/tr1/wctype.h
 OLD_DIRS+=usr/include/c++/v1/tr1
 
 # 20211027: libdialog shlib bumped to version 10 for dialog 1.3
 OLD_LIBS+=usr/lib/libdialog.so.9
 OLD_LIBS+=usr/lib/libdpv.so.2
 
 # 20211026: retire obsolete iscsi initiator
 OLD_FILES+=sbin/iscontrol
 OLD_FILES+=usr/share/man/man4/iscsi_initiator.4.gz
 OLD_FILES+=usr/share/man/man8/iscontrol.8.gz
 
 # 20211022
 OLD_FILES+=etc/rc.d/sppp
 OLD_FILES+=rescue/spppcontrol
 OLD_FILES+=sbin/spppcontrol
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/cserial.h
 .endif
 OLD_FILES+=usr/include/net/if_sppp.h
 OLD_FILES+=usr/include/netgraph/ng_sppp.h
 OLD_FILES+=usr/share/man/man4/ng_sppp.4.gz
 OLD_FILES+=usr/share/man/man4/sppp.4.gz
 OLD_FILES+=usr/share/man/man8/spppcontrol.8.gz
 
 # 20211004: Removed sparc64 tests for lastcomm/sa
 OLD_FILES+=usr/tests/usr.bin/lastcomm/v1-sparc64-acct.in
 OLD_FILES+=usr/tests/usr.bin/lastcomm/v1-sparc64.out
 OLD_FILES+=usr/tests/usr.bin/lastcomm/v2-sparc64-acct.in
 OLD_FILES+=usr/tests/usr.bin/lastcomm/v2-sparc64.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-sav.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-usr.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-usr.in
 
 # 20210929:
 OLD_FILES+=usr/sbin/hcseriald
 OLD_FILES+=usr/share/man/man8/hcseriald.8.gz
 
 # 20210929: Remove ng_h4
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_h4.h
 OLD_FILES+=usr/share/man/man4/ng_h4.4.gz
 
 # 20210923: rename boot(9) to kern_reboot(9)
 OLD_FILES+=usr/share/man/man9/boot.9.gz
 
 # 20210922: Old mixer(8) tests removed
 OLD_FILES+=usr/tests/usr.sbin/mixer/Kyuafile
 OLD_FILES+=usr/tests/usr.sbin/mixer/mixer_test
 OLD_DIRS+=usr/tests/usr.sbin/mixer
 
 # 20210921: remove cloudabi
 OLD_FILES+=usr/share/man/man4/cloudabi.4.gz
 OLD_FILES+=usr/share/man/man4/cloudabi32.4.gz
 OLD_FILES+=usr/share/man/man4/cloudabi64.4.gz
 
 # 20210906: stop installing {llvm,clang,lldb}-tblgen
 OLD_FILES+=usr/bin/llvm-tblgen
 OLD_FILES+=usr/bin/clang-tblgen
 OLD_FILES+=usr/bin/lldb-tblgen
 OLD_FILES+=usr/share/man/man1/llvm-tblgen.1.gz
 
 # 20210810: remove Pentium-related man pages and references
 OLD_FILES+=usr/share/man/man3/pmc.p4.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.p5.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.p6.3.gz
 
 # 20210805: C.UTF-8 installed to the wrong location
 OLD_FILES+=usr/share/C.UTF-8.LC_CTYPE
 
 # 20210619: new clang import which bumps version from 12.0.0 to 12.0.1
 OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/12.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/12.0.0/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/12.0.0/include/fuzzer
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/12.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/12.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/12.0.0/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/12.0.0/include/profile
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/12.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/12.0.0/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/12.0.0/include/xray
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/cet.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/float.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/inttypes.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/iso646.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/limits.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/12.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/omp.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ompt.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdalign.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdarg.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdbool.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stddef.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdint.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/tgmath.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/unwind.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/varargs.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/12.0.0/include
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/12.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/12.0.0/lib
 OLD_DIRS+=usr/lib/clang/12.0.0
 
 # 20210616: Remove crypto_cursor_seg{base,len}
 OLD_FILES+=usr/share/man/man9/crypto_cursor_segbase.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_cursor_seglen.9.gz
 
 # 20210618: rename of usr/share/certs/blacklisted
 OLD_FILES+=usr/share/certs/blacklisted/AddTrust_External_Root.pem
 OLD_FILES+=usr/share/certs/blacklisted/AddTrust_Low-Value_Services_Root.pem
 OLD_FILES+=usr/share/certs/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem
 OLD_FILES+=usr/share/certs/blacklisted/Camerfirma_Global_Chambersign_Root.pem
 OLD_FILES+=usr/share/certs/blacklisted/Certum_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Chambers_of_Commerce_Root_-_2008.pem
 OLD_FILES+=usr/share/certs/blacklisted/D-TRUST_Root_CA_3_2013.pem
 OLD_FILES+=usr/share/certs/blacklisted/EC-ACC.pem
 OLD_FILES+=usr/share/certs/blacklisted/EE_Certification_Centre_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Global_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Primary_Certification_Authority_-_G2.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Primary_Certification_Authority_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Primary_Certification_Authority.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Universal_CA_2.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Universal_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Global_Chambersign_Root_-_2008.pem
 OLD_FILES+=usr/share/certs/blacklisted/LuxTrust_Global_Root_2.pem
 OLD_FILES+=usr/share/certs/blacklisted/OISTE_WISeKey_Global_Root_GA_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/QuoVadis_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Sonera_Class_2_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem
 OLD_FILES+=usr/share/certs/blacklisted/Staat_der_Nederlanden_Root_CA_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/SwissSign_Platinum_CA_-_G2.pem
 OLD_FILES+=usr/share/certs/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem
 OLD_FILES+=usr/share/certs/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem
 OLD_FILES+=usr/share/certs/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem
 OLD_FILES+=usr/share/certs/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem
 OLD_FILES+=usr/share/certs/blacklisted/Taiwan_GRCA.pem
 OLD_FILES+=usr/share/certs/blacklisted/thawte_Primary_Root_CA_-_G2.pem
 OLD_FILES+=usr/share/certs/blacklisted/thawte_Primary_Root_CA_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/thawte_Primary_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Trustis_FPS_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.pem
 OLD_FILES+=usr/share/certs/blacklisted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
 OLD_FILES+=usr/share/certs/blacklisted/VeriSign_Universal_Root_Certification_Authority.pem
 OLD_DIRS+=usr/share/certs/blacklisted
 
 # 20210613: new clang import which bumps version from 11.0.1 to 12.0.0
 OLD_FILES+=usr/lib/clang/11.0.1/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/11.0.1/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/11.0.1/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/11.0.1/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/11.0.1/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/11.0.1/include/fuzzer
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/11.0.1/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/11.0.1/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/11.0.1/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/11.0.1/include/profile
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/11.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/11.0.1/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/11.0.1/include/xray
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/cet.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/float.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/inttypes.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/iso646.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/limits.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/11.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/omp.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ompt.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdalign.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdarg.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdbool.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stddef.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdint.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/tgmath.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/unwind.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/varargs.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/11.0.1/include
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/11.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/11.0.1/lib
 OLD_DIRS+=usr/lib/clang/11.0.1
 
 # 20210613: Rename OpenZFS manual pages
 OLD_FILES+=usr/share/man/man5/spl-module-parameters.5.gz
 OLD_FILES+=usr/share/man/man5/zfs-events.5.gz
 OLD_FILES+=usr/share/man/man5/zfs-module-parameters.5.gz
 OLD_FILES+=usr/share/man/man8/zfsconcepts.8.gz
 OLD_FILES+=usr/share/man/man8/zfsprops.8.gz
 OLD_FILES+=usr/share/man/man5/zpool-features.5.gz
 OLD_FILES+=usr/share/man/man8/zpoolconcepts.8.gz
 OLD_FILES+=usr/share/man/man8/zpoolprops.8.gz
 
 # 20210611: Remove svn and svnlite
 OLD_FILES+=usr/bin/svn
 OLD_FILES+=usr/bin/svnadmin
 OLD_FILES+=usr/bin/svnbench
 OLD_FILES+=usr/bin/svndumpfilter
 OLD_FILES+=usr/bin/svnfsfs
 OLD_FILES+=usr/bin/svnlite
 OLD_FILES+=usr/bin/svnliteadmin
 OLD_FILES+=usr/bin/svnlitebench
 OLD_FILES+=usr/bin/svnlitedumpfilter
 OLD_FILES+=usr/bin/svnlitefsfs
 OLD_FILES+=usr/bin/svnlitelook
 OLD_FILES+=usr/bin/svnlitemucc
 OLD_FILES+=usr/bin/svnliterdump
 OLD_FILES+=usr/bin/svnliteserve
 OLD_FILES+=usr/bin/svnlitesync
 OLD_FILES+=usr/bin/svnliteversion
 OLD_FILES+=usr/bin/svnlook
 OLD_FILES+=usr/bin/svnmucc
 OLD_FILES+=usr/bin/svnrdump
 OLD_FILES+=usr/bin/svnserve
 OLD_FILES+=usr/bin/svnsync
 OLD_FILES+=usr/bin/svnversion
 OLD_FILES+=usr/share/man/man1/svnlite.1.gz
 
 # 20210607: remove ancontrol(8) related programs
 OLD_FILES+=usr/sbin/ancontrol
 OLD_FILES+=usr/share/man/man8/ancontrol.8.gz
 
 # 20210607: remove an(4)
 OLD_FILES+=usr/include/dev/an/if_aironet_ieee.h
 OLD_FILES+=usr/include/dev/an/if_anreg.h
 OLD_FILES+=usr/share/man/man4/an.4.gz
 
 # 20210426: remove unused libexec/rc.d/addswap
 OLD_FILES+=etc/rc.d/addswap
 
 # 20210413: Remove pfctlinput2
 OLD_FILES+=usr/share/man/man9/pfctlinput2.9.gz
 
 # 20210412: Remove kernel asymmetric crypto
 OLD_FILES+=usr/share/man/man9/crypto_asym.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_kdispatch.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_kdone.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_kregister.9.gz
 OLD_FILES+=usr/share/man/man9/CRYPTODEV_KPROCESS.9.gz
 
 # 20210410: remove unused libexec/rc.d/archdep
 OLD_FILES+=etc/rc.d/archdep
 
 # 20210408: remove tcp_hostcache.h
 OLD_FILES+=usr/include/netinet/tcp_hostcache.h
 
 # 20210403: remove kgmon(8)
 OLD_FILES+=usr/sbin/kgmon
 OLD_FILES+=usr/share/man/man8/kgmon.8.gz
 
 # 20210401: remove bt(4) man page
 OLD_FILES+=usr/share/man/man4/bt.4.gz
 
 # 20210322: retire mn(4) sync serial driver
 OLD_FILES+=usr/share/man/man4/if_mn.4.gz
 OLD_FILES+=usr/share/man/man4/mn.4.gz
 
 # 20210318: remove the terminfo database
 OLD_FILES+=usr/share/terminfo/1/1178
 OLD_FILES+=usr/share/terminfo/1/1730-lm
 OLD_DIRS+=usr/share/terminfo/1
 OLD_FILES+=usr/share/terminfo/2/2621
 OLD_FILES+=usr/share/terminfo/2/2621-wl
 OLD_FILES+=usr/share/terminfo/2/2621A
 OLD_FILES+=usr/share/terminfo/2/2621a
 OLD_DIRS+=usr/share/terminfo/2/
 OLD_FILES+=usr/share/terminfo/3/386at
 OLD_FILES+=usr/share/terminfo/3/3b1
 OLD_DIRS+=usr/share/terminfo/3/
 OLD_FILES+=usr/share/terminfo/4/4025ex
 OLD_FILES+=usr/share/terminfo/4/4027ex
 OLD_FILES+=usr/share/terminfo/4/4410-w
 OLD_DIRS+=usr/share/terminfo/4/
 OLD_FILES+=usr/share/terminfo/5/5051
 OLD_FILES+=usr/share/terminfo/5/5410-w
 OLD_FILES+=usr/share/terminfo/5/5620
 OLD_FILES+=usr/share/terminfo/5/5630-24
 OLD_FILES+=usr/share/terminfo/5/5630DMD-24
 OLD_DIRS+=usr/share/terminfo/5/
 OLD_FILES+=usr/share/terminfo/6/6053
 OLD_FILES+=usr/share/terminfo/6/6053-dg
 OLD_FILES+=usr/share/terminfo/6/605x
 OLD_FILES+=usr/share/terminfo/6/605x-dg
 OLD_FILES+=usr/share/terminfo/6/630-lm
 OLD_FILES+=usr/share/terminfo/6/630MTG-24
 OLD_DIRS+=usr/share/terminfo/6/
 OLD_FILES+=usr/share/terminfo/7/730MTG-24
 OLD_FILES+=usr/share/terminfo/7/730MTG-41
 OLD_FILES+=usr/share/terminfo/7/730MTG-41r
 OLD_FILES+=usr/share/terminfo/7/730MTGr
 OLD_FILES+=usr/share/terminfo/7/730MTGr-24
 OLD_DIRS+=usr/share/terminfo/7/
 OLD_FILES+=usr/share/terminfo/8/8510
 OLD_DIRS+=usr/share/terminfo/8/
 OLD_FILES+=usr/share/terminfo/9/955-hb
 OLD_FILES+=usr/share/terminfo/9/955-w
 OLD_FILES+=usr/share/terminfo/9/9term
 OLD_DIRS+=usr/share/terminfo/9/
 OLD_FILES+=usr/share/terminfo/A/Apple_Terminal
 OLD_DIRS+=usr/share/terminfo/A/
 OLD_FILES+=usr/share/terminfo/E/Eterm
 OLD_FILES+=usr/share/terminfo/E/Eterm-256color
 OLD_FILES+=usr/share/terminfo/E/Eterm-88color
 OLD_FILES+=usr/share/terminfo/E/Eterm-color
 OLD_DIRS+=usr/share/terminfo/E/
 OLD_FILES+=usr/share/terminfo/L/LFT-PC850
 OLD_DIRS+=usr/share/terminfo/L/
 OLD_FILES+=usr/share/terminfo/M/MtxOrb
 OLD_FILES+=usr/share/terminfo/M/MtxOrb162
 OLD_FILES+=usr/share/terminfo/M/MtxOrb204
 OLD_DIRS+=usr/share/terminfo/M/
 OLD_FILES+=usr/share/terminfo/N/NCR260VT300WPP
 OLD_FILES+=usr/share/terminfo/N/NCRVT100WPP
 OLD_DIRS+=usr/share/terminfo/N/
 OLD_FILES+=usr/share/terminfo/P/P12
 OLD_FILES+=usr/share/terminfo/P/P12-M
 OLD_FILES+=usr/share/terminfo/P/P12-M-W
 OLD_FILES+=usr/share/terminfo/P/P12-W
 OLD_FILES+=usr/share/terminfo/P/P14
 OLD_FILES+=usr/share/terminfo/P/P14-M
 OLD_FILES+=usr/share/terminfo/P/P14-M-W
 OLD_FILES+=usr/share/terminfo/P/P14-W
 OLD_FILES+=usr/share/terminfo/P/P4
 OLD_FILES+=usr/share/terminfo/P/P5
 OLD_FILES+=usr/share/terminfo/P/P7
 OLD_FILES+=usr/share/terminfo/P/P8
 OLD_FILES+=usr/share/terminfo/P/P8-W
 OLD_FILES+=usr/share/terminfo/P/P9
 OLD_FILES+=usr/share/terminfo/P/P9-8
 OLD_FILES+=usr/share/terminfo/P/P9-8-W
 OLD_FILES+=usr/share/terminfo/P/P9-W
 OLD_DIRS+=usr/share/terminfo/P/
 OLD_FILES+=usr/share/terminfo/Q/Q306-8-pc
 OLD_FILES+=usr/share/terminfo/Q/Q310-vip-H
 OLD_FILES+=usr/share/terminfo/Q/Q310-vip-H-am
 OLD_FILES+=usr/share/terminfo/Q/Q310-vip-Hw
 OLD_FILES+=usr/share/terminfo/Q/Q310-vip-w
 OLD_FILES+=usr/share/terminfo/Q/Q310-vip-w-am
 OLD_DIRS+=usr/share/terminfo/Q/
 OLD_FILES+=usr/share/terminfo/X/X-hpterm
 OLD_DIRS+=usr/share/terminfo/X/
 OLD_FILES+=usr/share/terminfo/a/a210
 OLD_FILES+=usr/share/terminfo/a/a80
 OLD_FILES+=usr/share/terminfo/a/a980
 OLD_FILES+=usr/share/terminfo/a/aa4080
 OLD_FILES+=usr/share/terminfo/a/aaa
 OLD_FILES+=usr/share/terminfo/a/aaa+dec
 OLD_FILES+=usr/share/terminfo/a/aaa+rv
 OLD_FILES+=usr/share/terminfo/a/aaa+unk
 OLD_FILES+=usr/share/terminfo/a/aaa-18
 OLD_FILES+=usr/share/terminfo/a/aaa-18-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-20
 OLD_FILES+=usr/share/terminfo/a/aaa-22
 OLD_FILES+=usr/share/terminfo/a/aaa-24
 OLD_FILES+=usr/share/terminfo/a/aaa-24-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-26
 OLD_FILES+=usr/share/terminfo/a/aaa-28
 OLD_FILES+=usr/share/terminfo/a/aaa-30
 OLD_FILES+=usr/share/terminfo/a/aaa-30-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-30-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-30-rv-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-30-s
 OLD_FILES+=usr/share/terminfo/a/aaa-30-s-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-30-s-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-30-s-rv-ct
 OLD_FILES+=usr/share/terminfo/a/aaa-36
 OLD_FILES+=usr/share/terminfo/a/aaa-36-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-40
 OLD_FILES+=usr/share/terminfo/a/aaa-40-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-48
 OLD_FILES+=usr/share/terminfo/a/aaa-48-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-60
 OLD_FILES+=usr/share/terminfo/a/aaa-60-dec-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-60-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-60-s
 OLD_FILES+=usr/share/terminfo/a/aaa-60-s-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-db
 OLD_FILES+=usr/share/terminfo/a/aaa-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-rv-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-rv-unk
 OLD_FILES+=usr/share/terminfo/a/aaa-s
 OLD_FILES+=usr/share/terminfo/a/aaa-s-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-s-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-s-rv-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-unk
 OLD_FILES+=usr/share/terminfo/a/aas1901
 OLD_FILES+=usr/share/terminfo/a/abm80
 OLD_FILES+=usr/share/terminfo/a/abm85
 OLD_FILES+=usr/share/terminfo/a/abm85e
 OLD_FILES+=usr/share/terminfo/a/abm85h
 OLD_FILES+=usr/share/terminfo/a/abm85h-old
 OLD_FILES+=usr/share/terminfo/a/absolute
 OLD_FILES+=usr/share/terminfo/a/act4
 OLD_FILES+=usr/share/terminfo/a/act5
 OLD_FILES+=usr/share/terminfo/a/addrinfo
 OLD_FILES+=usr/share/terminfo/a/adds200
 OLD_FILES+=usr/share/terminfo/a/adds980
 OLD_FILES+=usr/share/terminfo/a/addsviewpoint
 OLD_FILES+=usr/share/terminfo/a/addsvp60
 OLD_FILES+=usr/share/terminfo/a/adm+sgr
 OLD_FILES+=usr/share/terminfo/a/adm1
 OLD_FILES+=usr/share/terminfo/a/adm11
 OLD_FILES+=usr/share/terminfo/a/adm1178
 OLD_FILES+=usr/share/terminfo/a/adm12
 OLD_FILES+=usr/share/terminfo/a/adm1a
 OLD_FILES+=usr/share/terminfo/a/adm2
 OLD_FILES+=usr/share/terminfo/a/adm20
 OLD_FILES+=usr/share/terminfo/a/adm21
 OLD_FILES+=usr/share/terminfo/a/adm22
 OLD_FILES+=usr/share/terminfo/a/adm3
 OLD_FILES+=usr/share/terminfo/a/adm31
 OLD_FILES+=usr/share/terminfo/a/adm31-old
 OLD_FILES+=usr/share/terminfo/a/adm36
 OLD_FILES+=usr/share/terminfo/a/adm3a
 OLD_FILES+=usr/share/terminfo/a/adm3a+
 OLD_FILES+=usr/share/terminfo/a/adm42
 OLD_FILES+=usr/share/terminfo/a/adm42-ns
 OLD_FILES+=usr/share/terminfo/a/adm5
 OLD_FILES+=usr/share/terminfo/a/aepro
 OLD_FILES+=usr/share/terminfo/a/aixterm
 OLD_FILES+=usr/share/terminfo/a/aixterm-16color
 OLD_FILES+=usr/share/terminfo/a/aixterm-m
 OLD_FILES+=usr/share/terminfo/a/aixterm-m-old
 OLD_FILES+=usr/share/terminfo/a/aj
 OLD_FILES+=usr/share/terminfo/a/aj510
 OLD_FILES+=usr/share/terminfo/a/aj830
 OLD_FILES+=usr/share/terminfo/a/aj832
 OLD_FILES+=usr/share/terminfo/a/alacritty
 OLD_FILES+=usr/share/terminfo/a/alacritty+common
 OLD_FILES+=usr/share/terminfo/a/alacritty-direct
 OLD_FILES+=usr/share/terminfo/a/alt2
 OLD_FILES+=usr/share/terminfo/a/alt3
 OLD_FILES+=usr/share/terminfo/a/alt4
 OLD_FILES+=usr/share/terminfo/a/alt5
 OLD_FILES+=usr/share/terminfo/a/alt7
 OLD_FILES+=usr/share/terminfo/a/alt7pc
 OLD_FILES+=usr/share/terminfo/a/alto-h19
 OLD_FILES+=usr/share/terminfo/a/alto-heath
 OLD_FILES+=usr/share/terminfo/a/altoh19
 OLD_FILES+=usr/share/terminfo/a/altoheath
 OLD_FILES+=usr/share/terminfo/a/altos-2
 OLD_FILES+=usr/share/terminfo/a/altos-3
 OLD_FILES+=usr/share/terminfo/a/altos-4
 OLD_FILES+=usr/share/terminfo/a/altos-5
 OLD_FILES+=usr/share/terminfo/a/altos2
 OLD_FILES+=usr/share/terminfo/a/altos3
 OLD_FILES+=usr/share/terminfo/a/altos4
 OLD_FILES+=usr/share/terminfo/a/altos5
 OLD_FILES+=usr/share/terminfo/a/altos7
 OLD_FILES+=usr/share/terminfo/a/altos7pc
 OLD_FILES+=usr/share/terminfo/a/ambas
 OLD_FILES+=usr/share/terminfo/a/ambassador
 OLD_FILES+=usr/share/terminfo/a/amiga
 OLD_FILES+=usr/share/terminfo/a/amiga-8bit
 OLD_FILES+=usr/share/terminfo/a/amiga-h
 OLD_FILES+=usr/share/terminfo/a/amiga-vnc
 OLD_FILES+=usr/share/terminfo/a/amp219
 OLD_FILES+=usr/share/terminfo/a/amp219w
 OLD_FILES+=usr/share/terminfo/a/ampex-219
 OLD_FILES+=usr/share/terminfo/a/ampex-219w
 OLD_FILES+=usr/share/terminfo/a/ampex-232
 OLD_FILES+=usr/share/terminfo/a/ampex175
 OLD_FILES+=usr/share/terminfo/a/ampex175-b
 OLD_FILES+=usr/share/terminfo/a/ampex210
 OLD_FILES+=usr/share/terminfo/a/ampex219
 OLD_FILES+=usr/share/terminfo/a/ampex219w
 OLD_FILES+=usr/share/terminfo/a/ampex232
 OLD_FILES+=usr/share/terminfo/a/ampex232w
 OLD_FILES+=usr/share/terminfo/a/ampex80
 OLD_FILES+=usr/share/terminfo/a/annarbor4080
 OLD_FILES+=usr/share/terminfo/a/ansi
 OLD_FILES+=usr/share/terminfo/a/ansi+arrows
 OLD_FILES+=usr/share/terminfo/a/ansi+csr
 OLD_FILES+=usr/share/terminfo/a/ansi+cup
 OLD_FILES+=usr/share/terminfo/a/ansi+enq
 OLD_FILES+=usr/share/terminfo/a/ansi+erase
 OLD_FILES+=usr/share/terminfo/a/ansi+idc
 OLD_FILES+=usr/share/terminfo/a/ansi+idc1
 OLD_FILES+=usr/share/terminfo/a/ansi+idl
 OLD_FILES+=usr/share/terminfo/a/ansi+idl1
 OLD_FILES+=usr/share/terminfo/a/ansi+inittabs
 OLD_FILES+=usr/share/terminfo/a/ansi+local
 OLD_FILES+=usr/share/terminfo/a/ansi+local1
 OLD_FILES+=usr/share/terminfo/a/ansi+pp
 OLD_FILES+=usr/share/terminfo/a/ansi+rca
 OLD_FILES+=usr/share/terminfo/a/ansi+rep
 OLD_FILES+=usr/share/terminfo/a/ansi+sgr
 OLD_FILES+=usr/share/terminfo/a/ansi+sgrbold
 OLD_FILES+=usr/share/terminfo/a/ansi+sgrdim
 OLD_FILES+=usr/share/terminfo/a/ansi+sgrso
 OLD_FILES+=usr/share/terminfo/a/ansi+sgrul
 OLD_FILES+=usr/share/terminfo/a/ansi+tabs
 OLD_FILES+=usr/share/terminfo/a/ansi-color-2-emx
 OLD_FILES+=usr/share/terminfo/a/ansi-color-3-emx
 OLD_FILES+=usr/share/terminfo/a/ansi-emx
 OLD_FILES+=usr/share/terminfo/a/ansi-generic
 OLD_FILES+=usr/share/terminfo/a/ansi-m
 OLD_FILES+=usr/share/terminfo/a/ansi-mini
 OLD_FILES+=usr/share/terminfo/a/ansi-mono
 OLD_FILES+=usr/share/terminfo/a/ansi-mr
 OLD_FILES+=usr/share/terminfo/a/ansi-mtabs
 OLD_FILES+=usr/share/terminfo/a/ansi-nt
 OLD_FILES+=usr/share/terminfo/a/ansi.sys
 OLD_FILES+=usr/share/terminfo/a/ansi.sys-old
 OLD_FILES+=usr/share/terminfo/a/ansi.sysk
 OLD_FILES+=usr/share/terminfo/a/ansi43m
 OLD_FILES+=usr/share/terminfo/a/ansi77
 OLD_FILES+=usr/share/terminfo/a/ansi80x25
 OLD_FILES+=usr/share/terminfo/a/ansi80x25-mono
 OLD_FILES+=usr/share/terminfo/a/ansi80x25-raw
 OLD_FILES+=usr/share/terminfo/a/ansi80x30
 OLD_FILES+=usr/share/terminfo/a/ansi80x30-mono
 OLD_FILES+=usr/share/terminfo/a/ansi80x43
 OLD_FILES+=usr/share/terminfo/a/ansi80x43-mono
 OLD_FILES+=usr/share/terminfo/a/ansi80x50
 OLD_FILES+=usr/share/terminfo/a/ansi80x50-mono
 OLD_FILES+=usr/share/terminfo/a/ansi80x60
 OLD_FILES+=usr/share/terminfo/a/ansi80x60-mono
 OLD_FILES+=usr/share/terminfo/a/ansil
 OLD_FILES+=usr/share/terminfo/a/ansil-mono
 OLD_FILES+=usr/share/terminfo/a/ansis
 OLD_FILES+=usr/share/terminfo/a/ansis-mono
 OLD_FILES+=usr/share/terminfo/a/ansisysk
 OLD_FILES+=usr/share/terminfo/a/ansiterm
 OLD_FILES+=usr/share/terminfo/a/ansiw
 OLD_FILES+=usr/share/terminfo/a/ap-vm80
 OLD_FILES+=usr/share/terminfo/a/apl
 OLD_FILES+=usr/share/terminfo/a/apollo
 OLD_FILES+=usr/share/terminfo/a/apollo_15P
 OLD_FILES+=usr/share/terminfo/a/apollo_19L
 OLD_FILES+=usr/share/terminfo/a/apollo_color
 OLD_FILES+=usr/share/terminfo/a/apple-80
 OLD_FILES+=usr/share/terminfo/a/apple-ae
 OLD_FILES+=usr/share/terminfo/a/apple-soroc
 OLD_FILES+=usr/share/terminfo/a/apple-uterm
 OLD_FILES+=usr/share/terminfo/a/apple-uterm-vb
 OLD_FILES+=usr/share/terminfo/a/apple-videx
 OLD_FILES+=usr/share/terminfo/a/apple-videx2
 OLD_FILES+=usr/share/terminfo/a/apple-videx3
 OLD_FILES+=usr/share/terminfo/a/apple-vm80
 OLD_FILES+=usr/share/terminfo/a/apple2e
 OLD_FILES+=usr/share/terminfo/a/apple2e-p
 OLD_FILES+=usr/share/terminfo/a/apple80p
 OLD_FILES+=usr/share/terminfo/a/appleII
 OLD_FILES+=usr/share/terminfo/a/appleIIc
 OLD_FILES+=usr/share/terminfo/a/appleIIe
 OLD_FILES+=usr/share/terminfo/a/appleIIgs
 OLD_FILES+=usr/share/terminfo/a/arm100
 OLD_FILES+=usr/share/terminfo/a/arm100-am
 OLD_FILES+=usr/share/terminfo/a/arm100-w
 OLD_FILES+=usr/share/terminfo/a/arm100-wam
 OLD_FILES+=usr/share/terminfo/a/at
 OLD_FILES+=usr/share/terminfo/a/at-color
 OLD_FILES+=usr/share/terminfo/a/at-m
 OLD_FILES+=usr/share/terminfo/a/at386
 OLD_FILES+=usr/share/terminfo/a/atari
 OLD_FILES+=usr/share/terminfo/a/atari-color
 OLD_FILES+=usr/share/terminfo/a/atari-m
 OLD_FILES+=usr/share/terminfo/a/atari-old
 OLD_FILES+=usr/share/terminfo/a/atari_st
 OLD_FILES+=usr/share/terminfo/a/atari_st-color
 OLD_FILES+=usr/share/terminfo/a/atarist-m
 OLD_FILES+=usr/share/terminfo/a/aterm
 OLD_FILES+=usr/share/terminfo/a/att2300
 OLD_FILES+=usr/share/terminfo/a/att2350
 OLD_FILES+=usr/share/terminfo/a/att4410
 OLD_FILES+=usr/share/terminfo/a/att4410-w
 OLD_FILES+=usr/share/terminfo/a/att4410v1
 OLD_FILES+=usr/share/terminfo/a/att4410v1-w
 OLD_FILES+=usr/share/terminfo/a/att4415
 OLD_FILES+=usr/share/terminfo/a/att4415+nl
 OLD_FILES+=usr/share/terminfo/a/att4415-nl
 OLD_FILES+=usr/share/terminfo/a/att4415-rv
 OLD_FILES+=usr/share/terminfo/a/att4415-rv-nl
 OLD_FILES+=usr/share/terminfo/a/att4415-w
 OLD_FILES+=usr/share/terminfo/a/att4415-w-nl
 OLD_FILES+=usr/share/terminfo/a/att4415-w-rv
 OLD_FILES+=usr/share/terminfo/a/att4415-w-rv-n
 OLD_FILES+=usr/share/terminfo/a/att4418
 OLD_FILES+=usr/share/terminfo/a/att4418-w
 OLD_FILES+=usr/share/terminfo/a/att4420
 OLD_FILES+=usr/share/terminfo/a/att4424
 OLD_FILES+=usr/share/terminfo/a/att4424-1
 OLD_FILES+=usr/share/terminfo/a/att4424m
 OLD_FILES+=usr/share/terminfo/a/att4425
 OLD_FILES+=usr/share/terminfo/a/att4425-nl
 OLD_FILES+=usr/share/terminfo/a/att4425-w
 OLD_FILES+=usr/share/terminfo/a/att4426
 OLD_FILES+=usr/share/terminfo/a/att500
 OLD_FILES+=usr/share/terminfo/a/att505
 OLD_FILES+=usr/share/terminfo/a/att505-24
 OLD_FILES+=usr/share/terminfo/a/att510a
 OLD_FILES+=usr/share/terminfo/a/att510d
 OLD_FILES+=usr/share/terminfo/a/att513
 OLD_FILES+=usr/share/terminfo/a/att5310
 OLD_FILES+=usr/share/terminfo/a/att5320
 OLD_FILES+=usr/share/terminfo/a/att5410
 OLD_FILES+=usr/share/terminfo/a/att5410-w
 OLD_FILES+=usr/share/terminfo/a/att5410v1
 OLD_FILES+=usr/share/terminfo/a/att5410v1-w
 OLD_FILES+=usr/share/terminfo/a/att5418
 OLD_FILES+=usr/share/terminfo/a/att5418-w
 OLD_FILES+=usr/share/terminfo/a/att5420
 OLD_FILES+=usr/share/terminfo/a/att5420+nl
 OLD_FILES+=usr/share/terminfo/a/att5420-nl
 OLD_FILES+=usr/share/terminfo/a/att5420-rv
 OLD_FILES+=usr/share/terminfo/a/att5420-rv-nl
 OLD_FILES+=usr/share/terminfo/a/att5420-w
 OLD_FILES+=usr/share/terminfo/a/att5420-w-nl
 OLD_FILES+=usr/share/terminfo/a/att5420-w-rv
 OLD_FILES+=usr/share/terminfo/a/att5420-w-rv-n
 OLD_FILES+=usr/share/terminfo/a/att5420_2
 OLD_FILES+=usr/share/terminfo/a/att5420_2-w
 OLD_FILES+=usr/share/terminfo/a/att5425
 OLD_FILES+=usr/share/terminfo/a/att5425-nl
 OLD_FILES+=usr/share/terminfo/a/att5425-w
 OLD_FILES+=usr/share/terminfo/a/att5430
 OLD_FILES+=usr/share/terminfo/a/att5620
 OLD_FILES+=usr/share/terminfo/a/att5620-1
 OLD_FILES+=usr/share/terminfo/a/att5620-24
 OLD_FILES+=usr/share/terminfo/a/att5620-34
 OLD_FILES+=usr/share/terminfo/a/att5620-s
 OLD_FILES+=usr/share/terminfo/a/att605
 OLD_FILES+=usr/share/terminfo/a/att605-pc
 OLD_FILES+=usr/share/terminfo/a/att605-w
 OLD_FILES+=usr/share/terminfo/a/att610
 OLD_FILES+=usr/share/terminfo/a/att610+cvis
 OLD_FILES+=usr/share/terminfo/a/att610+cvis0
 OLD_FILES+=usr/share/terminfo/a/att610-103k
 OLD_FILES+=usr/share/terminfo/a/att610-103k-w
 OLD_FILES+=usr/share/terminfo/a/att610-w
 OLD_FILES+=usr/share/terminfo/a/att615
 OLD_FILES+=usr/share/terminfo/a/att615-103k
 OLD_FILES+=usr/share/terminfo/a/att615-103k-w
 OLD_FILES+=usr/share/terminfo/a/att615-w
 OLD_FILES+=usr/share/terminfo/a/att620
 OLD_FILES+=usr/share/terminfo/a/att620-103k
 OLD_FILES+=usr/share/terminfo/a/att620-103k-w
 OLD_FILES+=usr/share/terminfo/a/att620-w
 OLD_FILES+=usr/share/terminfo/a/att630
 OLD_FILES+=usr/share/terminfo/a/att630-24
 OLD_FILES+=usr/share/terminfo/a/att6386
 OLD_FILES+=usr/share/terminfo/a/att700
 OLD_FILES+=usr/share/terminfo/a/att730
 OLD_FILES+=usr/share/terminfo/a/att730-24
 OLD_FILES+=usr/share/terminfo/a/att730-41
 OLD_FILES+=usr/share/terminfo/a/att7300
 OLD_FILES+=usr/share/terminfo/a/att730r
 OLD_FILES+=usr/share/terminfo/a/att730r-24
 OLD_FILES+=usr/share/terminfo/a/att730r-41
 OLD_FILES+=usr/share/terminfo/a/avatar
 OLD_FILES+=usr/share/terminfo/a/avatar0
 OLD_FILES+=usr/share/terminfo/a/avatar0+
 OLD_FILES+=usr/share/terminfo/a/avatar1
 OLD_FILES+=usr/share/terminfo/a/avt
 OLD_FILES+=usr/share/terminfo/a/avt+s
 OLD_FILES+=usr/share/terminfo/a/avt-ns
 OLD_FILES+=usr/share/terminfo/a/avt-rv
 OLD_FILES+=usr/share/terminfo/a/avt-rv-ns
 OLD_FILES+=usr/share/terminfo/a/avt-rv-s
 OLD_FILES+=usr/share/terminfo/a/avt-s
 OLD_FILES+=usr/share/terminfo/a/avt-w
 OLD_FILES+=usr/share/terminfo/a/avt-w-ns
 OLD_FILES+=usr/share/terminfo/a/avt-w-rv
 OLD_FILES+=usr/share/terminfo/a/avt-w-rv-ns
 OLD_FILES+=usr/share/terminfo/a/avt-w-rv-s
 OLD_FILES+=usr/share/terminfo/a/avt-w-s
 OLD_FILES+=usr/share/terminfo/a/aws
 OLD_FILES+=usr/share/terminfo/a/awsc
 OLD_DIRS+=usr/share/terminfo/a/
 OLD_FILES+=usr/share/terminfo/b/b-128
 OLD_FILES+=usr/share/terminfo/b/bantam
 OLD_FILES+=usr/share/terminfo/b/basic4
 OLD_FILES+=usr/share/terminfo/b/basis
 OLD_FILES+=usr/share/terminfo/b/bct510a
 OLD_FILES+=usr/share/terminfo/b/bct510d
 OLD_FILES+=usr/share/terminfo/b/beacon
 OLD_FILES+=usr/share/terminfo/b/bee
 OLD_FILES+=usr/share/terminfo/b/beehive
 OLD_FILES+=usr/share/terminfo/b/beehive3
 OLD_FILES+=usr/share/terminfo/b/beehive4
 OLD_FILES+=usr/share/terminfo/b/beehiveIIIm
 OLD_FILES+=usr/share/terminfo/b/beterm
 OLD_FILES+=usr/share/terminfo/b/bg1.25
 OLD_FILES+=usr/share/terminfo/b/bg1.25nv
 OLD_FILES+=usr/share/terminfo/b/bg1.25rv
 OLD_FILES+=usr/share/terminfo/b/bg2.0
 OLD_FILES+=usr/share/terminfo/b/bg2.0nv
 OLD_FILES+=usr/share/terminfo/b/bg2.0rv
 OLD_FILES+=usr/share/terminfo/b/bg3.10
 OLD_FILES+=usr/share/terminfo/b/bg3.10nv
 OLD_FILES+=usr/share/terminfo/b/bg3.10rv
 OLD_FILES+=usr/share/terminfo/b/bh3m
 OLD_FILES+=usr/share/terminfo/b/bh4
 OLD_FILES+=usr/share/terminfo/b/bitgraph
 OLD_FILES+=usr/share/terminfo/b/blit
 OLD_FILES+=usr/share/terminfo/b/bobcat
 OLD_FILES+=usr/share/terminfo/b/bq300
 OLD_FILES+=usr/share/terminfo/b/bq300-8
 OLD_FILES+=usr/share/terminfo/b/bq300-8-pc
 OLD_FILES+=usr/share/terminfo/b/bq300-8-pc-rv
 OLD_FILES+=usr/share/terminfo/b/bq300-8-pc-w
 OLD_FILES+=usr/share/terminfo/b/bq300-8-pc-w-rv
 OLD_FILES+=usr/share/terminfo/b/bq300-8rv
 OLD_FILES+=usr/share/terminfo/b/bq300-8w
 OLD_FILES+=usr/share/terminfo/b/bq300-pc
 OLD_FILES+=usr/share/terminfo/b/bq300-pc-rv
 OLD_FILES+=usr/share/terminfo/b/bq300-pc-w
 OLD_FILES+=usr/share/terminfo/b/bq300-pc-w-rv
 OLD_FILES+=usr/share/terminfo/b/bq300-rv
 OLD_FILES+=usr/share/terminfo/b/bq300-w
 OLD_FILES+=usr/share/terminfo/b/bq300-w-8rv
 OLD_FILES+=usr/share/terminfo/b/bq300-w-rv
 OLD_FILES+=usr/share/terminfo/b/bsdos-pc
 OLD_FILES+=usr/share/terminfo/b/bsdos-pc-m
 OLD_FILES+=usr/share/terminfo/b/bsdos-pc-mono
 OLD_FILES+=usr/share/terminfo/b/bsdos-pc-nobold
 OLD_FILES+=usr/share/terminfo/b/bsdos-ppc
 OLD_FILES+=usr/share/terminfo/b/bsdos-sparc
 OLD_FILES+=usr/share/terminfo/b/bterm
 OLD_DIRS+=usr/share/terminfo/b/
 OLD_FILES+=usr/share/terminfo/c/c100
 OLD_FILES+=usr/share/terminfo/c/c100-1p
 OLD_FILES+=usr/share/terminfo/c/c100-4p
 OLD_FILES+=usr/share/terminfo/c/c100-rv
 OLD_FILES+=usr/share/terminfo/c/c100-rv-4p
 OLD_FILES+=usr/share/terminfo/c/c104
 OLD_FILES+=usr/share/terminfo/c/c108
 OLD_FILES+=usr/share/terminfo/c/c108-4p
 OLD_FILES+=usr/share/terminfo/c/c108-8p
 OLD_FILES+=usr/share/terminfo/c/c108-rv
 OLD_FILES+=usr/share/terminfo/c/c108-rv-4p
 OLD_FILES+=usr/share/terminfo/c/c108-rv-8p
 OLD_FILES+=usr/share/terminfo/c/c108-w
 OLD_FILES+=usr/share/terminfo/c/c108-w-8p
 OLD_FILES+=usr/share/terminfo/c/c300
 OLD_FILES+=usr/share/terminfo/c/c301
 OLD_FILES+=usr/share/terminfo/c/c321
 OLD_FILES+=usr/share/terminfo/c/ca22851
 OLD_FILES+=usr/share/terminfo/c/cad68-2
 OLD_FILES+=usr/share/terminfo/c/cad68-3
 OLD_FILES+=usr/share/terminfo/c/cbblit
 OLD_FILES+=usr/share/terminfo/c/cbunix
 OLD_FILES+=usr/share/terminfo/c/cci
 OLD_FILES+=usr/share/terminfo/c/cci1
 OLD_FILES+=usr/share/terminfo/c/cdc456
 OLD_FILES+=usr/share/terminfo/c/cdc721
 OLD_FILES+=usr/share/terminfo/c/cdc721-esc
 OLD_FILES+=usr/share/terminfo/c/cdc721ll
 OLD_FILES+=usr/share/terminfo/c/cdc752
 OLD_FILES+=usr/share/terminfo/c/cdc756
 OLD_FILES+=usr/share/terminfo/c/cg7900
 OLD_FILES+=usr/share/terminfo/c/cgc2
 OLD_FILES+=usr/share/terminfo/c/cgc3
 OLD_FILES+=usr/share/terminfo/c/chromatics
 OLD_FILES+=usr/share/terminfo/c/ci8510
 OLD_FILES+=usr/share/terminfo/c/cit-80
 OLD_FILES+=usr/share/terminfo/c/cit101
 OLD_FILES+=usr/share/terminfo/c/cit101e
 OLD_FILES+=usr/share/terminfo/c/cit101e-132
 OLD_FILES+=usr/share/terminfo/c/cit101e-n
 OLD_FILES+=usr/share/terminfo/c/cit101e-n132
 OLD_FILES+=usr/share/terminfo/c/cit101e-rv
 OLD_FILES+=usr/share/terminfo/c/cit500
 OLD_FILES+=usr/share/terminfo/c/cit80
 OLD_FILES+=usr/share/terminfo/c/citc
 OLD_FILES+=usr/share/terminfo/c/citoh
 OLD_FILES+=usr/share/terminfo/c/citoh-6lpi
 OLD_FILES+=usr/share/terminfo/c/citoh-8lpi
 OLD_FILES+=usr/share/terminfo/c/citoh-comp
 OLD_FILES+=usr/share/terminfo/c/citoh-elite
 OLD_FILES+=usr/share/terminfo/c/citoh-pica
 OLD_FILES+=usr/share/terminfo/c/citoh-prop
 OLD_FILES+=usr/share/terminfo/c/citoh-ps
 OLD_FILES+=usr/share/terminfo/c/coco3
 OLD_FILES+=usr/share/terminfo/c/coherent
 OLD_FILES+=usr/share/terminfo/c/color_xterm
 OLD_FILES+=usr/share/terminfo/c/colorscan
 OLD_FILES+=usr/share/terminfo/c/commodore
 OLD_FILES+=usr/share/terminfo/c/concept
 OLD_FILES+=usr/share/terminfo/c/concept-avt
 OLD_FILES+=usr/share/terminfo/c/concept100
 OLD_FILES+=usr/share/terminfo/c/concept100-rv
 OLD_FILES+=usr/share/terminfo/c/concept108
 OLD_FILES+=usr/share/terminfo/c/concept108-4p
 OLD_FILES+=usr/share/terminfo/c/concept108-8p
 OLD_FILES+=usr/share/terminfo/c/concept108-w-8
 OLD_FILES+=usr/share/terminfo/c/concept108-w8p
 OLD_FILES+=usr/share/terminfo/c/concept108rv4p
 OLD_FILES+=usr/share/terminfo/c/cons25
 OLD_FILES+=usr/share/terminfo/c/cons25-debian
 OLD_FILES+=usr/share/terminfo/c/cons25-iso-m
 OLD_FILES+=usr/share/terminfo/c/cons25-iso8859
 OLD_FILES+=usr/share/terminfo/c/cons25-koi8-r
 OLD_FILES+=usr/share/terminfo/c/cons25-koi8r-m
 OLD_FILES+=usr/share/terminfo/c/cons25-m
 OLD_FILES+=usr/share/terminfo/c/cons25l1
 OLD_FILES+=usr/share/terminfo/c/cons25l1-m
 OLD_FILES+=usr/share/terminfo/c/cons25r
 OLD_FILES+=usr/share/terminfo/c/cons25r-m
 OLD_FILES+=usr/share/terminfo/c/cons25w
 OLD_FILES+=usr/share/terminfo/c/cons30
 OLD_FILES+=usr/share/terminfo/c/cons30-m
 OLD_FILES+=usr/share/terminfo/c/cons43
 OLD_FILES+=usr/share/terminfo/c/cons43-m
 OLD_FILES+=usr/share/terminfo/c/cons50
 OLD_FILES+=usr/share/terminfo/c/cons50-iso-m
 OLD_FILES+=usr/share/terminfo/c/cons50-iso8859
 OLD_FILES+=usr/share/terminfo/c/cons50-koi8r
 OLD_FILES+=usr/share/terminfo/c/cons50-koi8r-m
 OLD_FILES+=usr/share/terminfo/c/cons50-m
 OLD_FILES+=usr/share/terminfo/c/cons50l1
 OLD_FILES+=usr/share/terminfo/c/cons50l1-m
 OLD_FILES+=usr/share/terminfo/c/cons50r
 OLD_FILES+=usr/share/terminfo/c/cons50r-m
 OLD_FILES+=usr/share/terminfo/c/cons60
 OLD_FILES+=usr/share/terminfo/c/cons60-iso
 OLD_FILES+=usr/share/terminfo/c/cons60-iso-m
 OLD_FILES+=usr/share/terminfo/c/cons60-koi8r
 OLD_FILES+=usr/share/terminfo/c/cons60-koi8r-m
 OLD_FILES+=usr/share/terminfo/c/cons60-m
 OLD_FILES+=usr/share/terminfo/c/cons60l1
 OLD_FILES+=usr/share/terminfo/c/cons60l1-m
 OLD_FILES+=usr/share/terminfo/c/cons60r
 OLD_FILES+=usr/share/terminfo/c/cons60r-m
 OLD_FILES+=usr/share/terminfo/c/contel300
 OLD_FILES+=usr/share/terminfo/c/contel301
 OLD_FILES+=usr/share/terminfo/c/contel320
 OLD_FILES+=usr/share/terminfo/c/contel321
 OLD_FILES+=usr/share/terminfo/c/cops
 OLD_FILES+=usr/share/terminfo/c/cops-10
 OLD_FILES+=usr/share/terminfo/c/cops10
 OLD_FILES+=usr/share/terminfo/c/crt
 OLD_FILES+=usr/share/terminfo/c/crt-vt220
 OLD_FILES+=usr/share/terminfo/c/cs10
 OLD_FILES+=usr/share/terminfo/c/cs10-w
 OLD_FILES+=usr/share/terminfo/c/ct82
 OLD_FILES+=usr/share/terminfo/c/ct8500
 OLD_FILES+=usr/share/terminfo/c/ctrm
 OLD_FILES+=usr/share/terminfo/c/cx
 OLD_FILES+=usr/share/terminfo/c/cx100
 OLD_FILES+=usr/share/terminfo/c/cyb110
 OLD_FILES+=usr/share/terminfo/c/cyb83
 OLD_FILES+=usr/share/terminfo/c/cygwin
 OLD_FILES+=usr/share/terminfo/c/cygwinB19
 OLD_FILES+=usr/share/terminfo/c/cygwinDBG
 OLD_DIRS+=usr/share/terminfo/c/
 OLD_FILES+=usr/share/terminfo/d/d132
 OLD_FILES+=usr/share/terminfo/d/d2
 OLD_FILES+=usr/share/terminfo/d/d2-dg
 OLD_FILES+=usr/share/terminfo/d/d200
 OLD_FILES+=usr/share/terminfo/d/d200-dg
 OLD_FILES+=usr/share/terminfo/d/d210
 OLD_FILES+=usr/share/terminfo/d/d210-dg
 OLD_FILES+=usr/share/terminfo/d/d211
 OLD_FILES+=usr/share/terminfo/d/d211-7b
 OLD_FILES+=usr/share/terminfo/d/d211-dg
 OLD_FILES+=usr/share/terminfo/d/d214
 OLD_FILES+=usr/share/terminfo/d/d214-dg
 OLD_FILES+=usr/share/terminfo/d/d215
 OLD_FILES+=usr/share/terminfo/d/d215-7b
 OLD_FILES+=usr/share/terminfo/d/d215-dg
 OLD_FILES+=usr/share/terminfo/d/d216+
 OLD_FILES+=usr/share/terminfo/d/d216+25
 OLD_FILES+=usr/share/terminfo/d/d216+dg
 OLD_FILES+=usr/share/terminfo/d/d216-dg
 OLD_FILES+=usr/share/terminfo/d/d216-unix
 OLD_FILES+=usr/share/terminfo/d/d216-unix-25
 OLD_FILES+=usr/share/terminfo/d/d216e+
 OLD_FILES+=usr/share/terminfo/d/d216e+dg
 OLD_FILES+=usr/share/terminfo/d/d216e-dg
 OLD_FILES+=usr/share/terminfo/d/d216e-unix
 OLD_FILES+=usr/share/terminfo/d/d217-dg
 OLD_FILES+=usr/share/terminfo/d/d217-unix
 OLD_FILES+=usr/share/terminfo/d/d217-unix-25
 OLD_FILES+=usr/share/terminfo/d/d220
 OLD_FILES+=usr/share/terminfo/d/d220-7b
 OLD_FILES+=usr/share/terminfo/d/d220-dg
 OLD_FILES+=usr/share/terminfo/d/d230
 OLD_FILES+=usr/share/terminfo/d/d230-dg
 OLD_FILES+=usr/share/terminfo/d/d230c
 OLD_FILES+=usr/share/terminfo/d/d230c-dg
 OLD_FILES+=usr/share/terminfo/d/d400
 OLD_FILES+=usr/share/terminfo/d/d400-dg
 OLD_FILES+=usr/share/terminfo/d/d410
 OLD_FILES+=usr/share/terminfo/d/d410-7b
 OLD_FILES+=usr/share/terminfo/d/d410-7b-w
 OLD_FILES+=usr/share/terminfo/d/d410-dg
 OLD_FILES+=usr/share/terminfo/d/d410-w
 OLD_FILES+=usr/share/terminfo/d/d411
 OLD_FILES+=usr/share/terminfo/d/d411-7b
 OLD_FILES+=usr/share/terminfo/d/d411-7b-w
 OLD_FILES+=usr/share/terminfo/d/d411-dg
 OLD_FILES+=usr/share/terminfo/d/d411-w
 OLD_FILES+=usr/share/terminfo/d/d412+
 OLD_FILES+=usr/share/terminfo/d/d412+25
 OLD_FILES+=usr/share/terminfo/d/d412+dg
 OLD_FILES+=usr/share/terminfo/d/d412+s
 OLD_FILES+=usr/share/terminfo/d/d412+sr
 OLD_FILES+=usr/share/terminfo/d/d412+w
 OLD_FILES+=usr/share/terminfo/d/d412-dg
 OLD_FILES+=usr/share/terminfo/d/d412-unix
 OLD_FILES+=usr/share/terminfo/d/d412-unix-25
 OLD_FILES+=usr/share/terminfo/d/d412-unix-s
 OLD_FILES+=usr/share/terminfo/d/d412-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d412-unix-w
 OLD_FILES+=usr/share/terminfo/d/d413-dg
 OLD_FILES+=usr/share/terminfo/d/d413-unix
 OLD_FILES+=usr/share/terminfo/d/d413-unix-25
 OLD_FILES+=usr/share/terminfo/d/d413-unix-s
 OLD_FILES+=usr/share/terminfo/d/d413-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d413-unix-w
 OLD_FILES+=usr/share/terminfo/d/d414-unix
 OLD_FILES+=usr/share/terminfo/d/d414-unix-25
 OLD_FILES+=usr/share/terminfo/d/d414-unix-s
 OLD_FILES+=usr/share/terminfo/d/d414-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d414-unix-w
 OLD_FILES+=usr/share/terminfo/d/d430-dg
 OLD_FILES+=usr/share/terminfo/d/d430-dg-ccc
 OLD_FILES+=usr/share/terminfo/d/d430-unix
 OLD_FILES+=usr/share/terminfo/d/d430-unix-25
 OLD_FILES+=usr/share/terminfo/d/d430-unix-25-ccc
 OLD_FILES+=usr/share/terminfo/d/d430-unix-ccc
 OLD_FILES+=usr/share/terminfo/d/d430-unix-s
 OLD_FILES+=usr/share/terminfo/d/d430-unix-s-ccc
 OLD_FILES+=usr/share/terminfo/d/d430-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d430-unix-sr-ccc
 OLD_FILES+=usr/share/terminfo/d/d430-unix-w
 OLD_FILES+=usr/share/terminfo/d/d430-unix-w-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-dg
 OLD_FILES+=usr/share/terminfo/d/d430c-dg-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-unix
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-25
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-25-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-s
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-s-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-sr-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-w
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-w-ccc
 OLD_FILES+=usr/share/terminfo/d/d450
 OLD_FILES+=usr/share/terminfo/d/d450-dg
 OLD_FILES+=usr/share/terminfo/d/d460
 OLD_FILES+=usr/share/terminfo/d/d460-7b
 OLD_FILES+=usr/share/terminfo/d/d460-7b-w
 OLD_FILES+=usr/share/terminfo/d/d460-dg
 OLD_FILES+=usr/share/terminfo/d/d460-w
 OLD_FILES+=usr/share/terminfo/d/d461
 OLD_FILES+=usr/share/terminfo/d/d461-7b
 OLD_FILES+=usr/share/terminfo/d/d461-7b-w
 OLD_FILES+=usr/share/terminfo/d/d461-dg
 OLD_FILES+=usr/share/terminfo/d/d461-w
 OLD_FILES+=usr/share/terminfo/d/d462+
 OLD_FILES+=usr/share/terminfo/d/d462+25
 OLD_FILES+=usr/share/terminfo/d/d462+dg
 OLD_FILES+=usr/share/terminfo/d/d462+s
 OLD_FILES+=usr/share/terminfo/d/d462+sr
 OLD_FILES+=usr/share/terminfo/d/d462+w
 OLD_FILES+=usr/share/terminfo/d/d462-dg
 OLD_FILES+=usr/share/terminfo/d/d462-unix
 OLD_FILES+=usr/share/terminfo/d/d462-unix-25
 OLD_FILES+=usr/share/terminfo/d/d462-unix-s
 OLD_FILES+=usr/share/terminfo/d/d462-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d462-unix-w
 OLD_FILES+=usr/share/terminfo/d/d462e-dg
 OLD_FILES+=usr/share/terminfo/d/d463-dg
 OLD_FILES+=usr/share/terminfo/d/d463-unix
 OLD_FILES+=usr/share/terminfo/d/d463-unix-25
 OLD_FILES+=usr/share/terminfo/d/d463-unix-s
 OLD_FILES+=usr/share/terminfo/d/d463-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d463-unix-w
 OLD_FILES+=usr/share/terminfo/d/d464-unix
 OLD_FILES+=usr/share/terminfo/d/d464-unix-25
 OLD_FILES+=usr/share/terminfo/d/d464-unix-s
 OLD_FILES+=usr/share/terminfo/d/d464-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d464-unix-w
 OLD_FILES+=usr/share/terminfo/d/d470
 OLD_FILES+=usr/share/terminfo/d/d470-7b
 OLD_FILES+=usr/share/terminfo/d/d470-dg
 OLD_FILES+=usr/share/terminfo/d/d470c
 OLD_FILES+=usr/share/terminfo/d/d470c-7b
 OLD_FILES+=usr/share/terminfo/d/d470c-dg
 OLD_FILES+=usr/share/terminfo/d/d555
 OLD_FILES+=usr/share/terminfo/d/d555-7b
 OLD_FILES+=usr/share/terminfo/d/d555-7b-w
 OLD_FILES+=usr/share/terminfo/d/d555-dg
 OLD_FILES+=usr/share/terminfo/d/d555-w
 OLD_FILES+=usr/share/terminfo/d/d577
 OLD_FILES+=usr/share/terminfo/d/d577-7b
 OLD_FILES+=usr/share/terminfo/d/d577-7b-w
 OLD_FILES+=usr/share/terminfo/d/d577-dg
 OLD_FILES+=usr/share/terminfo/d/d577-w
 OLD_FILES+=usr/share/terminfo/d/d578
 OLD_FILES+=usr/share/terminfo/d/d578-7b
 OLD_FILES+=usr/share/terminfo/d/d578-dg
 OLD_FILES+=usr/share/terminfo/d/d80
 OLD_FILES+=usr/share/terminfo/d/d800
 OLD_FILES+=usr/share/terminfo/d/darwin
 OLD_FILES+=usr/share/terminfo/d/darwin-100x37
 OLD_FILES+=usr/share/terminfo/d/darwin-100x37-m
 OLD_FILES+=usr/share/terminfo/d/darwin-112x37
 OLD_FILES+=usr/share/terminfo/d/darwin-112x37-m
 OLD_FILES+=usr/share/terminfo/d/darwin-128x40
 OLD_FILES+=usr/share/terminfo/d/darwin-128x40-m
 OLD_FILES+=usr/share/terminfo/d/darwin-128x48
 OLD_FILES+=usr/share/terminfo/d/darwin-128x48-m
 OLD_FILES+=usr/share/terminfo/d/darwin-144x48
 OLD_FILES+=usr/share/terminfo/d/darwin-144x48-m
 OLD_FILES+=usr/share/terminfo/d/darwin-160x64
 OLD_FILES+=usr/share/terminfo/d/darwin-160x64-m
 OLD_FILES+=usr/share/terminfo/d/darwin-200x64
 OLD_FILES+=usr/share/terminfo/d/darwin-200x64-m
 OLD_FILES+=usr/share/terminfo/d/darwin-200x75
 OLD_FILES+=usr/share/terminfo/d/darwin-200x75-m
 OLD_FILES+=usr/share/terminfo/d/darwin-256x96
 OLD_FILES+=usr/share/terminfo/d/darwin-256x96-m
 OLD_FILES+=usr/share/terminfo/d/darwin-80x25
 OLD_FILES+=usr/share/terminfo/d/darwin-80x25-m
 OLD_FILES+=usr/share/terminfo/d/darwin-80x30
 OLD_FILES+=usr/share/terminfo/d/darwin-80x30-m
 OLD_FILES+=usr/share/terminfo/d/darwin-90x30
 OLD_FILES+=usr/share/terminfo/d/darwin-90x30-m
 OLD_FILES+=usr/share/terminfo/d/darwin-b
 OLD_FILES+=usr/share/terminfo/d/darwin-f
 OLD_FILES+=usr/share/terminfo/d/darwin-f2
 OLD_FILES+=usr/share/terminfo/d/darwin-m
 OLD_FILES+=usr/share/terminfo/d/darwin-m-b
 OLD_FILES+=usr/share/terminfo/d/darwin-m-f
 OLD_FILES+=usr/share/terminfo/d/darwin-m-f2
 OLD_FILES+=usr/share/terminfo/d/datagraphix
 OLD_FILES+=usr/share/terminfo/d/datamedia2500
 OLD_FILES+=usr/share/terminfo/d/datapoint
 OLD_FILES+=usr/share/terminfo/d/dataspeed40
 OLD_FILES+=usr/share/terminfo/d/dd5000
 OLD_FILES+=usr/share/terminfo/d/ddr
 OLD_FILES+=usr/share/terminfo/d/ddr3180
 OLD_FILES+=usr/share/terminfo/d/dec+pp
 OLD_FILES+=usr/share/terminfo/d/dec+sl
 OLD_FILES+=usr/share/terminfo/d/dec-vt100
 OLD_FILES+=usr/share/terminfo/d/dec-vt220
 OLD_FILES+=usr/share/terminfo/d/dec-vt330
 OLD_FILES+=usr/share/terminfo/d/dec-vt340
 OLD_FILES+=usr/share/terminfo/d/dec-vt400
 OLD_FILES+=usr/share/terminfo/d/decansi
 OLD_FILES+=usr/share/terminfo/d/decpro
 OLD_FILES+=usr/share/terminfo/d/decwriter
 OLD_FILES+=usr/share/terminfo/d/delta
 OLD_FILES+=usr/share/terminfo/d/dg+ccc
 OLD_FILES+=usr/share/terminfo/d/dg+color
 OLD_FILES+=usr/share/terminfo/d/dg+color8
 OLD_FILES+=usr/share/terminfo/d/dg+fixed
 OLD_FILES+=usr/share/terminfo/d/dg-ansi
 OLD_FILES+=usr/share/terminfo/d/dg-generic
 OLD_FILES+=usr/share/terminfo/d/dg100
 OLD_FILES+=usr/share/terminfo/d/dg200
 OLD_FILES+=usr/share/terminfo/d/dg210
 OLD_FILES+=usr/share/terminfo/d/dg211
 OLD_FILES+=usr/share/terminfo/d/dg450
 OLD_FILES+=usr/share/terminfo/d/dg460-ansi
 OLD_FILES+=usr/share/terminfo/d/dg6053
 OLD_FILES+=usr/share/terminfo/d/dg6053-old
 OLD_FILES+=usr/share/terminfo/d/dg605x
 OLD_FILES+=usr/share/terminfo/d/dg6134
 OLD_FILES+=usr/share/terminfo/d/dgkeys+11
 OLD_FILES+=usr/share/terminfo/d/dgkeys+15
 OLD_FILES+=usr/share/terminfo/d/dgkeys+7b
 OLD_FILES+=usr/share/terminfo/d/dgkeys+8b
 OLD_FILES+=usr/share/terminfo/d/dgmode+color
 OLD_FILES+=usr/share/terminfo/d/dgmode+color8
 OLD_FILES+=usr/share/terminfo/d/dgunix+ccc
 OLD_FILES+=usr/share/terminfo/d/dgunix+fixed
 OLD_FILES+=usr/share/terminfo/d/diablo
 OLD_FILES+=usr/share/terminfo/d/diablo-lm
 OLD_FILES+=usr/share/terminfo/d/diablo1620
 OLD_FILES+=usr/share/terminfo/d/diablo1620-m8
 OLD_FILES+=usr/share/terminfo/d/diablo1640
 OLD_FILES+=usr/share/terminfo/d/diablo1640-lm
 OLD_FILES+=usr/share/terminfo/d/diablo1640-m8
 OLD_FILES+=usr/share/terminfo/d/diablo1720
 OLD_FILES+=usr/share/terminfo/d/diablo1730
 OLD_FILES+=usr/share/terminfo/d/diablo1740
 OLD_FILES+=usr/share/terminfo/d/diablo1740-lm
 OLD_FILES+=usr/share/terminfo/d/diablo450
 OLD_FILES+=usr/share/terminfo/d/diablo630
 OLD_FILES+=usr/share/terminfo/d/dialogue
 OLD_FILES+=usr/share/terminfo/d/dialogue80
 OLD_FILES+=usr/share/terminfo/d/digilog
 OLD_FILES+=usr/share/terminfo/d/djgpp
 OLD_FILES+=usr/share/terminfo/d/djgpp203
 OLD_FILES+=usr/share/terminfo/d/djgpp204
 OLD_FILES+=usr/share/terminfo/d/dku7003
 OLD_FILES+=usr/share/terminfo/d/dku7003-dumb
 OLD_FILES+=usr/share/terminfo/d/dku7102
 OLD_FILES+=usr/share/terminfo/d/dku7102-old
 OLD_FILES+=usr/share/terminfo/d/dku7102-sna
 OLD_FILES+=usr/share/terminfo/d/dku7103-sna
 OLD_FILES+=usr/share/terminfo/d/dku7202
 OLD_FILES+=usr/share/terminfo/d/dm1520
 OLD_FILES+=usr/share/terminfo/d/dm1521
 OLD_FILES+=usr/share/terminfo/d/dm2500
 OLD_FILES+=usr/share/terminfo/d/dm3025
 OLD_FILES+=usr/share/terminfo/d/dm3045
 OLD_FILES+=usr/share/terminfo/d/dm80
 OLD_FILES+=usr/share/terminfo/d/dm80w
 OLD_FILES+=usr/share/terminfo/d/dmchat
 OLD_FILES+=usr/share/terminfo/d/dmd
 OLD_FILES+=usr/share/terminfo/d/dmd-24
 OLD_FILES+=usr/share/terminfo/d/dmd-34
 OLD_FILES+=usr/share/terminfo/d/dmd1
 OLD_FILES+=usr/share/terminfo/d/dmdt80
 OLD_FILES+=usr/share/terminfo/d/dmdt80w
 OLD_FILES+=usr/share/terminfo/d/dmterm
 OLD_FILES+=usr/share/terminfo/d/domterm
 OLD_FILES+=usr/share/terminfo/d/dp3360
 OLD_FILES+=usr/share/terminfo/d/dp8242
 OLD_FILES+=usr/share/terminfo/d/ds40
 OLD_FILES+=usr/share/terminfo/d/ds40-2
 OLD_FILES+=usr/share/terminfo/d/dt-100
 OLD_FILES+=usr/share/terminfo/d/dt-100w
 OLD_FILES+=usr/share/terminfo/d/dt100
 OLD_FILES+=usr/share/terminfo/d/dt100w
 OLD_FILES+=usr/share/terminfo/d/dt110
 OLD_FILES+=usr/share/terminfo/d/dt80
 OLD_FILES+=usr/share/terminfo/d/dt80-sas
 OLD_FILES+=usr/share/terminfo/d/dt80w
 OLD_FILES+=usr/share/terminfo/d/dtc300s
 OLD_FILES+=usr/share/terminfo/d/dtc382
 OLD_FILES+=usr/share/terminfo/d/dtterm
 OLD_FILES+=usr/share/terminfo/d/dumb
 OLD_FILES+=usr/share/terminfo/d/dumb-emacs-ansi
 OLD_FILES+=usr/share/terminfo/d/dvtm
 OLD_FILES+=usr/share/terminfo/d/dvtm-256color
 OLD_FILES+=usr/share/terminfo/d/dw
 OLD_FILES+=usr/share/terminfo/d/dw1
 OLD_FILES+=usr/share/terminfo/d/dw2
 OLD_FILES+=usr/share/terminfo/d/dw3
 OLD_FILES+=usr/share/terminfo/d/dw4
 OLD_FILES+=usr/share/terminfo/d/dwk
 OLD_FILES+=usr/share/terminfo/d/dwk-vt
 OLD_DIRS+=usr/share/terminfo/d/
 OLD_FILES+=usr/share/terminfo/e/ecma+color
 OLD_FILES+=usr/share/terminfo/e/ecma+index
 OLD_FILES+=usr/share/terminfo/e/ecma+italics
 OLD_FILES+=usr/share/terminfo/e/ecma+sgr
 OLD_FILES+=usr/share/terminfo/e/ecma+strikeout
 OLD_FILES+=usr/share/terminfo/e/elks
 OLD_FILES+=usr/share/terminfo/e/elks-ansi
 OLD_FILES+=usr/share/terminfo/e/elks-glasstty
 OLD_FILES+=usr/share/terminfo/e/elks-vt52
 OLD_FILES+=usr/share/terminfo/e/emots
 OLD_FILES+=usr/share/terminfo/e/emu
 OLD_FILES+=usr/share/terminfo/e/emu-220
 OLD_FILES+=usr/share/terminfo/e/emx-base
 OLD_FILES+=usr/share/terminfo/e/env230
 OLD_FILES+=usr/share/terminfo/e/envision230
 OLD_FILES+=usr/share/terminfo/e/ep40
 OLD_FILES+=usr/share/terminfo/e/ep4000
 OLD_FILES+=usr/share/terminfo/e/ep4080
 OLD_FILES+=usr/share/terminfo/e/ep48
 OLD_FILES+=usr/share/terminfo/e/ergo4000
 OLD_FILES+=usr/share/terminfo/e/esprit
 OLD_FILES+=usr/share/terminfo/e/esprit-am
 OLD_FILES+=usr/share/terminfo/e/eterm
 OLD_FILES+=usr/share/terminfo/e/eterm-color
 OLD_FILES+=usr/share/terminfo/e/ex155
 OLD_FILES+=usr/share/terminfo/e/excel62
 OLD_FILES+=usr/share/terminfo/e/excel62-rv
 OLD_FILES+=usr/share/terminfo/e/excel62-w
 OLD_FILES+=usr/share/terminfo/e/excel64
 OLD_FILES+=usr/share/terminfo/e/excel64-rv
 OLD_FILES+=usr/share/terminfo/e/excel64-w
 OLD_FILES+=usr/share/terminfo/e/exec80
 OLD_DIRS+=usr/share/terminfo/e/
 OLD_FILES+=usr/share/terminfo/f/f100
 OLD_FILES+=usr/share/terminfo/f/f100-rv
 OLD_FILES+=usr/share/terminfo/f/f110
 OLD_FILES+=usr/share/terminfo/f/f110-14
 OLD_FILES+=usr/share/terminfo/f/f110-14w
 OLD_FILES+=usr/share/terminfo/f/f110-w
 OLD_FILES+=usr/share/terminfo/f/f1720
 OLD_FILES+=usr/share/terminfo/f/f1720a
 OLD_FILES+=usr/share/terminfo/f/f200
 OLD_FILES+=usr/share/terminfo/f/f200-w
 OLD_FILES+=usr/share/terminfo/f/f200vi
 OLD_FILES+=usr/share/terminfo/f/f200vi-w
 OLD_FILES+=usr/share/terminfo/f/falco
 OLD_FILES+=usr/share/terminfo/f/falco-p
 OLD_FILES+=usr/share/terminfo/f/fbterm
 OLD_FILES+=usr/share/terminfo/f/fenix
 OLD_FILES+=usr/share/terminfo/f/fenixw
 OLD_FILES+=usr/share/terminfo/f/fixterm
 OLD_FILES+=usr/share/terminfo/f/fortune
 OLD_FILES+=usr/share/terminfo/f/fos
 OLD_FILES+=usr/share/terminfo/f/fox
 OLD_FILES+=usr/share/terminfo/f/freedom
 OLD_FILES+=usr/share/terminfo/f/freedom-rv
 OLD_FILES+=usr/share/terminfo/f/freedom100
 OLD_FILES+=usr/share/terminfo/f/freedom110
 OLD_FILES+=usr/share/terminfo/f/freedom200
 OLD_DIRS+=usr/share/terminfo/f/
 OLD_FILES+=usr/share/terminfo/g/gator
 OLD_FILES+=usr/share/terminfo/g/gator-52
 OLD_FILES+=usr/share/terminfo/g/gator-52t
 OLD_FILES+=usr/share/terminfo/g/gator-t
 OLD_FILES+=usr/share/terminfo/g/gigi
 OLD_FILES+=usr/share/terminfo/g/glasstty
 OLD_FILES+=usr/share/terminfo/g/gnome
 OLD_FILES+=usr/share/terminfo/g/gnome+pcfkeys
 OLD_FILES+=usr/share/terminfo/g/gnome-2007
 OLD_FILES+=usr/share/terminfo/g/gnome-2008
 OLD_FILES+=usr/share/terminfo/g/gnome-2012
 OLD_FILES+=usr/share/terminfo/g/gnome-256color
 OLD_FILES+=usr/share/terminfo/g/gnome-fc5
 OLD_FILES+=usr/share/terminfo/g/gnome-rh62
 OLD_FILES+=usr/share/terminfo/g/gnome-rh72
 OLD_FILES+=usr/share/terminfo/g/gnome-rh80
 OLD_FILES+=usr/share/terminfo/g/gnome-rh90
 OLD_FILES+=usr/share/terminfo/g/go-225
 OLD_FILES+=usr/share/terminfo/g/go140
 OLD_FILES+=usr/share/terminfo/g/go140w
 OLD_FILES+=usr/share/terminfo/g/go225
 OLD_FILES+=usr/share/terminfo/g/graphos
 OLD_FILES+=usr/share/terminfo/g/graphos-30
 OLD_FILES+=usr/share/terminfo/g/gs5430
 OLD_FILES+=usr/share/terminfo/g/gs5430-22
 OLD_FILES+=usr/share/terminfo/g/gs5430-24
 OLD_FILES+=usr/share/terminfo/g/gs6300
 OLD_FILES+=usr/share/terminfo/g/gsi
 OLD_FILES+=usr/share/terminfo/g/gt100
 OLD_FILES+=usr/share/terminfo/g/gt100a
 OLD_FILES+=usr/share/terminfo/g/gt40
 OLD_FILES+=usr/share/terminfo/g/gt42
 OLD_FILES+=usr/share/terminfo/g/guru
 OLD_FILES+=usr/share/terminfo/g/guru+rv
 OLD_FILES+=usr/share/terminfo/g/guru+s
 OLD_FILES+=usr/share/terminfo/g/guru+unk
 OLD_FILES+=usr/share/terminfo/g/guru-24
 OLD_FILES+=usr/share/terminfo/g/guru-33
 OLD_FILES+=usr/share/terminfo/g/guru-33-rv
 OLD_FILES+=usr/share/terminfo/g/guru-33-s
 OLD_FILES+=usr/share/terminfo/g/guru-44
 OLD_FILES+=usr/share/terminfo/g/guru-44-s
 OLD_FILES+=usr/share/terminfo/g/guru-76
 OLD_FILES+=usr/share/terminfo/g/guru-76-lp
 OLD_FILES+=usr/share/terminfo/g/guru-76-s
 OLD_FILES+=usr/share/terminfo/g/guru-76-w
 OLD_FILES+=usr/share/terminfo/g/guru-76-w-s
 OLD_FILES+=usr/share/terminfo/g/guru-76-wm
 OLD_FILES+=usr/share/terminfo/g/guru-lp
 OLD_FILES+=usr/share/terminfo/g/guru-nctxt
 OLD_FILES+=usr/share/terminfo/g/guru-rv
 OLD_FILES+=usr/share/terminfo/g/guru-s
 OLD_DIRS+=usr/share/terminfo/g/
 OLD_FILES+=usr/share/terminfo/h/h-100
 OLD_FILES+=usr/share/terminfo/h/h-100bw
 OLD_FILES+=usr/share/terminfo/h/h100
 OLD_FILES+=usr/share/terminfo/h/h100bw
 OLD_FILES+=usr/share/terminfo/h/h19
 OLD_FILES+=usr/share/terminfo/h/h19-a
 OLD_FILES+=usr/share/terminfo/h/h19-b
 OLD_FILES+=usr/share/terminfo/h/h19-bs
 OLD_FILES+=usr/share/terminfo/h/h19-g
 OLD_FILES+=usr/share/terminfo/h/h19-smul
 OLD_FILES+=usr/share/terminfo/h/h19-u
 OLD_FILES+=usr/share/terminfo/h/h19-us
 OLD_FILES+=usr/share/terminfo/h/h19a
 OLD_FILES+=usr/share/terminfo/h/h19g
 OLD_FILES+=usr/share/terminfo/h/h19k
 OLD_FILES+=usr/share/terminfo/h/h19kermit
 OLD_FILES+=usr/share/terminfo/h/h19us
 OLD_FILES+=usr/share/terminfo/h/h29a-kc-bc
 OLD_FILES+=usr/share/terminfo/h/h29a-kc-uc
 OLD_FILES+=usr/share/terminfo/h/h29a-nkc-bc
 OLD_FILES+=usr/share/terminfo/h/h29a-nkc-uc
 OLD_FILES+=usr/share/terminfo/h/h80
 OLD_FILES+=usr/share/terminfo/h/ha8675
 OLD_FILES+=usr/share/terminfo/h/ha8686
 OLD_FILES+=usr/share/terminfo/h/hazel
 OLD_FILES+=usr/share/terminfo/h/hds200
 OLD_FILES+=usr/share/terminfo/h/he80
 OLD_FILES+=usr/share/terminfo/h/heath
 OLD_FILES+=usr/share/terminfo/h/heath-19
 OLD_FILES+=usr/share/terminfo/h/heath-ansi
 OLD_FILES+=usr/share/terminfo/h/heathkit
 OLD_FILES+=usr/share/terminfo/h/heathkit-a
 OLD_FILES+=usr/share/terminfo/h/hft
 OLD_FILES+=usr/share/terminfo/h/hft-c
 OLD_FILES+=usr/share/terminfo/h/hft-c-old
 OLD_FILES+=usr/share/terminfo/h/hft-old
 OLD_FILES+=usr/share/terminfo/h/hirez100
 OLD_FILES+=usr/share/terminfo/h/hirez100-w
 OLD_FILES+=usr/share/terminfo/h/hmod1
 OLD_FILES+=usr/share/terminfo/h/hp
 OLD_FILES+=usr/share/terminfo/h/hp+arrows
 OLD_FILES+=usr/share/terminfo/h/hp+color
 OLD_FILES+=usr/share/terminfo/h/hp+labels
 OLD_FILES+=usr/share/terminfo/h/hp+pfk+arrows
 OLD_FILES+=usr/share/terminfo/h/hp+pfk+cr
 OLD_FILES+=usr/share/terminfo/h/hp+pfk-cr
 OLD_FILES+=usr/share/terminfo/h/hp+printer
 OLD_FILES+=usr/share/terminfo/h/hp110
 OLD_FILES+=usr/share/terminfo/h/hp150
 OLD_FILES+=usr/share/terminfo/h/hp2
 OLD_FILES+=usr/share/terminfo/h/hp236
 OLD_FILES+=usr/share/terminfo/h/hp2382
 OLD_FILES+=usr/share/terminfo/h/hp2382a
 OLD_FILES+=usr/share/terminfo/h/hp2392
 OLD_FILES+=usr/share/terminfo/h/hp2397
 OLD_FILES+=usr/share/terminfo/h/hp2397a
 OLD_FILES+=usr/share/terminfo/h/hp2621
 OLD_FILES+=usr/share/terminfo/h/hp2621-48
 OLD_FILES+=usr/share/terminfo/h/hp2621-a
 OLD_FILES+=usr/share/terminfo/h/hp2621-ba
 OLD_FILES+=usr/share/terminfo/h/hp2621-fl
 OLD_FILES+=usr/share/terminfo/h/hp2621-k45
 OLD_FILES+=usr/share/terminfo/h/hp2621-nl
 OLD_FILES+=usr/share/terminfo/h/hp2621-nt
 OLD_FILES+=usr/share/terminfo/h/hp2621-wl
 OLD_FILES+=usr/share/terminfo/h/hp2621A
 OLD_FILES+=usr/share/terminfo/h/hp2621a
 OLD_FILES+=usr/share/terminfo/h/hp2621a-a
 OLD_FILES+=usr/share/terminfo/h/hp2621b
 OLD_FILES+=usr/share/terminfo/h/hp2621b-kx
 OLD_FILES+=usr/share/terminfo/h/hp2621b-kx-p
 OLD_FILES+=usr/share/terminfo/h/hp2621b-p
 OLD_FILES+=usr/share/terminfo/h/hp2621k45
 OLD_FILES+=usr/share/terminfo/h/hp2621p
 OLD_FILES+=usr/share/terminfo/h/hp2621p-a
 OLD_FILES+=usr/share/terminfo/h/hp2622
 OLD_FILES+=usr/share/terminfo/h/hp2622a
 OLD_FILES+=usr/share/terminfo/h/hp2623
 OLD_FILES+=usr/share/terminfo/h/hp2623a
 OLD_FILES+=usr/share/terminfo/h/hp2624
 OLD_FILES+=usr/share/terminfo/h/hp2624-10p
 OLD_FILES+=usr/share/terminfo/h/hp2624a
 OLD_FILES+=usr/share/terminfo/h/hp2624a-10p
 OLD_FILES+=usr/share/terminfo/h/hp2624b
 OLD_FILES+=usr/share/terminfo/h/hp2624b-10p
 OLD_FILES+=usr/share/terminfo/h/hp2624b-10p-p
 OLD_FILES+=usr/share/terminfo/h/hp2624b-4p
 OLD_FILES+=usr/share/terminfo/h/hp2624b-4p-p
 OLD_FILES+=usr/share/terminfo/h/hp2624b-p
 OLD_FILES+=usr/share/terminfo/h/hp2626
 OLD_FILES+=usr/share/terminfo/h/hp2626-12
 OLD_FILES+=usr/share/terminfo/h/hp2626-12-s
 OLD_FILES+=usr/share/terminfo/h/hp2626-12x40
 OLD_FILES+=usr/share/terminfo/h/hp2626-ns
 OLD_FILES+=usr/share/terminfo/h/hp2626-s
 OLD_FILES+=usr/share/terminfo/h/hp2626-x40
 OLD_FILES+=usr/share/terminfo/h/hp2626a
 OLD_FILES+=usr/share/terminfo/h/hp2626p
 OLD_FILES+=usr/share/terminfo/h/hp2627a
 OLD_FILES+=usr/share/terminfo/h/hp2627a-rev
 OLD_FILES+=usr/share/terminfo/h/hp2627c
 OLD_FILES+=usr/share/terminfo/h/hp262x
 OLD_FILES+=usr/share/terminfo/h/hp2640a
 OLD_FILES+=usr/share/terminfo/h/hp2640b
 OLD_FILES+=usr/share/terminfo/h/hp2641a
 OLD_FILES+=usr/share/terminfo/h/hp2644a
 OLD_FILES+=usr/share/terminfo/h/hp2645
 OLD_FILES+=usr/share/terminfo/h/hp2645a
 OLD_FILES+=usr/share/terminfo/h/hp2647a
 OLD_FILES+=usr/share/terminfo/h/hp2648
 OLD_FILES+=usr/share/terminfo/h/hp2648a
 OLD_FILES+=usr/share/terminfo/h/hp300h
 OLD_FILES+=usr/share/terminfo/h/hp45
 OLD_FILES+=usr/share/terminfo/h/hp700
 OLD_FILES+=usr/share/terminfo/h/hp700-wy
 OLD_FILES+=usr/share/terminfo/h/hp70092
 OLD_FILES+=usr/share/terminfo/h/hp70092A
 OLD_FILES+=usr/share/terminfo/h/hp70092a
 OLD_FILES+=usr/share/terminfo/h/hp9837
 OLD_FILES+=usr/share/terminfo/h/hp9845
 OLD_FILES+=usr/share/terminfo/h/hp98550
 OLD_FILES+=usr/share/terminfo/h/hp98550a
 OLD_FILES+=usr/share/terminfo/h/hp98720
 OLD_FILES+=usr/share/terminfo/h/hp98721
 OLD_FILES+=usr/share/terminfo/h/hpansi
 OLD_FILES+=usr/share/terminfo/h/hpex
 OLD_FILES+=usr/share/terminfo/h/hpex2
 OLD_FILES+=usr/share/terminfo/h/hpgeneric
 OLD_FILES+=usr/share/terminfo/h/hpsub
 OLD_FILES+=usr/share/terminfo/h/hpterm
 OLD_FILES+=usr/share/terminfo/h/hpterm-color
 OLD_FILES+=usr/share/terminfo/h/htx11
 OLD_FILES+=usr/share/terminfo/h/hurd
 OLD_FILES+=usr/share/terminfo/h/hz1000
 OLD_FILES+=usr/share/terminfo/h/hz1420
 OLD_FILES+=usr/share/terminfo/h/hz1500
 OLD_FILES+=usr/share/terminfo/h/hz1510
 OLD_FILES+=usr/share/terminfo/h/hz1520
 OLD_FILES+=usr/share/terminfo/h/hz1520-noesc
 OLD_FILES+=usr/share/terminfo/h/hz1552
 OLD_FILES+=usr/share/terminfo/h/hz1552-rv
 OLD_FILES+=usr/share/terminfo/h/hz2000
 OLD_DIRS+=usr/share/terminfo/h/
 OLD_FILES+=usr/share/terminfo/i/i100
 OLD_FILES+=usr/share/terminfo/i/i3101
 OLD_FILES+=usr/share/terminfo/i/i3164
 OLD_FILES+=usr/share/terminfo/i/i400
 OLD_FILES+=usr/share/terminfo/i/iTerm.app
 OLD_FILES+=usr/share/terminfo/i/iTerm2.app
 OLD_FILES+=usr/share/terminfo/i/ibcs2
 OLD_FILES+=usr/share/terminfo/i/ibm+16color
 OLD_FILES+=usr/share/terminfo/i/ibm+color
 OLD_FILES+=usr/share/terminfo/i/ibm-apl
 OLD_FILES+=usr/share/terminfo/i/ibm-pc
 OLD_FILES+=usr/share/terminfo/i/ibm-system1
 OLD_FILES+=usr/share/terminfo/i/ibm3101
 OLD_FILES+=usr/share/terminfo/i/ibm3151
 OLD_FILES+=usr/share/terminfo/i/ibm3161
 OLD_FILES+=usr/share/terminfo/i/ibm3161-C
 OLD_FILES+=usr/share/terminfo/i/ibm3162
 OLD_FILES+=usr/share/terminfo/i/ibm3163
 OLD_FILES+=usr/share/terminfo/i/ibm3164
 OLD_FILES+=usr/share/terminfo/i/ibm327x
 OLD_FILES+=usr/share/terminfo/i/ibm5051
 OLD_FILES+=usr/share/terminfo/i/ibm5081
 OLD_FILES+=usr/share/terminfo/i/ibm5081-c
 OLD_FILES+=usr/share/terminfo/i/ibm5151
 OLD_FILES+=usr/share/terminfo/i/ibm5154
 OLD_FILES+=usr/share/terminfo/i/ibm5154-c
 OLD_FILES+=usr/share/terminfo/i/ibm6153
 OLD_FILES+=usr/share/terminfo/i/ibm6153-40
 OLD_FILES+=usr/share/terminfo/i/ibm6153-90
 OLD_FILES+=usr/share/terminfo/i/ibm6154
 OLD_FILES+=usr/share/terminfo/i/ibm6154-c
 OLD_FILES+=usr/share/terminfo/i/ibm6155
 OLD_FILES+=usr/share/terminfo/i/ibm8503
 OLD_FILES+=usr/share/terminfo/i/ibm8507
 OLD_FILES+=usr/share/terminfo/i/ibm8512
 OLD_FILES+=usr/share/terminfo/i/ibm8513
 OLD_FILES+=usr/share/terminfo/i/ibm8514
 OLD_FILES+=usr/share/terminfo/i/ibm8514-c
 OLD_FILES+=usr/share/terminfo/i/ibm8604
 OLD_FILES+=usr/share/terminfo/i/ibmaed
 OLD_FILES+=usr/share/terminfo/i/ibmapa16
 OLD_FILES+=usr/share/terminfo/i/ibmapa8
 OLD_FILES+=usr/share/terminfo/i/ibmapa8c
 OLD_FILES+=usr/share/terminfo/i/ibmapa8c-c
 OLD_FILES+=usr/share/terminfo/i/ibmega
 OLD_FILES+=usr/share/terminfo/i/ibmega-c
 OLD_FILES+=usr/share/terminfo/i/ibmmono
 OLD_FILES+=usr/share/terminfo/i/ibmmpel-c
 OLD_FILES+=usr/share/terminfo/i/ibmpc
 OLD_FILES+=usr/share/terminfo/i/ibmpc3
 OLD_FILES+=usr/share/terminfo/i/ibmpc3r
 OLD_FILES+=usr/share/terminfo/i/ibmpc3r-mono
 OLD_FILES+=usr/share/terminfo/i/ibmpcx
 OLD_FILES+=usr/share/terminfo/i/ibmvga
 OLD_FILES+=usr/share/terminfo/i/ibmvga-c
 OLD_FILES+=usr/share/terminfo/i/ibmx
 OLD_FILES+=usr/share/terminfo/i/icl6402
 OLD_FILES+=usr/share/terminfo/i/icl6404
 OLD_FILES+=usr/share/terminfo/i/icl6404-w
 OLD_FILES+=usr/share/terminfo/i/ifmr
 OLD_FILES+=usr/share/terminfo/i/ims-ansi
 OLD_FILES+=usr/share/terminfo/i/ims950
 OLD_FILES+=usr/share/terminfo/i/ims950-b
 OLD_FILES+=usr/share/terminfo/i/ims950-rv
 OLD_FILES+=usr/share/terminfo/i/infoton
 OLD_FILES+=usr/share/terminfo/i/interix
 OLD_FILES+=usr/share/terminfo/i/interix-nti
 OLD_FILES+=usr/share/terminfo/i/intertec
 OLD_FILES+=usr/share/terminfo/i/intertube
 OLD_FILES+=usr/share/terminfo/i/intertube2
 OLD_FILES+=usr/share/terminfo/i/intext
 OLD_FILES+=usr/share/terminfo/i/intext2
 OLD_FILES+=usr/share/terminfo/i/intextii
 OLD_FILES+=usr/share/terminfo/i/ips
 OLD_FILES+=usr/share/terminfo/i/ipsi
 OLD_FILES+=usr/share/terminfo/i/iq120
 OLD_FILES+=usr/share/terminfo/i/iq140
 OLD_FILES+=usr/share/terminfo/i/iris-ansi
 OLD_FILES+=usr/share/terminfo/i/iris-ansi-ap
 OLD_FILES+=usr/share/terminfo/i/iris-ansi-net
 OLD_FILES+=usr/share/terminfo/i/iris-color
 OLD_FILES+=usr/share/terminfo/i/iris40
 OLD_FILES+=usr/share/terminfo/i/iterm
 OLD_FILES+=usr/share/terminfo/i/iterm2
 OLD_FILES+=usr/share/terminfo/i/iterm2-direct
 OLD_DIRS+=usr/share/terminfo/i/
 OLD_FILES+=usr/share/terminfo/j/jaixterm
 OLD_FILES+=usr/share/terminfo/j/jaixterm-m
 OLD_FILES+=usr/share/terminfo/j/jerq
 OLD_FILES+=usr/share/terminfo/j/jfbterm
 OLD_DIRS+=usr/share/terminfo/j/
 OLD_FILES+=usr/share/terminfo/k/k45
 OLD_FILES+=usr/share/terminfo/k/kaypro
 OLD_FILES+=usr/share/terminfo/k/kaypro2
 OLD_FILES+=usr/share/terminfo/k/kds6402
 OLD_FILES+=usr/share/terminfo/k/kds7372
 OLD_FILES+=usr/share/terminfo/k/kds7372-w
 OLD_FILES+=usr/share/terminfo/k/kermit
 OLD_FILES+=usr/share/terminfo/k/kermit-am
 OLD_FILES+=usr/share/terminfo/k/kitty
 OLD_FILES+=usr/share/terminfo/k/kitty+common
 OLD_FILES+=usr/share/terminfo/k/kitty-direct
 OLD_FILES+=usr/share/terminfo/k/klone+acs
 OLD_FILES+=usr/share/terminfo/k/klone+color
 OLD_FILES+=usr/share/terminfo/k/klone+koi8acs
 OLD_FILES+=usr/share/terminfo/k/klone+sgr
 OLD_FILES+=usr/share/terminfo/k/klone+sgr-dumb
 OLD_FILES+=usr/share/terminfo/k/klone+sgr8
 OLD_FILES+=usr/share/terminfo/k/kon
 OLD_FILES+=usr/share/terminfo/k/kon2
 OLD_FILES+=usr/share/terminfo/k/konsole
 OLD_FILES+=usr/share/terminfo/k/konsole+pcfkeys
 OLD_FILES+=usr/share/terminfo/k/konsole-16color
 OLD_FILES+=usr/share/terminfo/k/konsole-256color
 OLD_FILES+=usr/share/terminfo/k/konsole-base
 OLD_FILES+=usr/share/terminfo/k/konsole-direct
 OLD_FILES+=usr/share/terminfo/k/konsole-linux
 OLD_FILES+=usr/share/terminfo/k/konsole-solaris
 OLD_FILES+=usr/share/terminfo/k/konsole-vt100
 OLD_FILES+=usr/share/terminfo/k/konsole-vt420pc
 OLD_FILES+=usr/share/terminfo/k/konsole-xf3x
 OLD_FILES+=usr/share/terminfo/k/konsole-xf4x
 OLD_FILES+=usr/share/terminfo/k/kt7
 OLD_FILES+=usr/share/terminfo/k/kt7ix
 OLD_FILES+=usr/share/terminfo/k/kterm
 OLD_FILES+=usr/share/terminfo/k/kterm-co
 OLD_FILES+=usr/share/terminfo/k/kterm-color
 OLD_FILES+=usr/share/terminfo/k/ktm
 OLD_FILES+=usr/share/terminfo/k/kvt
 OLD_DIRS+=usr/share/terminfo/k/
 OLD_FILES+=usr/share/terminfo/l/la120
 OLD_FILES+=usr/share/terminfo/l/layer
 OLD_FILES+=usr/share/terminfo/l/lft
 OLD_FILES+=usr/share/terminfo/l/lft-pc850
 OLD_FILES+=usr/share/terminfo/l/linux
 OLD_FILES+=usr/share/terminfo/l/linux+decid
 OLD_FILES+=usr/share/terminfo/l/linux+sfkeys
 OLD_FILES+=usr/share/terminfo/l/linux-16color
 OLD_FILES+=usr/share/terminfo/l/linux-basic
 OLD_FILES+=usr/share/terminfo/l/linux-c
 OLD_FILES+=usr/share/terminfo/l/linux-c-nc
 OLD_FILES+=usr/share/terminfo/l/linux-koi8
 OLD_FILES+=usr/share/terminfo/l/linux-koi8r
 OLD_FILES+=usr/share/terminfo/l/linux-lat
 OLD_FILES+=usr/share/terminfo/l/linux-m
 OLD_FILES+=usr/share/terminfo/l/linux-m1
 OLD_FILES+=usr/share/terminfo/l/linux-m1b
 OLD_FILES+=usr/share/terminfo/l/linux-m2
 OLD_FILES+=usr/share/terminfo/l/linux-nic
 OLD_FILES+=usr/share/terminfo/l/linux-s
 OLD_FILES+=usr/share/terminfo/l/linux-vt
 OLD_FILES+=usr/share/terminfo/l/linux2.2
 OLD_FILES+=usr/share/terminfo/l/linux2.6
 OLD_FILES+=usr/share/terminfo/l/linux2.6.26
 OLD_FILES+=usr/share/terminfo/l/linux3.0
 OLD_FILES+=usr/share/terminfo/l/lisa
 OLD_FILES+=usr/share/terminfo/l/lisaterm
 OLD_FILES+=usr/share/terminfo/l/lisaterm-w
 OLD_FILES+=usr/share/terminfo/l/liswb
 OLD_FILES+=usr/share/terminfo/l/ln03
 OLD_FILES+=usr/share/terminfo/l/ln03-w
 OLD_FILES+=usr/share/terminfo/l/lpr
 OLD_FILES+=usr/share/terminfo/l/luna
 OLD_FILES+=usr/share/terminfo/l/luna68k
 OLD_DIRS+=usr/share/terminfo/l/
 OLD_FILES+=usr/share/terminfo/m/m2-nam
 OLD_FILES+=usr/share/terminfo/m/mac
 OLD_FILES+=usr/share/terminfo/m/mac-w
 OLD_FILES+=usr/share/terminfo/m/mach
 OLD_FILES+=usr/share/terminfo/m/mach-bold
 OLD_FILES+=usr/share/terminfo/m/mach-color
 OLD_FILES+=usr/share/terminfo/m/mach-gnu
 OLD_FILES+=usr/share/terminfo/m/mach-gnu-color
 OLD_FILES+=usr/share/terminfo/m/macintosh
 OLD_FILES+=usr/share/terminfo/m/macterminal-w
 OLD_FILES+=usr/share/terminfo/m/mai
 OLD_FILES+=usr/share/terminfo/m/masscomp
 OLD_FILES+=usr/share/terminfo/m/masscomp1
 OLD_FILES+=usr/share/terminfo/m/masscomp2
 OLD_FILES+=usr/share/terminfo/m/mdl110
 OLD_FILES+=usr/share/terminfo/m/megatek
 OLD_FILES+=usr/share/terminfo/m/memhp
 OLD_FILES+=usr/share/terminfo/m/mgr
 OLD_FILES+=usr/share/terminfo/m/mgr-linux
 OLD_FILES+=usr/share/terminfo/m/mgr-sun
 OLD_FILES+=usr/share/terminfo/m/mgt
 OLD_FILES+=usr/share/terminfo/m/mgterm
 OLD_FILES+=usr/share/terminfo/m/microb
 OLD_FILES+=usr/share/terminfo/m/microbee
 OLD_FILES+=usr/share/terminfo/m/microterm
 OLD_FILES+=usr/share/terminfo/m/microterm5
 OLD_FILES+=usr/share/terminfo/m/mime
 OLD_FILES+=usr/share/terminfo/m/mime-3ax
 OLD_FILES+=usr/share/terminfo/m/mime-fb
 OLD_FILES+=usr/share/terminfo/m/mime-hb
 OLD_FILES+=usr/share/terminfo/m/mime1
 OLD_FILES+=usr/share/terminfo/m/mime2
 OLD_FILES+=usr/share/terminfo/m/mime2a
 OLD_FILES+=usr/share/terminfo/m/mime2a-s
 OLD_FILES+=usr/share/terminfo/m/mime2a-v
 OLD_FILES+=usr/share/terminfo/m/mime314
 OLD_FILES+=usr/share/terminfo/m/mime340
 OLD_FILES+=usr/share/terminfo/m/mime3a
 OLD_FILES+=usr/share/terminfo/m/mime3ax
 OLD_FILES+=usr/share/terminfo/m/mimei
 OLD_FILES+=usr/share/terminfo/m/mimeii
 OLD_FILES+=usr/share/terminfo/m/minitel
 OLD_FILES+=usr/share/terminfo/m/minitel-2
 OLD_FILES+=usr/share/terminfo/m/minitel-2-nam
 OLD_FILES+=usr/share/terminfo/m/minitel1
 OLD_FILES+=usr/share/terminfo/m/minitel1-nb
 OLD_FILES+=usr/share/terminfo/m/minitel12-80
 OLD_FILES+=usr/share/terminfo/m/minitel1b
 OLD_FILES+=usr/share/terminfo/m/minitel1b-80
 OLD_FILES+=usr/share/terminfo/m/minitel1b-nb
 OLD_FILES+=usr/share/terminfo/m/minitel2-80
 OLD_FILES+=usr/share/terminfo/m/minix
 OLD_FILES+=usr/share/terminfo/m/minix-1.5
 OLD_FILES+=usr/share/terminfo/m/minix-1.7
 OLD_FILES+=usr/share/terminfo/m/minix-3.0
 OLD_FILES+=usr/share/terminfo/m/minix-old
 OLD_FILES+=usr/share/terminfo/m/minix-old-am
 OLD_FILES+=usr/share/terminfo/m/mintty
 OLD_FILES+=usr/share/terminfo/m/mintty+common
 OLD_FILES+=usr/share/terminfo/m/mintty-direct
 OLD_FILES+=usr/share/terminfo/m/mlterm
 OLD_FILES+=usr/share/terminfo/m/mlterm+pcfkeys
 OLD_FILES+=usr/share/terminfo/m/mlterm-256color
 OLD_FILES+=usr/share/terminfo/m/mlterm-direct
 OLD_FILES+=usr/share/terminfo/m/mlterm2
 OLD_FILES+=usr/share/terminfo/m/mlterm3
 OLD_FILES+=usr/share/terminfo/m/mm314
 OLD_FILES+=usr/share/terminfo/m/mm340
 OLD_FILES+=usr/share/terminfo/m/mod
 OLD_FILES+=usr/share/terminfo/m/mod24
 OLD_FILES+=usr/share/terminfo/m/modgraph
 OLD_FILES+=usr/share/terminfo/m/modgraph2
 OLD_FILES+=usr/share/terminfo/m/modgraph48
 OLD_FILES+=usr/share/terminfo/m/mono-emx
 OLD_FILES+=usr/share/terminfo/m/morphos
 OLD_FILES+=usr/share/terminfo/m/mouse-sun
 OLD_FILES+=usr/share/terminfo/m/mrxvt
 OLD_FILES+=usr/share/terminfo/m/mrxvt-256color
 OLD_FILES+=usr/share/terminfo/m/ms-terminal
 OLD_FILES+=usr/share/terminfo/m/ms-vt-utf8
 OLD_FILES+=usr/share/terminfo/m/ms-vt100
 OLD_FILES+=usr/share/terminfo/m/ms-vt100+
 OLD_FILES+=usr/share/terminfo/m/ms-vt100-color
 OLD_FILES+=usr/share/terminfo/m/msk227
 OLD_FILES+=usr/share/terminfo/m/msk22714
 OLD_FILES+=usr/share/terminfo/m/msk227am
 OLD_FILES+=usr/share/terminfo/m/mskermit227
 OLD_FILES+=usr/share/terminfo/m/mskermit22714
 OLD_FILES+=usr/share/terminfo/m/mskermit227am
 OLD_FILES+=usr/share/terminfo/m/mt-70
 OLD_FILES+=usr/share/terminfo/m/mt4520-rv
 OLD_FILES+=usr/share/terminfo/m/mt70
 OLD_FILES+=usr/share/terminfo/m/mterm
 OLD_FILES+=usr/share/terminfo/m/mterm-ansi
 OLD_FILES+=usr/share/terminfo/m/mvterm
 OLD_DIRS+=usr/share/terminfo/m/
 OLD_FILES+=usr/share/terminfo/n/n7900
 OLD_FILES+=usr/share/terminfo/n/nansi.sys
 OLD_FILES+=usr/share/terminfo/n/nansi.sysk
 OLD_FILES+=usr/share/terminfo/n/nansisys
 OLD_FILES+=usr/share/terminfo/n/nansisysk
 OLD_FILES+=usr/share/terminfo/n/ncr160vppp
 OLD_FILES+=usr/share/terminfo/n/ncr160vpwpp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt100an
 OLD_FILES+=usr/share/terminfo/n/ncr160vt100pp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt100wan
 OLD_FILES+=usr/share/terminfo/n/ncr160vt100wpp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt200an
 OLD_FILES+=usr/share/terminfo/n/ncr160vt200pp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt200wan
 OLD_FILES+=usr/share/terminfo/n/ncr160vt200wpp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt300an
 OLD_FILES+=usr/share/terminfo/n/ncr160vt300pp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt300wan
 OLD_FILES+=usr/share/terminfo/n/ncr160vt300wpp
 OLD_FILES+=usr/share/terminfo/n/ncr160wy50+pp
 OLD_FILES+=usr/share/terminfo/n/ncr160wy50+wpp
 OLD_FILES+=usr/share/terminfo/n/ncr160wy60pp
 OLD_FILES+=usr/share/terminfo/n/ncr160wy60wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260intan
 OLD_FILES+=usr/share/terminfo/n/ncr260intpp
 OLD_FILES+=usr/share/terminfo/n/ncr260intwan
 OLD_FILES+=usr/share/terminfo/n/ncr260intwpp
 OLD_FILES+=usr/share/terminfo/n/ncr260vppp
 OLD_FILES+=usr/share/terminfo/n/ncr260vpwpp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt100an
 OLD_FILES+=usr/share/terminfo/n/ncr260vt100pp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt100wan
 OLD_FILES+=usr/share/terminfo/n/ncr260vt100wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt200an
 OLD_FILES+=usr/share/terminfo/n/ncr260vt200pp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt200wan
 OLD_FILES+=usr/share/terminfo/n/ncr260vt200wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt300an
 OLD_FILES+=usr/share/terminfo/n/ncr260vt300pp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt300wan
 OLD_FILES+=usr/share/terminfo/n/ncr260vt300wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy325pp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy325wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy350pp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy350wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy50+pp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy50+wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy60pp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy60wpp
 OLD_FILES+=usr/share/terminfo/n/ncr7900
 OLD_FILES+=usr/share/terminfo/n/ncr7900i
 OLD_FILES+=usr/share/terminfo/n/ncr7900iv
 OLD_FILES+=usr/share/terminfo/n/ncr7901
 OLD_FILES+=usr/share/terminfo/n/ncrvt100an
 OLD_FILES+=usr/share/terminfo/n/ncrvt100pp
 OLD_FILES+=usr/share/terminfo/n/ncrvt100wan
 OLD_FILES+=usr/share/terminfo/n/ncrvt100wpp
 OLD_FILES+=usr/share/terminfo/n/ncsa
 OLD_FILES+=usr/share/terminfo/n/ncsa-m
 OLD_FILES+=usr/share/terminfo/n/ncsa-m-ns
 OLD_FILES+=usr/share/terminfo/n/ncsa-ns
 OLD_FILES+=usr/share/terminfo/n/ncsa-vt220
 OLD_FILES+=usr/share/terminfo/n/ncsa-vt220-8
 OLD_FILES+=usr/share/terminfo/n/nd9500
 OLD_FILES+=usr/share/terminfo/n/ndr9500
 OLD_FILES+=usr/share/terminfo/n/ndr9500-25
 OLD_FILES+=usr/share/terminfo/n/ndr9500-25-mc
 OLD_FILES+=usr/share/terminfo/n/ndr9500-25-mc-nl
 OLD_FILES+=usr/share/terminfo/n/ndr9500-25-nl
 OLD_FILES+=usr/share/terminfo/n/ndr9500-mc
 OLD_FILES+=usr/share/terminfo/n/ndr9500-mc-nl
 OLD_FILES+=usr/share/terminfo/n/ndr9500-nl
 OLD_FILES+=usr/share/terminfo/n/nec
 OLD_FILES+=usr/share/terminfo/n/nec5520
 OLD_FILES+=usr/share/terminfo/n/netbsd6
 OLD_FILES+=usr/share/terminfo/n/newhp
 OLD_FILES+=usr/share/terminfo/n/newhpkeyboard
 OLD_FILES+=usr/share/terminfo/n/news
 OLD_FILES+=usr/share/terminfo/n/news-29
 OLD_FILES+=usr/share/terminfo/n/news-29-euc
 OLD_FILES+=usr/share/terminfo/n/news-29-sjis
 OLD_FILES+=usr/share/terminfo/n/news-33
 OLD_FILES+=usr/share/terminfo/n/news-33-euc
 OLD_FILES+=usr/share/terminfo/n/news-33-sjis
 OLD_FILES+=usr/share/terminfo/n/news-42
 OLD_FILES+=usr/share/terminfo/n/news-42-euc
 OLD_FILES+=usr/share/terminfo/n/news-42-sjis
 OLD_FILES+=usr/share/terminfo/n/news-a
 OLD_FILES+=usr/share/terminfo/n/news-o
 OLD_FILES+=usr/share/terminfo/n/news-old-unk
 OLD_FILES+=usr/share/terminfo/n/news-unk
 OLD_FILES+=usr/share/terminfo/n/news28
 OLD_FILES+=usr/share/terminfo/n/news28-a
 OLD_FILES+=usr/share/terminfo/n/news29
 OLD_FILES+=usr/share/terminfo/n/news31
 OLD_FILES+=usr/share/terminfo/n/news31-a
 OLD_FILES+=usr/share/terminfo/n/news31-o
 OLD_FILES+=usr/share/terminfo/n/news33
 OLD_FILES+=usr/share/terminfo/n/news40
 OLD_FILES+=usr/share/terminfo/n/news40-a
 OLD_FILES+=usr/share/terminfo/n/news40-o
 OLD_FILES+=usr/share/terminfo/n/news42
 OLD_FILES+=usr/share/terminfo/n/newscbm
 OLD_FILES+=usr/share/terminfo/n/newscbm-a
 OLD_FILES+=usr/share/terminfo/n/newscbm-o
 OLD_FILES+=usr/share/terminfo/n/newscbm33
 OLD_FILES+=usr/share/terminfo/n/next
 OLD_FILES+=usr/share/terminfo/n/nextshell
 OLD_FILES+=usr/share/terminfo/n/northstar
 OLD_FILES+=usr/share/terminfo/n/nsterm
 OLD_FILES+=usr/share/terminfo/n/nsterm+7
 OLD_FILES+=usr/share/terminfo/n/nsterm+acs
 OLD_FILES+=usr/share/terminfo/n/nsterm+c
 OLD_FILES+=usr/share/terminfo/n/nsterm+c41
 OLD_FILES+=usr/share/terminfo/n/nsterm+mac
 OLD_FILES+=usr/share/terminfo/n/nsterm+s
 OLD_FILES+=usr/share/terminfo/n/nsterm-16color
 OLD_FILES+=usr/share/terminfo/n/nsterm-256color
 OLD_FILES+=usr/share/terminfo/n/nsterm-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-7-c
 OLD_FILES+=usr/share/terminfo/n/nsterm-7-c-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-7-m
 OLD_FILES+=usr/share/terminfo/n/nsterm-7-m-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-7-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs-c
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs-c-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs-m
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs-m-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-bce
 OLD_FILES+=usr/share/terminfo/n/nsterm-build309
 OLD_FILES+=usr/share/terminfo/n/nsterm-build326
 OLD_FILES+=usr/share/terminfo/n/nsterm-build343
 OLD_FILES+=usr/share/terminfo/n/nsterm-build361
 OLD_FILES+=usr/share/terminfo/n/nsterm-build400
 OLD_FILES+=usr/share/terminfo/n/nsterm-c
 OLD_FILES+=usr/share/terminfo/n/nsterm-c-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-c-acs
 OLD_FILES+=usr/share/terminfo/n/nsterm-c-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-c-s-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-c-s-acs
 OLD_FILES+=usr/share/terminfo/n/nsterm-direct
 OLD_FILES+=usr/share/terminfo/n/nsterm-m
 OLD_FILES+=usr/share/terminfo/n/nsterm-m-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-m-acs
 OLD_FILES+=usr/share/terminfo/n/nsterm-m-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-m-s-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-m-s-acs
 OLD_FILES+=usr/share/terminfo/n/nsterm-old
 OLD_FILES+=usr/share/terminfo/n/nsterm-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-s-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-s-acs
 OLD_FILES+=usr/share/terminfo/n/ntconsole
 OLD_FILES+=usr/share/terminfo/n/ntconsole-100
 OLD_FILES+=usr/share/terminfo/n/ntconsole-100-nti
 OLD_FILES+=usr/share/terminfo/n/ntconsole-25
 OLD_FILES+=usr/share/terminfo/n/ntconsole-25-nti
 OLD_FILES+=usr/share/terminfo/n/ntconsole-25-w
 OLD_FILES+=usr/share/terminfo/n/ntconsole-25-w-vt
 OLD_FILES+=usr/share/terminfo/n/ntconsole-35
 OLD_FILES+=usr/share/terminfo/n/ntconsole-35-nti
 OLD_FILES+=usr/share/terminfo/n/ntconsole-35-w
 OLD_FILES+=usr/share/terminfo/n/ntconsole-50
 OLD_FILES+=usr/share/terminfo/n/ntconsole-50-nti
 OLD_FILES+=usr/share/terminfo/n/ntconsole-50-w
 OLD_FILES+=usr/share/terminfo/n/ntconsole-60
 OLD_FILES+=usr/share/terminfo/n/ntconsole-60-nti
 OLD_FILES+=usr/share/terminfo/n/ntconsole-60-w
 OLD_FILES+=usr/share/terminfo/n/ntconsole-w
 OLD_FILES+=usr/share/terminfo/n/ntconsole-w-vt
 OLD_FILES+=usr/share/terminfo/n/nwe501
 OLD_FILES+=usr/share/terminfo/n/nwe501-a
 OLD_FILES+=usr/share/terminfo/n/nwe501-o
 OLD_FILES+=usr/share/terminfo/n/nwp-511
 OLD_FILES+=usr/share/terminfo/n/nwp-517
 OLD_FILES+=usr/share/terminfo/n/nwp-517-w
 OLD_FILES+=usr/share/terminfo/n/nwp251-a
 OLD_FILES+=usr/share/terminfo/n/nwp251-o
 OLD_FILES+=usr/share/terminfo/n/nwp511
 OLD_FILES+=usr/share/terminfo/n/nwp512
 OLD_FILES+=usr/share/terminfo/n/nwp512-a
 OLD_FILES+=usr/share/terminfo/n/nwp512-o
 OLD_FILES+=usr/share/terminfo/n/nwp513
 OLD_FILES+=usr/share/terminfo/n/nwp513-a
 OLD_FILES+=usr/share/terminfo/n/nwp513-o
 OLD_FILES+=usr/share/terminfo/n/nwp514
 OLD_FILES+=usr/share/terminfo/n/nwp514-a
 OLD_FILES+=usr/share/terminfo/n/nwp514-o
 OLD_FILES+=usr/share/terminfo/n/nwp517
 OLD_FILES+=usr/share/terminfo/n/nwp517-w
 OLD_FILES+=usr/share/terminfo/n/nwp518
 OLD_FILES+=usr/share/terminfo/n/nwp518-a
 OLD_FILES+=usr/share/terminfo/n/nwp518-o
 OLD_FILES+=usr/share/terminfo/n/nxterm
 OLD_DIRS+=usr/share/terminfo/n/
 OLD_FILES+=usr/share/terminfo/o/o31
 OLD_FILES+=usr/share/terminfo/o/o4112-nd
 OLD_FILES+=usr/share/terminfo/o/o85h
 OLD_FILES+=usr/share/terminfo/o/oabm85h
 OLD_FILES+=usr/share/terminfo/o/oblit
 OLD_FILES+=usr/share/terminfo/o/oc100
 OLD_FILES+=usr/share/terminfo/o/oconcept
 OLD_FILES+=usr/share/terminfo/o/ofcons
 OLD_FILES+=usr/share/terminfo/o/ojerq
 OLD_FILES+=usr/share/terminfo/o/old-st
 OLD_FILES+=usr/share/terminfo/o/oldibmpc3
 OLD_FILES+=usr/share/terminfo/o/oldpc3
 OLD_FILES+=usr/share/terminfo/o/oldsun
 OLD_FILES+=usr/share/terminfo/o/omron
 OLD_FILES+=usr/share/terminfo/o/opennt
 OLD_FILES+=usr/share/terminfo/o/opennt-100
 OLD_FILES+=usr/share/terminfo/o/opennt-100-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-25
 OLD_FILES+=usr/share/terminfo/o/opennt-25-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-25-w
 OLD_FILES+=usr/share/terminfo/o/opennt-25-w-vt
 OLD_FILES+=usr/share/terminfo/o/opennt-35
 OLD_FILES+=usr/share/terminfo/o/opennt-35-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-35-w
 OLD_FILES+=usr/share/terminfo/o/opennt-50
 OLD_FILES+=usr/share/terminfo/o/opennt-50-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-50-w
 OLD_FILES+=usr/share/terminfo/o/opennt-60
 OLD_FILES+=usr/share/terminfo/o/opennt-60-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-60-w
 OLD_FILES+=usr/share/terminfo/o/opennt-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-w
 OLD_FILES+=usr/share/terminfo/o/opennt-w-vt
 OLD_FILES+=usr/share/terminfo/o/opus3n1+
 OLD_FILES+=usr/share/terminfo/o/origibmpc3
 OLD_FILES+=usr/share/terminfo/o/origpc3
 OLD_FILES+=usr/share/terminfo/o/os9LII
 OLD_FILES+=usr/share/terminfo/o/osborne
 OLD_FILES+=usr/share/terminfo/o/osborne-w
 OLD_FILES+=usr/share/terminfo/o/osborne1
 OLD_FILES+=usr/share/terminfo/o/osborne1-w
 OLD_FILES+=usr/share/terminfo/o/osexec
 OLD_FILES+=usr/share/terminfo/o/otek4112
 OLD_FILES+=usr/share/terminfo/o/otek4113
 OLD_FILES+=usr/share/terminfo/o/otek4114
 OLD_FILES+=usr/share/terminfo/o/otek4115
 OLD_FILES+=usr/share/terminfo/o/owl
 OLD_DIRS+=usr/share/terminfo/o/
 OLD_FILES+=usr/share/terminfo/p/p12
 OLD_FILES+=usr/share/terminfo/p/p12-m
 OLD_FILES+=usr/share/terminfo/p/p12-m-w
 OLD_FILES+=usr/share/terminfo/p/p12-w
 OLD_FILES+=usr/share/terminfo/p/p14
 OLD_FILES+=usr/share/terminfo/p/p14-m
 OLD_FILES+=usr/share/terminfo/p/p14-m-w
 OLD_FILES+=usr/share/terminfo/p/p14-w
 OLD_FILES+=usr/share/terminfo/p/p19
 OLD_FILES+=usr/share/terminfo/p/p4
 OLD_FILES+=usr/share/terminfo/p/p5
 OLD_FILES+=usr/share/terminfo/p/p7
 OLD_FILES+=usr/share/terminfo/p/p8
 OLD_FILES+=usr/share/terminfo/p/p8-w
 OLD_FILES+=usr/share/terminfo/p/p8gl
 OLD_FILES+=usr/share/terminfo/p/p9
 OLD_FILES+=usr/share/terminfo/p/p9-8
 OLD_FILES+=usr/share/terminfo/p/p9-8-w
 OLD_FILES+=usr/share/terminfo/p/p9-w
 OLD_FILES+=usr/share/terminfo/p/pc-coherent
 OLD_FILES+=usr/share/terminfo/p/pc-minix
 OLD_FILES+=usr/share/terminfo/p/pc-venix
 OLD_FILES+=usr/share/terminfo/p/pc3
 OLD_FILES+=usr/share/terminfo/p/pc3-bold
 OLD_FILES+=usr/share/terminfo/p/pc3r
 OLD_FILES+=usr/share/terminfo/p/pc3r-m
 OLD_FILES+=usr/share/terminfo/p/pc6300plus
 OLD_FILES+=usr/share/terminfo/p/pc7300
 OLD_FILES+=usr/share/terminfo/p/pcansi
 OLD_FILES+=usr/share/terminfo/p/pcansi-25
 OLD_FILES+=usr/share/terminfo/p/pcansi-25-m
 OLD_FILES+=usr/share/terminfo/p/pcansi-33
 OLD_FILES+=usr/share/terminfo/p/pcansi-33-m
 OLD_FILES+=usr/share/terminfo/p/pcansi-43
 OLD_FILES+=usr/share/terminfo/p/pcansi-43-m
 OLD_FILES+=usr/share/terminfo/p/pcansi-m
 OLD_FILES+=usr/share/terminfo/p/pcansi-mono
 OLD_FILES+=usr/share/terminfo/p/pcansi25
 OLD_FILES+=usr/share/terminfo/p/pcansi25m
 OLD_FILES+=usr/share/terminfo/p/pcansi33
 OLD_FILES+=usr/share/terminfo/p/pcansi33m
 OLD_FILES+=usr/share/terminfo/p/pcansi43
 OLD_FILES+=usr/share/terminfo/p/pccon
 OLD_FILES+=usr/share/terminfo/p/pccon+base
 OLD_FILES+=usr/share/terminfo/p/pccon+colors
 OLD_FILES+=usr/share/terminfo/p/pccon+keys
 OLD_FILES+=usr/share/terminfo/p/pccon+sgr+acs
 OLD_FILES+=usr/share/terminfo/p/pccon+sgr+acs0
 OLD_FILES+=usr/share/terminfo/p/pccon-m
 OLD_FILES+=usr/share/terminfo/p/pccon0
 OLD_FILES+=usr/share/terminfo/p/pccon0-m
 OLD_FILES+=usr/share/terminfo/p/pccons
 OLD_FILES+=usr/share/terminfo/p/pcconsole
 OLD_FILES+=usr/share/terminfo/p/pcix
 OLD_FILES+=usr/share/terminfo/p/pckermit
 OLD_FILES+=usr/share/terminfo/p/pckermit12
 OLD_FILES+=usr/share/terminfo/p/pckermit120
 OLD_FILES+=usr/share/terminfo/p/pcmw
 OLD_FILES+=usr/share/terminfo/p/pcplot
 OLD_FILES+=usr/share/terminfo/p/pcvt25
 OLD_FILES+=usr/share/terminfo/p/pcvt25-color
 OLD_FILES+=usr/share/terminfo/p/pcvt25w
 OLD_FILES+=usr/share/terminfo/p/pcvt28
 OLD_FILES+=usr/share/terminfo/p/pcvt28w
 OLD_FILES+=usr/share/terminfo/p/pcvt35
 OLD_FILES+=usr/share/terminfo/p/pcvt35w
 OLD_FILES+=usr/share/terminfo/p/pcvt40
 OLD_FILES+=usr/share/terminfo/p/pcvt40w
 OLD_FILES+=usr/share/terminfo/p/pcvt43
 OLD_FILES+=usr/share/terminfo/p/pcvt43w
 OLD_FILES+=usr/share/terminfo/p/pcvt50
 OLD_FILES+=usr/share/terminfo/p/pcvt50w
 OLD_FILES+=usr/share/terminfo/p/pcvtXX
 OLD_FILES+=usr/share/terminfo/p/pcz19
 OLD_FILES+=usr/share/terminfo/p/pe1100
 OLD_FILES+=usr/share/terminfo/p/pe1200
 OLD_FILES+=usr/share/terminfo/p/pe1251
 OLD_FILES+=usr/share/terminfo/p/pe550
 OLD_FILES+=usr/share/terminfo/p/pe6100
 OLD_FILES+=usr/share/terminfo/p/pe6300
 OLD_FILES+=usr/share/terminfo/p/pe6312
 OLD_FILES+=usr/share/terminfo/p/pe7000c
 OLD_FILES+=usr/share/terminfo/p/pe7000m
 OLD_FILES+=usr/share/terminfo/p/pilot
 OLD_FILES+=usr/share/terminfo/p/pmcons
 OLD_FILES+=usr/share/terminfo/p/pmconsole
 OLD_FILES+=usr/share/terminfo/p/printer
 OLD_FILES+=usr/share/terminfo/p/prism12
 OLD_FILES+=usr/share/terminfo/p/prism12-m
 OLD_FILES+=usr/share/terminfo/p/prism12-m-w
 OLD_FILES+=usr/share/terminfo/p/prism12-w
 OLD_FILES+=usr/share/terminfo/p/prism14
 OLD_FILES+=usr/share/terminfo/p/prism14-m
 OLD_FILES+=usr/share/terminfo/p/prism14-m-w
 OLD_FILES+=usr/share/terminfo/p/prism14-w
 OLD_FILES+=usr/share/terminfo/p/prism2
 OLD_FILES+=usr/share/terminfo/p/prism4
 OLD_FILES+=usr/share/terminfo/p/prism5
 OLD_FILES+=usr/share/terminfo/p/prism7
 OLD_FILES+=usr/share/terminfo/p/prism8
 OLD_FILES+=usr/share/terminfo/p/prism8-w
 OLD_FILES+=usr/share/terminfo/p/prism8gl
 OLD_FILES+=usr/share/terminfo/p/prism9
 OLD_FILES+=usr/share/terminfo/p/prism9-8
 OLD_FILES+=usr/share/terminfo/p/prism9-8-w
 OLD_FILES+=usr/share/terminfo/p/prism9-w
 OLD_FILES+=usr/share/terminfo/p/pro350
 OLD_FILES+=usr/share/terminfo/p/ps300
 OLD_FILES+=usr/share/terminfo/p/psterm
 OLD_FILES+=usr/share/terminfo/p/psterm-80x24
 OLD_FILES+=usr/share/terminfo/p/psterm-90x28
 OLD_FILES+=usr/share/terminfo/p/psterm-96x48
 OLD_FILES+=usr/share/terminfo/p/psterm-basic
 OLD_FILES+=usr/share/terminfo/p/psterm-fast
 OLD_FILES+=usr/share/terminfo/p/psx_ansi
 OLD_FILES+=usr/share/terminfo/p/pt100
 OLD_FILES+=usr/share/terminfo/p/pt100w
 OLD_FILES+=usr/share/terminfo/p/pt200
 OLD_FILES+=usr/share/terminfo/p/pt200w
 OLD_FILES+=usr/share/terminfo/p/pt210
 OLD_FILES+=usr/share/terminfo/p/pt250
 OLD_FILES+=usr/share/terminfo/p/pt250w
 OLD_FILES+=usr/share/terminfo/p/pt505
 OLD_FILES+=usr/share/terminfo/p/pt505-22
 OLD_FILES+=usr/share/terminfo/p/pt505-24
 OLD_FILES+=usr/share/terminfo/p/pty
 OLD_FILES+=usr/share/terminfo/p/putty
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+esc
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+linux
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+sco
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+vt100
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+vt400
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+xterm
 OLD_FILES+=usr/share/terminfo/p/putty+keypad
 OLD_FILES+=usr/share/terminfo/p/putty+screen
 OLD_FILES+=usr/share/terminfo/p/putty-256color
 OLD_FILES+=usr/share/terminfo/p/putty-m1
 OLD_FILES+=usr/share/terminfo/p/putty-m1b
 OLD_FILES+=usr/share/terminfo/p/putty-m2
 OLD_FILES+=usr/share/terminfo/p/putty-noapp
 OLD_FILES+=usr/share/terminfo/p/putty-sco
 OLD_FILES+=usr/share/terminfo/p/putty-screen
 OLD_FILES+=usr/share/terminfo/p/putty-vt100
 OLD_DIRS+=usr/share/terminfo/p/
 OLD_FILES+=usr/share/terminfo/q/qansi
 OLD_FILES+=usr/share/terminfo/q/qansi-g
 OLD_FILES+=usr/share/terminfo/q/qansi-m
 OLD_FILES+=usr/share/terminfo/q/qansi-t
 OLD_FILES+=usr/share/terminfo/q/qansi-w
 OLD_FILES+=usr/share/terminfo/q/qdcons
 OLD_FILES+=usr/share/terminfo/q/qdss
 OLD_FILES+=usr/share/terminfo/q/qnx
 OLD_FILES+=usr/share/terminfo/q/qnx4
 OLD_FILES+=usr/share/terminfo/q/qnxm
 OLD_FILES+=usr/share/terminfo/q/qnxt
 OLD_FILES+=usr/share/terminfo/q/qnxt2
 OLD_FILES+=usr/share/terminfo/q/qnxt4
 OLD_FILES+=usr/share/terminfo/q/qnxtmono
 OLD_FILES+=usr/share/terminfo/q/qnxw
 OLD_FILES+=usr/share/terminfo/q/qume
 OLD_FILES+=usr/share/terminfo/q/qume5
 OLD_FILES+=usr/share/terminfo/q/qvt101
 OLD_FILES+=usr/share/terminfo/q/qvt101+
 OLD_FILES+=usr/share/terminfo/q/qvt101p
 OLD_FILES+=usr/share/terminfo/q/qvt102
 OLD_FILES+=usr/share/terminfo/q/qvt103
 OLD_FILES+=usr/share/terminfo/q/qvt103-w
 OLD_FILES+=usr/share/terminfo/q/qvt108
 OLD_FILES+=usr/share/terminfo/q/qvt119
 OLD_FILES+=usr/share/terminfo/q/qvt119+
 OLD_FILES+=usr/share/terminfo/q/qvt119+-25
 OLD_FILES+=usr/share/terminfo/q/qvt119+-25-w
 OLD_FILES+=usr/share/terminfo/q/qvt119+-w
 OLD_FILES+=usr/share/terminfo/q/qvt119-25-w
 OLD_FILES+=usr/share/terminfo/q/qvt119-w
 OLD_FILES+=usr/share/terminfo/q/qvt119p
 OLD_FILES+=usr/share/terminfo/q/qvt119p-25
 OLD_FILES+=usr/share/terminfo/q/qvt119p-25-w
 OLD_FILES+=usr/share/terminfo/q/qvt119p-w
 OLD_FILES+=usr/share/terminfo/q/qvt203
 OLD_FILES+=usr/share/terminfo/q/qvt203+
 OLD_FILES+=usr/share/terminfo/q/qvt203-25
 OLD_FILES+=usr/share/terminfo/q/qvt203-25-w
 OLD_FILES+=usr/share/terminfo/q/qvt203-w
 OLD_FILES+=usr/share/terminfo/q/qvt203-w-am
 OLD_DIRS+=usr/share/terminfo/q/
 OLD_FILES+=usr/share/terminfo/r/rbcomm
 OLD_FILES+=usr/share/terminfo/r/rbcomm-nam
 OLD_FILES+=usr/share/terminfo/r/rbcomm-w
 OLD_FILES+=usr/share/terminfo/r/rca
 OLD_FILES+=usr/share/terminfo/r/rcons
 OLD_FILES+=usr/share/terminfo/r/rcons-color
 OLD_FILES+=usr/share/terminfo/r/rebus3180
 OLD_FILES+=usr/share/terminfo/r/regent
 OLD_FILES+=usr/share/terminfo/r/regent100
 OLD_FILES+=usr/share/terminfo/r/regent20
 OLD_FILES+=usr/share/terminfo/r/regent200
 OLD_FILES+=usr/share/terminfo/r/regent25
 OLD_FILES+=usr/share/terminfo/r/regent40
 OLD_FILES+=usr/share/terminfo/r/regent40+
 OLD_FILES+=usr/share/terminfo/r/regent60
 OLD_FILES+=usr/share/terminfo/r/rt6221
 OLD_FILES+=usr/share/terminfo/r/rt6221-w
 OLD_FILES+=usr/share/terminfo/r/rtpc
 OLD_FILES+=usr/share/terminfo/r/rxvt
 OLD_FILES+=usr/share/terminfo/r/rxvt+pcfkeys
 OLD_FILES+=usr/share/terminfo/r/rxvt-16color
 OLD_FILES+=usr/share/terminfo/r/rxvt-256color
 OLD_FILES+=usr/share/terminfo/r/rxvt-88color
 OLD_FILES+=usr/share/terminfo/r/rxvt-basic
 OLD_FILES+=usr/share/terminfo/r/rxvt-color
 OLD_FILES+=usr/share/terminfo/r/rxvt-cygwin
 OLD_FILES+=usr/share/terminfo/r/rxvt-cygwin-native
 OLD_FILES+=usr/share/terminfo/r/rxvt-xpm
 OLD_DIRS+=usr/share/terminfo/r/
 OLD_FILES+=usr/share/terminfo/s/s4
 OLD_FILES+=usr/share/terminfo/s/sb1
 OLD_FILES+=usr/share/terminfo/s/sb2
 OLD_FILES+=usr/share/terminfo/s/sb3
 OLD_FILES+=usr/share/terminfo/s/sbi
 OLD_FILES+=usr/share/terminfo/s/sbobcat
 OLD_FILES+=usr/share/terminfo/s/sc410
 OLD_FILES+=usr/share/terminfo/s/sc415
 OLD_FILES+=usr/share/terminfo/s/scanset
 OLD_FILES+=usr/share/terminfo/s/scoansi
 OLD_FILES+=usr/share/terminfo/s/scoansi-new
 OLD_FILES+=usr/share/terminfo/s/scoansi-old
 OLD_FILES+=usr/share/terminfo/s/screen
 OLD_FILES+=usr/share/terminfo/s/screen+fkeys
 OLD_FILES+=usr/share/terminfo/s/screen+italics
 OLD_FILES+=usr/share/terminfo/s/screen-16color
 OLD_FILES+=usr/share/terminfo/s/screen-16color-bce
 OLD_FILES+=usr/share/terminfo/s/screen-16color-bce-s
 OLD_FILES+=usr/share/terminfo/s/screen-16color-s
 OLD_FILES+=usr/share/terminfo/s/screen-256color
 OLD_FILES+=usr/share/terminfo/s/screen-256color-bce
 OLD_FILES+=usr/share/terminfo/s/screen-256color-bce-s
 OLD_FILES+=usr/share/terminfo/s/screen-256color-s
 OLD_FILES+=usr/share/terminfo/s/screen-bce
 OLD_FILES+=usr/share/terminfo/s/screen-bce.Eterm
 OLD_FILES+=usr/share/terminfo/s/screen-bce.gnome
 OLD_FILES+=usr/share/terminfo/s/screen-bce.konsole
 OLD_FILES+=usr/share/terminfo/s/screen-bce.linux
 OLD_FILES+=usr/share/terminfo/s/screen-bce.mrxvt
 OLD_FILES+=usr/share/terminfo/s/screen-bce.rxvt
 OLD_FILES+=usr/share/terminfo/s/screen-bce.xterm-new
 OLD_FILES+=usr/share/terminfo/s/screen-s
 OLD_FILES+=usr/share/terminfo/s/screen-w
 OLD_FILES+=usr/share/terminfo/s/screen.Eterm
 OLD_FILES+=usr/share/terminfo/s/screen.gnome
 OLD_FILES+=usr/share/terminfo/s/screen.konsole
 OLD_FILES+=usr/share/terminfo/s/screen.konsole-256color
 OLD_FILES+=usr/share/terminfo/s/screen.linux
 OLD_FILES+=usr/share/terminfo/s/screen.linux-m1
 OLD_FILES+=usr/share/terminfo/s/screen.linux-m1b
 OLD_FILES+=usr/share/terminfo/s/screen.linux-m2
 OLD_FILES+=usr/share/terminfo/s/screen.linux-s
 OLD_FILES+=usr/share/terminfo/s/screen.minitel1
 OLD_FILES+=usr/share/terminfo/s/screen.minitel1-nb
 OLD_FILES+=usr/share/terminfo/s/screen.minitel12-80
 OLD_FILES+=usr/share/terminfo/s/screen.minitel1b
 OLD_FILES+=usr/share/terminfo/s/screen.minitel1b-80
 OLD_FILES+=usr/share/terminfo/s/screen.minitel1b-nb
 OLD_FILES+=usr/share/terminfo/s/screen.minitel2-80
 OLD_FILES+=usr/share/terminfo/s/screen.mlterm
 OLD_FILES+=usr/share/terminfo/s/screen.mlterm-256color
 OLD_FILES+=usr/share/terminfo/s/screen.mrxvt
 OLD_FILES+=usr/share/terminfo/s/screen.putty
 OLD_FILES+=usr/share/terminfo/s/screen.putty-256color
 OLD_FILES+=usr/share/terminfo/s/screen.putty-m1
 OLD_FILES+=usr/share/terminfo/s/screen.putty-m1b
 OLD_FILES+=usr/share/terminfo/s/screen.putty-m2
 OLD_FILES+=usr/share/terminfo/s/screen.rxvt
 OLD_FILES+=usr/share/terminfo/s/screen.teraterm
 OLD_FILES+=usr/share/terminfo/s/screen.vte
 OLD_FILES+=usr/share/terminfo/s/screen.vte-256color
 OLD_FILES+=usr/share/terminfo/s/screen.xterm-256color
 OLD_FILES+=usr/share/terminfo/s/screen.xterm-new
 OLD_FILES+=usr/share/terminfo/s/screen.xterm-r6
 OLD_FILES+=usr/share/terminfo/s/screen.xterm-xfree86
 OLD_FILES+=usr/share/terminfo/s/screen2
 OLD_FILES+=usr/share/terminfo/s/screen3
 OLD_FILES+=usr/share/terminfo/s/screen4
 OLD_FILES+=usr/share/terminfo/s/screen5
 OLD_FILES+=usr/share/terminfo/s/screwpoint
 OLD_FILES+=usr/share/terminfo/s/scrhp
 OLD_FILES+=usr/share/terminfo/s/scrt
 OLD_FILES+=usr/share/terminfo/s/securecrt
 OLD_FILES+=usr/share/terminfo/s/sibo
 OLD_FILES+=usr/share/terminfo/s/simpleterm
 OLD_FILES+=usr/share/terminfo/s/simterm
 OLD_FILES+=usr/share/terminfo/s/soroc
 OLD_FILES+=usr/share/terminfo/s/soroc120
 OLD_FILES+=usr/share/terminfo/s/soroc140
 OLD_FILES+=usr/share/terminfo/s/spinwriter
 OLD_FILES+=usr/share/terminfo/s/st
 OLD_FILES+=usr/share/terminfo/s/st-0.6
 OLD_FILES+=usr/share/terminfo/s/st-0.7
 OLD_FILES+=usr/share/terminfo/s/st-0.8
 OLD_FILES+=usr/share/terminfo/s/st-16color
 OLD_FILES+=usr/share/terminfo/s/st-256color
 OLD_FILES+=usr/share/terminfo/s/st-direct
 OLD_FILES+=usr/share/terminfo/s/st52
 OLD_FILES+=usr/share/terminfo/s/st52-color
 OLD_FILES+=usr/share/terminfo/s/st52-m
 OLD_FILES+=usr/share/terminfo/s/st52-old
 OLD_FILES+=usr/share/terminfo/s/stterm
 OLD_FILES+=usr/share/terminfo/s/stterm-16color
 OLD_FILES+=usr/share/terminfo/s/stterm-256color
 OLD_FILES+=usr/share/terminfo/s/stv52
 OLD_FILES+=usr/share/terminfo/s/stv52pc
 OLD_FILES+=usr/share/terminfo/s/sun
 OLD_FILES+=usr/share/terminfo/s/sun+sl
 OLD_FILES+=usr/share/terminfo/s/sun-1
 OLD_FILES+=usr/share/terminfo/s/sun-12
 OLD_FILES+=usr/share/terminfo/s/sun-17
 OLD_FILES+=usr/share/terminfo/s/sun-24
 OLD_FILES+=usr/share/terminfo/s/sun-34
 OLD_FILES+=usr/share/terminfo/s/sun-48
 OLD_FILES+=usr/share/terminfo/s/sun-c
 OLD_FILES+=usr/share/terminfo/s/sun-cgsix
 OLD_FILES+=usr/share/terminfo/s/sun-cmd
 OLD_FILES+=usr/share/terminfo/s/sun-color
 OLD_FILES+=usr/share/terminfo/s/sun-e
 OLD_FILES+=usr/share/terminfo/s/sun-e-s
 OLD_FILES+=usr/share/terminfo/s/sun-il
 OLD_FILES+=usr/share/terminfo/s/sun-nic
 OLD_FILES+=usr/share/terminfo/s/sun-s
 OLD_FILES+=usr/share/terminfo/s/sun-s-e
 OLD_FILES+=usr/share/terminfo/s/sun-ss5
 OLD_FILES+=usr/share/terminfo/s/sun-type4
 OLD_FILES+=usr/share/terminfo/s/sun1
 OLD_FILES+=usr/share/terminfo/s/sun2
 OLD_FILES+=usr/share/terminfo/s/sune
 OLD_FILES+=usr/share/terminfo/s/superbee
 OLD_FILES+=usr/share/terminfo/s/superbee-xsb
 OLD_FILES+=usr/share/terminfo/s/superbeeic
 OLD_FILES+=usr/share/terminfo/s/superbrain
 OLD_FILES+=usr/share/terminfo/s/sv80
 OLD_FILES+=usr/share/terminfo/s/swtp
 OLD_FILES+=usr/share/terminfo/s/synertek
 OLD_FILES+=usr/share/terminfo/s/synertek380
 OLD_FILES+=usr/share/terminfo/s/system1
 OLD_DIRS+=usr/share/terminfo/s/
 
 OLD_FILES+=usr/share/terminfo/t/t10
 OLD_FILES+=usr/share/terminfo/t/t1061
 OLD_FILES+=usr/share/terminfo/t/t1061f
 OLD_FILES+=usr/share/terminfo/t/t16
 OLD_FILES+=usr/share/terminfo/t/t3700
 OLD_FILES+=usr/share/terminfo/t/t3800
 OLD_FILES+=usr/share/terminfo/t/t653x
 OLD_FILES+=usr/share/terminfo/t/tab
 OLD_FILES+=usr/share/terminfo/t/tab132
 OLD_FILES+=usr/share/terminfo/t/tab132-15
 OLD_FILES+=usr/share/terminfo/t/tab132-rv
 OLD_FILES+=usr/share/terminfo/t/tab132-w
 OLD_FILES+=usr/share/terminfo/t/tab132-w-rv
 OLD_FILES+=usr/share/terminfo/t/tandem6510
 OLD_FILES+=usr/share/terminfo/t/tandem653
 OLD_FILES+=usr/share/terminfo/t/tek
 OLD_FILES+=usr/share/terminfo/t/tek4012
 OLD_FILES+=usr/share/terminfo/t/tek4013
 OLD_FILES+=usr/share/terminfo/t/tek4014
 OLD_FILES+=usr/share/terminfo/t/tek4014-sm
 OLD_FILES+=usr/share/terminfo/t/tek4015
 OLD_FILES+=usr/share/terminfo/t/tek4015-sm
 OLD_FILES+=usr/share/terminfo/t/tek4023
 OLD_FILES+=usr/share/terminfo/t/tek4024
 OLD_FILES+=usr/share/terminfo/t/tek4025
 OLD_FILES+=usr/share/terminfo/t/tek4025-17
 OLD_FILES+=usr/share/terminfo/t/tek4025-17-ws
 OLD_FILES+=usr/share/terminfo/t/tek4025-cr
 OLD_FILES+=usr/share/terminfo/t/tek4025-ex
 OLD_FILES+=usr/share/terminfo/t/tek4025a
 OLD_FILES+=usr/share/terminfo/t/tek4025ex
 OLD_FILES+=usr/share/terminfo/t/tek4027
 OLD_FILES+=usr/share/terminfo/t/tek4027-ex
 OLD_FILES+=usr/share/terminfo/t/tek4105
 OLD_FILES+=usr/share/terminfo/t/tek4105-30
 OLD_FILES+=usr/share/terminfo/t/tek4105a
 OLD_FILES+=usr/share/terminfo/t/tek4106brl
 OLD_FILES+=usr/share/terminfo/t/tek4107
 OLD_FILES+=usr/share/terminfo/t/tek4107brl
 OLD_FILES+=usr/share/terminfo/t/tek4109
 OLD_FILES+=usr/share/terminfo/t/tek4109brl
 OLD_FILES+=usr/share/terminfo/t/tek4112
 OLD_FILES+=usr/share/terminfo/t/tek4112-5
 OLD_FILES+=usr/share/terminfo/t/tek4112-nd
 OLD_FILES+=usr/share/terminfo/t/tek4113
 OLD_FILES+=usr/share/terminfo/t/tek4113-34
 OLD_FILES+=usr/share/terminfo/t/tek4113-nd
 OLD_FILES+=usr/share/terminfo/t/tek4114
 OLD_FILES+=usr/share/terminfo/t/tek4115
 OLD_FILES+=usr/share/terminfo/t/tek4125
 OLD_FILES+=usr/share/terminfo/t/tek4205
 OLD_FILES+=usr/share/terminfo/t/tek4207
 OLD_FILES+=usr/share/terminfo/t/tek4207-s
 OLD_FILES+=usr/share/terminfo/t/tek4404
 OLD_FILES+=usr/share/terminfo/t/teken
 OLD_FILES+=usr/share/terminfo/t/teleray
 OLD_FILES+=usr/share/terminfo/t/teletec
 OLD_FILES+=usr/share/terminfo/t/teraterm
 OLD_FILES+=usr/share/terminfo/t/teraterm-256color
 OLD_FILES+=usr/share/terminfo/t/teraterm2.3
 OLD_FILES+=usr/share/terminfo/t/teraterm4.59
 OLD_FILES+=usr/share/terminfo/t/teraterm4.97
 OLD_FILES+=usr/share/terminfo/t/terminator
 OLD_FILES+=usr/share/terminfo/t/terminet
 OLD_FILES+=usr/share/terminfo/t/terminet1200
 OLD_FILES+=usr/share/terminfo/t/terminet300
 OLD_FILES+=usr/share/terminfo/t/terminology
 OLD_FILES+=usr/share/terminfo/t/terminology-0.6.1
 OLD_FILES+=usr/share/terminfo/t/terminology-1.0.0
 OLD_FILES+=usr/share/terminfo/t/terminology-1.8.1
 OLD_FILES+=usr/share/terminfo/t/termite
 OLD_FILES+=usr/share/terminfo/t/tgtelnet
 OLD_FILES+=usr/share/terminfo/t/ti700
 OLD_FILES+=usr/share/terminfo/t/ti703
 OLD_FILES+=usr/share/terminfo/t/ti703-w
 OLD_FILES+=usr/share/terminfo/t/ti707
 OLD_FILES+=usr/share/terminfo/t/ti707-w
 OLD_FILES+=usr/share/terminfo/t/ti733
 OLD_FILES+=usr/share/terminfo/t/ti735
 OLD_FILES+=usr/share/terminfo/t/ti745
 OLD_FILES+=usr/share/terminfo/t/ti800
 OLD_FILES+=usr/share/terminfo/t/ti916
 OLD_FILES+=usr/share/terminfo/t/ti916-132
 OLD_FILES+=usr/share/terminfo/t/ti916-220-7
 OLD_FILES+=usr/share/terminfo/t/ti916-220-8
 OLD_FILES+=usr/share/terminfo/t/ti916-8
 OLD_FILES+=usr/share/terminfo/t/ti916-8-132
 OLD_FILES+=usr/share/terminfo/t/ti924
 OLD_FILES+=usr/share/terminfo/t/ti924-8
 OLD_FILES+=usr/share/terminfo/t/ti924-8w
 OLD_FILES+=usr/share/terminfo/t/ti924w
 OLD_FILES+=usr/share/terminfo/t/ti926
 OLD_FILES+=usr/share/terminfo/t/ti926-8
 OLD_FILES+=usr/share/terminfo/t/ti928
 OLD_FILES+=usr/share/terminfo/t/ti928-8
 OLD_FILES+=usr/share/terminfo/t/ti931
 OLD_FILES+=usr/share/terminfo/t/ti_ansi
 OLD_FILES+=usr/share/terminfo/t/tkterm
 OLD_FILES+=usr/share/terminfo/t/tmux
 OLD_FILES+=usr/share/terminfo/t/tmux-256color
 OLD_FILES+=usr/share/terminfo/t/tmux-direct
 OLD_FILES+=usr/share/terminfo/t/tn1200
 OLD_FILES+=usr/share/terminfo/t/tn300
 OLD_FILES+=usr/share/terminfo/t/trs16
 OLD_FILES+=usr/share/terminfo/t/trs2
 OLD_FILES+=usr/share/terminfo/t/trs80II
 OLD_FILES+=usr/share/terminfo/t/trsII
 OLD_FILES+=usr/share/terminfo/t/ts-1
 OLD_FILES+=usr/share/terminfo/t/ts-1p
 OLD_FILES+=usr/share/terminfo/t/ts1
 OLD_FILES+=usr/share/terminfo/t/ts100
 OLD_FILES+=usr/share/terminfo/t/ts100-ctxt
 OLD_FILES+=usr/share/terminfo/t/ts100-sp
 OLD_FILES+=usr/share/terminfo/t/ts1p
 OLD_FILES+=usr/share/terminfo/t/tt
 OLD_FILES+=usr/share/terminfo/t/tt505-22
 OLD_FILES+=usr/share/terminfo/t/tt52
 OLD_FILES+=usr/share/terminfo/t/tty33
 OLD_FILES+=usr/share/terminfo/t/tty35
 OLD_FILES+=usr/share/terminfo/t/tty37
 OLD_FILES+=usr/share/terminfo/t/tty40
 OLD_FILES+=usr/share/terminfo/t/tty43
 OLD_FILES+=usr/share/terminfo/t/tty4420
 OLD_FILES+=usr/share/terminfo/t/tty4424
 OLD_FILES+=usr/share/terminfo/t/tty4424-1
 OLD_FILES+=usr/share/terminfo/t/tty4424m
 OLD_FILES+=usr/share/terminfo/t/tty4426
 OLD_FILES+=usr/share/terminfo/t/tty5410
 OLD_FILES+=usr/share/terminfo/t/tty5410-w
 OLD_FILES+=usr/share/terminfo/t/tty5410v1
 OLD_FILES+=usr/share/terminfo/t/tty5410v1-w
 OLD_FILES+=usr/share/terminfo/t/tty5420
 OLD_FILES+=usr/share/terminfo/t/tty5420+nl
 OLD_FILES+=usr/share/terminfo/t/tty5420-nl
 OLD_FILES+=usr/share/terminfo/t/tty5420-rv
 OLD_FILES+=usr/share/terminfo/t/tty5420-rv-nl
 OLD_FILES+=usr/share/terminfo/t/tty5420-w
 OLD_FILES+=usr/share/terminfo/t/tty5420-w-nl
 OLD_FILES+=usr/share/terminfo/t/tty5420-w-rv
 OLD_FILES+=usr/share/terminfo/t/tty5420-w-rv-n
 OLD_FILES+=usr/share/terminfo/t/tty5425
 OLD_FILES+=usr/share/terminfo/t/tty5425-nl
 OLD_FILES+=usr/share/terminfo/t/tty5425-w
 OLD_FILES+=usr/share/terminfo/t/tty5620
 OLD_FILES+=usr/share/terminfo/t/tty5620-1
 OLD_FILES+=usr/share/terminfo/t/tty5620-24
 OLD_FILES+=usr/share/terminfo/t/tty5620-34
 OLD_FILES+=usr/share/terminfo/t/tty5620-s
 OLD_FILES+=usr/share/terminfo/t/ttydmd
 OLD_FILES+=usr/share/terminfo/t/tvi803
 OLD_FILES+=usr/share/terminfo/t/tvi9065
 OLD_FILES+=usr/share/terminfo/t/tvi910
 OLD_FILES+=usr/share/terminfo/t/tvi910+
 OLD_FILES+=usr/share/terminfo/t/tvi912
 OLD_FILES+=usr/share/terminfo/t/tvi912b
 OLD_FILES+=usr/share/terminfo/t/tvi912b+2p
 OLD_FILES+=usr/share/terminfo/t/tvi912b+dim
 OLD_FILES+=usr/share/terminfo/t/tvi912b+mc
 OLD_FILES+=usr/share/terminfo/t/tvi912b+printer
 OLD_FILES+=usr/share/terminfo/t/tvi912b+vb
 OLD_FILES+=usr/share/terminfo/t/tvi912b-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-2p-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912b-2p-p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-2p-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912b-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912b-mc-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-mc-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912b-p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-p-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-p-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912b-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912b-unk-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-unk-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912b-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912b-vb-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912b-vb-p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-vb-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912c
 OLD_FILES+=usr/share/terminfo/t/tvi912c-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-2p-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912c-2p-p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-2p-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912c-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912c-mc-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-mc-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912c-p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-p-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-p-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912c-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912c-unk-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-unk-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912c-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912c-vb-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912c-vb-p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-vb-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912cc
 OLD_FILES+=usr/share/terminfo/t/tvi914
 OLD_FILES+=usr/share/terminfo/t/tvi920
 OLD_FILES+=usr/share/terminfo/t/tvi920b
 OLD_FILES+=usr/share/terminfo/t/tvi920b+fn
 OLD_FILES+=usr/share/terminfo/t/tvi920b-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-2p-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920b-2p-p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-2p-unk
 OLD_FILES+=usr/share/terminfo/t/tvi920b-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920b-mc-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-mc-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920b-p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-p-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-p-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920b-unk
 OLD_FILES+=usr/share/terminfo/t/tvi920b-unk-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-unk-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920b-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920b-vb-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920b-vb-p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-vb-unk
 OLD_FILES+=usr/share/terminfo/t/tvi920c
 OLD_FILES+=usr/share/terminfo/t/tvi920c-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-2p-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920c-2p-p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-2p-unk
 OLD_FILES+=usr/share/terminfo/t/tvi920c-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920c-mc-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-mc-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920c-p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-p-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-p-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920c-unk
 OLD_FILES+=usr/share/terminfo/t/tvi920c-unk-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-unk-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920c-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920c-vb-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920c-vb-p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-vb-unk
 OLD_FILES+=usr/share/terminfo/t/tvi921
 OLD_FILES+=usr/share/terminfo/t/tvi924
 OLD_FILES+=usr/share/terminfo/t/tvi925
 OLD_FILES+=usr/share/terminfo/t/tvi925-hi
 OLD_FILES+=usr/share/terminfo/t/tvi92B
 OLD_FILES+=usr/share/terminfo/t/tvi92D
 OLD_FILES+=usr/share/terminfo/t/tvi950
 OLD_FILES+=usr/share/terminfo/t/tvi950-2p
 OLD_FILES+=usr/share/terminfo/t/tvi950-4p
 OLD_FILES+=usr/share/terminfo/t/tvi950-rv
 OLD_FILES+=usr/share/terminfo/t/tvi950-rv-2p
 OLD_FILES+=usr/share/terminfo/t/tvi950-rv-4p
 OLD_FILES+=usr/share/terminfo/t/tvi955
 OLD_FILES+=usr/share/terminfo/t/tvi955-hb
 OLD_FILES+=usr/share/terminfo/t/tvi955-w
 OLD_FILES+=usr/share/terminfo/t/tvi970
 OLD_FILES+=usr/share/terminfo/t/tvi970-2p
 OLD_FILES+=usr/share/terminfo/t/tvi970-vb
 OLD_FILES+=usr/share/terminfo/t/tvipt
 OLD_FILES+=usr/share/terminfo/t/tw100
 OLD_FILES+=usr/share/terminfo/t/tw52
 OLD_FILES+=usr/share/terminfo/t/tw52-color
 OLD_FILES+=usr/share/terminfo/t/tw52-m
 OLD_FILES+=usr/share/terminfo/t/tws-generic
 OLD_FILES+=usr/share/terminfo/t/tws2102-sna
 OLD_FILES+=usr/share/terminfo/t/tws2103
 OLD_FILES+=usr/share/terminfo/t/tws2103-sna
 OLD_DIRS+=usr/share/terminfo/t/
 OLD_FILES+=usr/share/terminfo/u/ultima2
 OLD_FILES+=usr/share/terminfo/u/ultimaII
 OLD_FILES+=usr/share/terminfo/u/uniterm
 OLD_FILES+=usr/share/terminfo/u/uniterm49
 OLD_FILES+=usr/share/terminfo/u/unixpc
 OLD_FILES+=usr/share/terminfo/u/unknown
 OLD_FILES+=usr/share/terminfo/u/uts30
 OLD_FILES+=usr/share/terminfo/u/uwin
 OLD_DIRS+=usr/share/terminfo/u/
 OLD_FILES+=usr/share/terminfo/v/v200-nam
 OLD_FILES+=usr/share/terminfo/v/v320n
 OLD_FILES+=usr/share/terminfo/v/v3220
 OLD_FILES+=usr/share/terminfo/v/v5410
 OLD_FILES+=usr/share/terminfo/v/vanilla
 OLD_FILES+=usr/share/terminfo/v/vapple
 OLD_FILES+=usr/share/terminfo/v/vc103
 OLD_FILES+=usr/share/terminfo/v/vc203
 OLD_FILES+=usr/share/terminfo/v/vc303
 OLD_FILES+=usr/share/terminfo/v/vc303a
 OLD_FILES+=usr/share/terminfo/v/vc403a
 OLD_FILES+=usr/share/terminfo/v/vc404
 OLD_FILES+=usr/share/terminfo/v/vc404-s
 OLD_FILES+=usr/share/terminfo/v/vc414
 OLD_FILES+=usr/share/terminfo/v/vc414h
 OLD_FILES+=usr/share/terminfo/v/vc415
 OLD_FILES+=usr/share/terminfo/v/venix
 OLD_FILES+=usr/share/terminfo/v/versaterm
 OLD_FILES+=usr/share/terminfo/v/vi200
 OLD_FILES+=usr/share/terminfo/v/vi200-f
 OLD_FILES+=usr/share/terminfo/v/vi200-rv
 OLD_FILES+=usr/share/terminfo/v/vi300
 OLD_FILES+=usr/share/terminfo/v/vi300-old
 OLD_FILES+=usr/share/terminfo/v/vi50
 OLD_FILES+=usr/share/terminfo/v/vi500
 OLD_FILES+=usr/share/terminfo/v/vi50adm
 OLD_FILES+=usr/share/terminfo/v/vi55
 OLD_FILES+=usr/share/terminfo/v/vi550
 OLD_FILES+=usr/share/terminfo/v/vi603
 OLD_FILES+=usr/share/terminfo/v/viewdata
 OLD_FILES+=usr/share/terminfo/v/viewdata-o
 OLD_FILES+=usr/share/terminfo/v/viewdata-rv
 OLD_FILES+=usr/share/terminfo/v/viewpoint
 OLD_FILES+=usr/share/terminfo/v/viewpoint3a+
 OLD_FILES+=usr/share/terminfo/v/viewpoint60
 OLD_FILES+=usr/share/terminfo/v/viewpoint90
 OLD_FILES+=usr/share/terminfo/v/vip
 OLD_FILES+=usr/share/terminfo/v/vip-H
 OLD_FILES+=usr/share/terminfo/v/vip-Hw
 OLD_FILES+=usr/share/terminfo/v/vip-w
 OLD_FILES+=usr/share/terminfo/v/vip7800-H
 OLD_FILES+=usr/share/terminfo/v/vip7800-Hw
 OLD_FILES+=usr/share/terminfo/v/vip7800-w
 OLD_FILES+=usr/share/terminfo/v/visa50
 OLD_FILES+=usr/share/terminfo/v/visual603
 OLD_FILES+=usr/share/terminfo/v/vitty
 OLD_FILES+=usr/share/terminfo/v/vk100
 OLD_FILES+=usr/share/terminfo/v/vp3a+
 OLD_FILES+=usr/share/terminfo/v/vp60
 OLD_FILES+=usr/share/terminfo/v/vp90
 OLD_FILES+=usr/share/terminfo/v/vremote
 OLD_FILES+=usr/share/terminfo/v/vs100
 OLD_FILES+=usr/share/terminfo/v/vs100-x10
 OLD_FILES+=usr/share/terminfo/v/vsc
 OLD_FILES+=usr/share/terminfo/v/vscode
 OLD_FILES+=usr/share/terminfo/v/vscode-direct
 OLD_FILES+=usr/share/terminfo/v/vt-61
 OLD_FILES+=usr/share/terminfo/v/vt-utf8
 OLD_FILES+=usr/share/terminfo/v/vt100
 OLD_FILES+=usr/share/terminfo/v/vt100+
 OLD_FILES+=usr/share/terminfo/v/vt100+4bsd
 OLD_FILES+=usr/share/terminfo/v/vt100+enq
 OLD_FILES+=usr/share/terminfo/v/vt100+fnkeys
 OLD_FILES+=usr/share/terminfo/v/vt100+keypad
 OLD_FILES+=usr/share/terminfo/v/vt100+pfkeys
 OLD_FILES+=usr/share/terminfo/v/vt100-am
 OLD_FILES+=usr/share/terminfo/v/vt100-bm
 OLD_FILES+=usr/share/terminfo/v/vt100-bm-o
 OLD_FILES+=usr/share/terminfo/v/vt100-bot-s
 OLD_FILES+=usr/share/terminfo/v/vt100-nam
 OLD_FILES+=usr/share/terminfo/v/vt100-nam-w
 OLD_FILES+=usr/share/terminfo/v/vt100-nav
 OLD_FILES+=usr/share/terminfo/v/vt100-nav-w
 OLD_FILES+=usr/share/terminfo/v/vt100-putty
 OLD_FILES+=usr/share/terminfo/v/vt100-s
 OLD_FILES+=usr/share/terminfo/v/vt100-s-bot
 OLD_FILES+=usr/share/terminfo/v/vt100-s-top
 OLD_FILES+=usr/share/terminfo/v/vt100-top-s
 OLD_FILES+=usr/share/terminfo/v/vt100-vb
 OLD_FILES+=usr/share/terminfo/v/vt100-w
 OLD_FILES+=usr/share/terminfo/v/vt100-w-am
 OLD_FILES+=usr/share/terminfo/v/vt100-w-nam
 OLD_FILES+=usr/share/terminfo/v/vt100-w-nav
 OLD_FILES+=usr/share/terminfo/v/vt100nam
 OLD_FILES+=usr/share/terminfo/v/vt102
 OLD_FILES+=usr/share/terminfo/v/vt102+enq
 OLD_FILES+=usr/share/terminfo/v/vt102-nsgr
 OLD_FILES+=usr/share/terminfo/v/vt102-w
 OLD_FILES+=usr/share/terminfo/v/vt125
 OLD_FILES+=usr/share/terminfo/v/vt131
 OLD_FILES+=usr/share/terminfo/v/vt132
 OLD_FILES+=usr/share/terminfo/v/vt200
 OLD_FILES+=usr/share/terminfo/v/vt200-8
 OLD_FILES+=usr/share/terminfo/v/vt200-8bit
 OLD_FILES+=usr/share/terminfo/v/vt200-js
 OLD_FILES+=usr/share/terminfo/v/vt200-old
 OLD_FILES+=usr/share/terminfo/v/vt200-w
 OLD_FILES+=usr/share/terminfo/v/vt220
 OLD_FILES+=usr/share/terminfo/v/vt220+cvis
 OLD_FILES+=usr/share/terminfo/v/vt220+cvis8
 OLD_FILES+=usr/share/terminfo/v/vt220+keypad
 OLD_FILES+=usr/share/terminfo/v/vt220+pcedit
 OLD_FILES+=usr/share/terminfo/v/vt220+vtedit
 OLD_FILES+=usr/share/terminfo/v/vt220-8
 OLD_FILES+=usr/share/terminfo/v/vt220-8bit
 OLD_FILES+=usr/share/terminfo/v/vt220-base
 OLD_FILES+=usr/share/terminfo/v/vt220-js
 OLD_FILES+=usr/share/terminfo/v/vt220-nam
 OLD_FILES+=usr/share/terminfo/v/vt220-old
 OLD_FILES+=usr/share/terminfo/v/vt220-w
 OLD_FILES+=usr/share/terminfo/v/vt220d
 OLD_FILES+=usr/share/terminfo/v/vt300
 OLD_FILES+=usr/share/terminfo/v/vt300-nam
 OLD_FILES+=usr/share/terminfo/v/vt300-w
 OLD_FILES+=usr/share/terminfo/v/vt300-w-nam
 OLD_FILES+=usr/share/terminfo/v/vt320
 OLD_FILES+=usr/share/terminfo/v/vt320-k3
 OLD_FILES+=usr/share/terminfo/v/vt320-k311
 OLD_FILES+=usr/share/terminfo/v/vt320-nam
 OLD_FILES+=usr/share/terminfo/v/vt320-w
 OLD_FILES+=usr/share/terminfo/v/vt320-w-nam
 OLD_FILES+=usr/share/terminfo/v/vt320nam
 OLD_FILES+=usr/share/terminfo/v/vt330
 OLD_FILES+=usr/share/terminfo/v/vt340
 OLD_FILES+=usr/share/terminfo/v/vt400
 OLD_FILES+=usr/share/terminfo/v/vt400-24
 OLD_FILES+=usr/share/terminfo/v/vt420
 OLD_FILES+=usr/share/terminfo/v/vt420+lrmm
 OLD_FILES+=usr/share/terminfo/v/vt420f
 OLD_FILES+=usr/share/terminfo/v/vt420pc
 OLD_FILES+=usr/share/terminfo/v/vt420pcdos
 OLD_FILES+=usr/share/terminfo/v/vt50
 OLD_FILES+=usr/share/terminfo/v/vt50h
 OLD_FILES+=usr/share/terminfo/v/vt510
 OLD_FILES+=usr/share/terminfo/v/vt510pc
 OLD_FILES+=usr/share/terminfo/v/vt510pcdos
 OLD_FILES+=usr/share/terminfo/v/vt52
 OLD_FILES+=usr/share/terminfo/v/vt52+keypad
 OLD_FILES+=usr/share/terminfo/v/vt52-basic
 OLD_FILES+=usr/share/terminfo/v/vt520
 OLD_FILES+=usr/share/terminfo/v/vt520ansi
 OLD_FILES+=usr/share/terminfo/v/vt525
 OLD_FILES+=usr/share/terminfo/v/vt61
 OLD_FILES+=usr/share/terminfo/v/vt61.5
 OLD_FILES+=usr/share/terminfo/v/vte
 OLD_FILES+=usr/share/terminfo/v/vte+pcfkeys
 OLD_FILES+=usr/share/terminfo/v/vte-2007
 OLD_FILES+=usr/share/terminfo/v/vte-2008
 OLD_FILES+=usr/share/terminfo/v/vte-2012
 OLD_FILES+=usr/share/terminfo/v/vte-2014
 OLD_FILES+=usr/share/terminfo/v/vte-2017
 OLD_FILES+=usr/share/terminfo/v/vte-2018
 OLD_FILES+=usr/share/terminfo/v/vte-256color
 OLD_FILES+=usr/share/terminfo/v/vte-direct
 OLD_FILES+=usr/share/terminfo/v/vtnt
 OLD_FILES+=usr/share/terminfo/v/vv100
 OLD_FILES+=usr/share/terminfo/v/vwmterm
 OLD_DIRS+=usr/share/terminfo/v/
 OLD_FILES+=usr/share/terminfo/w/wren
 OLD_FILES+=usr/share/terminfo/w/wrenw
 OLD_FILES+=usr/share/terminfo/w/wsiris
 OLD_FILES+=usr/share/terminfo/w/wsvt25
 OLD_FILES+=usr/share/terminfo/w/wsvt25m
 OLD_FILES+=usr/share/terminfo/w/wy-75ap
 OLD_FILES+=usr/share/terminfo/w/wy-99fgt
 OLD_FILES+=usr/share/terminfo/w/wy-99fgta
 OLD_FILES+=usr/share/terminfo/w/wy100
 OLD_FILES+=usr/share/terminfo/w/wy100q
 OLD_FILES+=usr/share/terminfo/w/wy120
 OLD_FILES+=usr/share/terminfo/w/wy120-25
 OLD_FILES+=usr/share/terminfo/w/wy120-25-w
 OLD_FILES+=usr/share/terminfo/w/wy120-vb
 OLD_FILES+=usr/share/terminfo/w/wy120-w
 OLD_FILES+=usr/share/terminfo/w/wy120-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy120-wvb
 OLD_FILES+=usr/share/terminfo/w/wy150
 OLD_FILES+=usr/share/terminfo/w/wy150-25
 OLD_FILES+=usr/share/terminfo/w/wy150-25-w
 OLD_FILES+=usr/share/terminfo/w/wy150-vb
 OLD_FILES+=usr/share/terminfo/w/wy150-w
 OLD_FILES+=usr/share/terminfo/w/wy150-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy160
 OLD_FILES+=usr/share/terminfo/w/wy160-25
 OLD_FILES+=usr/share/terminfo/w/wy160-25-w
 OLD_FILES+=usr/share/terminfo/w/wy160-42
 OLD_FILES+=usr/share/terminfo/w/wy160-42-w
 OLD_FILES+=usr/share/terminfo/w/wy160-43
 OLD_FILES+=usr/share/terminfo/w/wy160-43-w
 OLD_FILES+=usr/share/terminfo/w/wy160-tek
 OLD_FILES+=usr/share/terminfo/w/wy160-vb
 OLD_FILES+=usr/share/terminfo/w/wy160-w
 OLD_FILES+=usr/share/terminfo/w/wy160-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy160-wvb
 OLD_FILES+=usr/share/terminfo/w/wy185
 OLD_FILES+=usr/share/terminfo/w/wy185-24
 OLD_FILES+=usr/share/terminfo/w/wy185-vb
 OLD_FILES+=usr/share/terminfo/w/wy185-w
 OLD_FILES+=usr/share/terminfo/w/wy185-wvb
 OLD_FILES+=usr/share/terminfo/w/wy30
 OLD_FILES+=usr/share/terminfo/w/wy30-mc
 OLD_FILES+=usr/share/terminfo/w/wy30-vb
 OLD_FILES+=usr/share/terminfo/w/wy325
 OLD_FILES+=usr/share/terminfo/w/wy325-25
 OLD_FILES+=usr/share/terminfo/w/wy325-25w
 OLD_FILES+=usr/share/terminfo/w/wy325-42
 OLD_FILES+=usr/share/terminfo/w/wy325-42w
 OLD_FILES+=usr/share/terminfo/w/wy325-42w-vb
 OLD_FILES+=usr/share/terminfo/w/wy325-42wvb
 OLD_FILES+=usr/share/terminfo/w/wy325-43
 OLD_FILES+=usr/share/terminfo/w/wy325-43w
 OLD_FILES+=usr/share/terminfo/w/wy325-43w-vb
 OLD_FILES+=usr/share/terminfo/w/wy325-43wvb
 OLD_FILES+=usr/share/terminfo/w/wy325-80
 OLD_FILES+=usr/share/terminfo/w/wy325-vb
 OLD_FILES+=usr/share/terminfo/w/wy325-w
 OLD_FILES+=usr/share/terminfo/w/wy325-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy325-wvb
 OLD_FILES+=usr/share/terminfo/w/wy325w-24
 OLD_FILES+=usr/share/terminfo/w/wy350
 OLD_FILES+=usr/share/terminfo/w/wy350-vb
 OLD_FILES+=usr/share/terminfo/w/wy350-w
 OLD_FILES+=usr/share/terminfo/w/wy350-wvb
 OLD_FILES+=usr/share/terminfo/w/wy370
 OLD_FILES+=usr/share/terminfo/w/wy370-101k
 OLD_FILES+=usr/share/terminfo/w/wy370-105k
 OLD_FILES+=usr/share/terminfo/w/wy370-EPC
 OLD_FILES+=usr/share/terminfo/w/wy370-nk
 OLD_FILES+=usr/share/terminfo/w/wy370-rv
 OLD_FILES+=usr/share/terminfo/w/wy370-tek
 OLD_FILES+=usr/share/terminfo/w/wy370-vb
 OLD_FILES+=usr/share/terminfo/w/wy370-w
 OLD_FILES+=usr/share/terminfo/w/wy370-wvb
 OLD_FILES+=usr/share/terminfo/w/wy50
 OLD_FILES+=usr/share/terminfo/w/wy50-mc
 OLD_FILES+=usr/share/terminfo/w/wy50-vb
 OLD_FILES+=usr/share/terminfo/w/wy50-w
 OLD_FILES+=usr/share/terminfo/w/wy50-wvb
 OLD_FILES+=usr/share/terminfo/w/wy520
 OLD_FILES+=usr/share/terminfo/w/wy520-24
 OLD_FILES+=usr/share/terminfo/w/wy520-36
 OLD_FILES+=usr/share/terminfo/w/wy520-36pc
 OLD_FILES+=usr/share/terminfo/w/wy520-36w
 OLD_FILES+=usr/share/terminfo/w/wy520-36wpc
 OLD_FILES+=usr/share/terminfo/w/wy520-48
 OLD_FILES+=usr/share/terminfo/w/wy520-48pc
 OLD_FILES+=usr/share/terminfo/w/wy520-48w
 OLD_FILES+=usr/share/terminfo/w/wy520-48wpc
 OLD_FILES+=usr/share/terminfo/w/wy520-epc
 OLD_FILES+=usr/share/terminfo/w/wy520-epc-24
 OLD_FILES+=usr/share/terminfo/w/wy520-epc-vb
 OLD_FILES+=usr/share/terminfo/w/wy520-epc-w
 OLD_FILES+=usr/share/terminfo/w/wy520-epc-wvb
 OLD_FILES+=usr/share/terminfo/w/wy520-vb
 OLD_FILES+=usr/share/terminfo/w/wy520-w
 OLD_FILES+=usr/share/terminfo/w/wy520-wvb
 OLD_FILES+=usr/share/terminfo/w/wy60
 OLD_FILES+=usr/share/terminfo/w/wy60-25
 OLD_FILES+=usr/share/terminfo/w/wy60-25-w
 OLD_FILES+=usr/share/terminfo/w/wy60-316X
 OLD_FILES+=usr/share/terminfo/w/wy60-42
 OLD_FILES+=usr/share/terminfo/w/wy60-42-w
 OLD_FILES+=usr/share/terminfo/w/wy60-43
 OLD_FILES+=usr/share/terminfo/w/wy60-43-w
 OLD_FILES+=usr/share/terminfo/w/wy60-AT
 OLD_FILES+=usr/share/terminfo/w/wy60-PC
 OLD_FILES+=usr/share/terminfo/w/wy60-vb
 OLD_FILES+=usr/share/terminfo/w/wy60-w
 OLD_FILES+=usr/share/terminfo/w/wy60-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy60-wvb
 OLD_FILES+=usr/share/terminfo/w/wy75
 OLD_FILES+=usr/share/terminfo/w/wy75-mc
 OLD_FILES+=usr/share/terminfo/w/wy75-vb
 OLD_FILES+=usr/share/terminfo/w/wy75-w
 OLD_FILES+=usr/share/terminfo/w/wy75-wvb
 OLD_FILES+=usr/share/terminfo/w/wy75ap
 OLD_FILES+=usr/share/terminfo/w/wy85
 OLD_FILES+=usr/share/terminfo/w/wy85-8bit
 OLD_FILES+=usr/share/terminfo/w/wy85-vb
 OLD_FILES+=usr/share/terminfo/w/wy85-w
 OLD_FILES+=usr/share/terminfo/w/wy85-wvb
 OLD_FILES+=usr/share/terminfo/w/wy99-ansi
 OLD_FILES+=usr/share/terminfo/w/wy99a-ansi
 OLD_FILES+=usr/share/terminfo/w/wy99f
 OLD_FILES+=usr/share/terminfo/w/wy99fa
 OLD_FILES+=usr/share/terminfo/w/wy99fgt
 OLD_FILES+=usr/share/terminfo/w/wy99fgta
 OLD_FILES+=usr/share/terminfo/w/wy99gt
 OLD_FILES+=usr/share/terminfo/w/wy99gt-25
 OLD_FILES+=usr/share/terminfo/w/wy99gt-25-w
 OLD_FILES+=usr/share/terminfo/w/wy99gt-tek
 OLD_FILES+=usr/share/terminfo/w/wy99gt-vb
 OLD_FILES+=usr/share/terminfo/w/wy99gt-w
 OLD_FILES+=usr/share/terminfo/w/wy99gt-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy99gt-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse-325
 OLD_FILES+=usr/share/terminfo/w/wyse-75ap
 OLD_FILES+=usr/share/terminfo/w/wyse-vp
 OLD_FILES+=usr/share/terminfo/w/wyse120
 OLD_FILES+=usr/share/terminfo/w/wyse120-25
 OLD_FILES+=usr/share/terminfo/w/wyse120-25-w
 OLD_FILES+=usr/share/terminfo/w/wyse120-vb
 OLD_FILES+=usr/share/terminfo/w/wyse120-w
 OLD_FILES+=usr/share/terminfo/w/wyse120-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse150
 OLD_FILES+=usr/share/terminfo/w/wyse150-25
 OLD_FILES+=usr/share/terminfo/w/wyse150-25-w
 OLD_FILES+=usr/share/terminfo/w/wyse150-vb
 OLD_FILES+=usr/share/terminfo/w/wyse150-w
 OLD_FILES+=usr/share/terminfo/w/wyse150-w-vb
 OLD_FILES+=usr/share/terminfo/w/wyse160
 OLD_FILES+=usr/share/terminfo/w/wyse160-25
 OLD_FILES+=usr/share/terminfo/w/wyse160-25-w
 OLD_FILES+=usr/share/terminfo/w/wyse160-42
 OLD_FILES+=usr/share/terminfo/w/wyse160-42-w
 OLD_FILES+=usr/share/terminfo/w/wyse160-43
 OLD_FILES+=usr/share/terminfo/w/wyse160-43-w
 OLD_FILES+=usr/share/terminfo/w/wyse160-vb
 OLD_FILES+=usr/share/terminfo/w/wyse160-w
 OLD_FILES+=usr/share/terminfo/w/wyse160-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse185
 OLD_FILES+=usr/share/terminfo/w/wyse185-24
 OLD_FILES+=usr/share/terminfo/w/wyse185-vb
 OLD_FILES+=usr/share/terminfo/w/wyse185-w
 OLD_FILES+=usr/share/terminfo/w/wyse185-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse30
 OLD_FILES+=usr/share/terminfo/w/wyse30-mc
 OLD_FILES+=usr/share/terminfo/w/wyse30-vb
 OLD_FILES+=usr/share/terminfo/w/wyse325
 OLD_FILES+=usr/share/terminfo/w/wyse325-25
 OLD_FILES+=usr/share/terminfo/w/wyse325-25w
 OLD_FILES+=usr/share/terminfo/w/wyse325-42
 OLD_FILES+=usr/share/terminfo/w/wyse325-42w
 OLD_FILES+=usr/share/terminfo/w/wyse325-43
 OLD_FILES+=usr/share/terminfo/w/wyse325-43w
 OLD_FILES+=usr/share/terminfo/w/wyse325-vb
 OLD_FILES+=usr/share/terminfo/w/wyse325-w
 OLD_FILES+=usr/share/terminfo/w/wyse325-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse350
 OLD_FILES+=usr/share/terminfo/w/wyse350-vb
 OLD_FILES+=usr/share/terminfo/w/wyse350-w
 OLD_FILES+=usr/share/terminfo/w/wyse350-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse370
 OLD_FILES+=usr/share/terminfo/w/wyse50
 OLD_FILES+=usr/share/terminfo/w/wyse50-mc
 OLD_FILES+=usr/share/terminfo/w/wyse50-vb
 OLD_FILES+=usr/share/terminfo/w/wyse50-w
 OLD_FILES+=usr/share/terminfo/w/wyse50-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse520
 OLD_FILES+=usr/share/terminfo/w/wyse520-24
 OLD_FILES+=usr/share/terminfo/w/wyse520-36
 OLD_FILES+=usr/share/terminfo/w/wyse520-36pc
 OLD_FILES+=usr/share/terminfo/w/wyse520-36w
 OLD_FILES+=usr/share/terminfo/w/wyse520-36wpc
 OLD_FILES+=usr/share/terminfo/w/wyse520-48
 OLD_FILES+=usr/share/terminfo/w/wyse520-48pc
 OLD_FILES+=usr/share/terminfo/w/wyse520-48w
 OLD_FILES+=usr/share/terminfo/w/wyse520-48wpc
 OLD_FILES+=usr/share/terminfo/w/wyse520-epc
 OLD_FILES+=usr/share/terminfo/w/wyse520-epc-w
 OLD_FILES+=usr/share/terminfo/w/wyse520-p-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse520-pc-24
 OLD_FILES+=usr/share/terminfo/w/wyse520-pc-vb
 OLD_FILES+=usr/share/terminfo/w/wyse520-vb
 OLD_FILES+=usr/share/terminfo/w/wyse520-w
 OLD_FILES+=usr/share/terminfo/w/wyse520-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse60
 OLD_FILES+=usr/share/terminfo/w/wyse60-25
 OLD_FILES+=usr/share/terminfo/w/wyse60-25-w
 OLD_FILES+=usr/share/terminfo/w/wyse60-316X
 OLD_FILES+=usr/share/terminfo/w/wyse60-42
 OLD_FILES+=usr/share/terminfo/w/wyse60-42-w
 OLD_FILES+=usr/share/terminfo/w/wyse60-43
 OLD_FILES+=usr/share/terminfo/w/wyse60-43-w
 OLD_FILES+=usr/share/terminfo/w/wyse60-AT
 OLD_FILES+=usr/share/terminfo/w/wyse60-PC
 OLD_FILES+=usr/share/terminfo/w/wyse60-vb
 OLD_FILES+=usr/share/terminfo/w/wyse60-w
 OLD_FILES+=usr/share/terminfo/w/wyse60-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse75
 OLD_FILES+=usr/share/terminfo/w/wyse75-mc
 OLD_FILES+=usr/share/terminfo/w/wyse75-vb
 OLD_FILES+=usr/share/terminfo/w/wyse75-w
 OLD_FILES+=usr/share/terminfo/w/wyse75-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse75ap
 OLD_FILES+=usr/share/terminfo/w/wyse85
 OLD_FILES+=usr/share/terminfo/w/wyse85-8bit
 OLD_FILES+=usr/share/terminfo/w/wyse85-vb
 OLD_FILES+=usr/share/terminfo/w/wyse85-w
 OLD_FILES+=usr/share/terminfo/w/wyse85-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse99gt
 OLD_FILES+=usr/share/terminfo/w/wyse99gt-25
 OLD_FILES+=usr/share/terminfo/w/wyse99gt-25-w
 OLD_FILES+=usr/share/terminfo/w/wyse99gt-vb
 OLD_FILES+=usr/share/terminfo/w/wyse99gt-w
 OLD_FILES+=usr/share/terminfo/w/wyse99gt-wvb
 OLD_DIRS+=usr/share/terminfo/w/
 OLD_FILES+=usr/share/terminfo/x/x10term
 OLD_FILES+=usr/share/terminfo/x/x1700
 OLD_FILES+=usr/share/terminfo/x/x1700-lm
 OLD_FILES+=usr/share/terminfo/x/x1720
 OLD_FILES+=usr/share/terminfo/x/x1750
 OLD_FILES+=usr/share/terminfo/x/x68k
 OLD_FILES+=usr/share/terminfo/x/x68k-ite
 OLD_FILES+=usr/share/terminfo/x/x820
 OLD_FILES+=usr/share/terminfo/x/xdku
 OLD_FILES+=usr/share/terminfo/x/xenix
 OLD_FILES+=usr/share/terminfo/x/xerox
 OLD_FILES+=usr/share/terminfo/x/xerox-lm
 OLD_FILES+=usr/share/terminfo/x/xerox1720
 OLD_FILES+=usr/share/terminfo/x/xerox820
 OLD_FILES+=usr/share/terminfo/x/xfce
 OLD_FILES+=usr/share/terminfo/x/xiterm
 OLD_FILES+=usr/share/terminfo/x/xl83
 OLD_FILES+=usr/share/terminfo/x/xnuppc
 OLD_FILES+=usr/share/terminfo/x/xnuppc+100x37
 OLD_FILES+=usr/share/terminfo/x/xnuppc+112x37
 OLD_FILES+=usr/share/terminfo/x/xnuppc+128x40
 OLD_FILES+=usr/share/terminfo/x/xnuppc+128x48
 OLD_FILES+=usr/share/terminfo/x/xnuppc+144x48
 OLD_FILES+=usr/share/terminfo/x/xnuppc+160x64
 OLD_FILES+=usr/share/terminfo/x/xnuppc+200x64
 OLD_FILES+=usr/share/terminfo/x/xnuppc+200x75
 OLD_FILES+=usr/share/terminfo/x/xnuppc+256x96
 OLD_FILES+=usr/share/terminfo/x/xnuppc+80x25
 OLD_FILES+=usr/share/terminfo/x/xnuppc+80x30
 OLD_FILES+=usr/share/terminfo/x/xnuppc+90x30
 OLD_FILES+=usr/share/terminfo/x/xnuppc+b
 OLD_FILES+=usr/share/terminfo/x/xnuppc+basic
 OLD_FILES+=usr/share/terminfo/x/xnuppc+c
 OLD_FILES+=usr/share/terminfo/x/xnuppc+f
 OLD_FILES+=usr/share/terminfo/x/xnuppc+f2
 OLD_FILES+=usr/share/terminfo/x/xnuppc-100x37
 OLD_FILES+=usr/share/terminfo/x/xnuppc-100x37-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-112x37
 OLD_FILES+=usr/share/terminfo/x/xnuppc-112x37-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-128x40
 OLD_FILES+=usr/share/terminfo/x/xnuppc-128x40-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-128x48
 OLD_FILES+=usr/share/terminfo/x/xnuppc-128x48-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-144x48
 OLD_FILES+=usr/share/terminfo/x/xnuppc-144x48-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-160x64
 OLD_FILES+=usr/share/terminfo/x/xnuppc-160x64-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-200x64
 OLD_FILES+=usr/share/terminfo/x/xnuppc-200x64-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-200x75
 OLD_FILES+=usr/share/terminfo/x/xnuppc-200x75-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-256x96
 OLD_FILES+=usr/share/terminfo/x/xnuppc-256x96-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-80x25
 OLD_FILES+=usr/share/terminfo/x/xnuppc-80x25-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-80x30
 OLD_FILES+=usr/share/terminfo/x/xnuppc-80x30-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-90x30
 OLD_FILES+=usr/share/terminfo/x/xnuppc-90x30-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-b
 OLD_FILES+=usr/share/terminfo/x/xnuppc-f
 OLD_FILES+=usr/share/terminfo/x/xnuppc-f2
 OLD_FILES+=usr/share/terminfo/x/xnuppc-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-m-b
 OLD_FILES+=usr/share/terminfo/x/xnuppc-m-f
 OLD_FILES+=usr/share/terminfo/x/xnuppc-m-f2
 OLD_FILES+=usr/share/terminfo/x/xtalk
 OLD_FILES+=usr/share/terminfo/x/xterm
 OLD_FILES+=usr/share/terminfo/x/xterm+256color
 OLD_FILES+=usr/share/terminfo/x/xterm+256color2
 OLD_FILES+=usr/share/terminfo/x/xterm+256setaf
 OLD_FILES+=usr/share/terminfo/x/xterm+88color
 OLD_FILES+=usr/share/terminfo/x/xterm+88color2
 OLD_FILES+=usr/share/terminfo/x/xterm+alt+title
 OLD_FILES+=usr/share/terminfo/x/xterm+alt1049
 OLD_FILES+=usr/share/terminfo/x/xterm+app
 OLD_FILES+=usr/share/terminfo/x/xterm+direct
 OLD_FILES+=usr/share/terminfo/x/xterm+direct16
 OLD_FILES+=usr/share/terminfo/x/xterm+direct2
 OLD_FILES+=usr/share/terminfo/x/xterm+direct256
 OLD_FILES+=usr/share/terminfo/x/xterm+edit
 OLD_FILES+=usr/share/terminfo/x/xterm+indirect
 OLD_FILES+=usr/share/terminfo/x/xterm+kbs
 OLD_FILES+=usr/share/terminfo/x/xterm+keypad
 OLD_FILES+=usr/share/terminfo/x/xterm+meta
 OLD_FILES+=usr/share/terminfo/x/xterm+noalt
 OLD_FILES+=usr/share/terminfo/x/xterm+noapp
 OLD_FILES+=usr/share/terminfo/x/xterm+nofkeys
 OLD_FILES+=usr/share/terminfo/x/xterm+osc104
 OLD_FILES+=usr/share/terminfo/x/xterm+pc+edit
 OLD_FILES+=usr/share/terminfo/x/xterm+pcc0
 OLD_FILES+=usr/share/terminfo/x/xterm+pcc1
 OLD_FILES+=usr/share/terminfo/x/xterm+pcc2
 OLD_FILES+=usr/share/terminfo/x/xterm+pcc3
 OLD_FILES+=usr/share/terminfo/x/xterm+pce2
 OLD_FILES+=usr/share/terminfo/x/xterm+pcf0
 OLD_FILES+=usr/share/terminfo/x/xterm+pcf2
 OLD_FILES+=usr/share/terminfo/x/xterm+pcfkeys
 OLD_FILES+=usr/share/terminfo/x/xterm+r6f2
 OLD_FILES+=usr/share/terminfo/x/xterm+sl
 OLD_FILES+=usr/share/terminfo/x/xterm+sl-twm
 OLD_FILES+=usr/share/terminfo/x/xterm+sm+1002
 OLD_FILES+=usr/share/terminfo/x/xterm+sm+1003
 OLD_FILES+=usr/share/terminfo/x/xterm+sm+1005
 OLD_FILES+=usr/share/terminfo/x/xterm+sm+1006
 OLD_FILES+=usr/share/terminfo/x/xterm+titlestack
 OLD_FILES+=usr/share/terminfo/x/xterm+tmux
 OLD_FILES+=usr/share/terminfo/x/xterm+vt+edit
 OLD_FILES+=usr/share/terminfo/x/xterm+x10mouse
 OLD_FILES+=usr/share/terminfo/x/xterm+x11hilite
 OLD_FILES+=usr/share/terminfo/x/xterm+x11mouse
 OLD_FILES+=usr/share/terminfo/x/xterm-1002
 OLD_FILES+=usr/share/terminfo/x/xterm-1003
 OLD_FILES+=usr/share/terminfo/x/xterm-1005
 OLD_FILES+=usr/share/terminfo/x/xterm-1006
 OLD_FILES+=usr/share/terminfo/x/xterm-16color
 OLD_FILES+=usr/share/terminfo/x/xterm-24
 OLD_FILES+=usr/share/terminfo/x/xterm-256color
 OLD_FILES+=usr/share/terminfo/x/xterm-88color
 OLD_FILES+=usr/share/terminfo/x/xterm-8bit
 OLD_FILES+=usr/share/terminfo/x/xterm-basic
 OLD_FILES+=usr/share/terminfo/x/xterm-bold
 OLD_FILES+=usr/share/terminfo/x/xterm-color
 OLD_FILES+=usr/share/terminfo/x/xterm-direct
 OLD_FILES+=usr/share/terminfo/x/xterm-direct16
 OLD_FILES+=usr/share/terminfo/x/xterm-direct2
 OLD_FILES+=usr/share/terminfo/x/xterm-direct256
 OLD_FILES+=usr/share/terminfo/x/xterm-hp
 OLD_FILES+=usr/share/terminfo/x/xterm-mono
 OLD_FILES+=usr/share/terminfo/x/xterm-new
 OLD_FILES+=usr/share/terminfo/x/xterm-nic
 OLD_FILES+=usr/share/terminfo/x/xterm-noapp
 OLD_FILES+=usr/share/terminfo/x/xterm-old
 OLD_FILES+=usr/share/terminfo/x/xterm-pcolor
 OLD_FILES+=usr/share/terminfo/x/xterm-r5
 OLD_FILES+=usr/share/terminfo/x/xterm-r6
 OLD_FILES+=usr/share/terminfo/x/xterm-sco
 OLD_FILES+=usr/share/terminfo/x/xterm-sun
 OLD_FILES+=usr/share/terminfo/x/xterm-utf8
 OLD_FILES+=usr/share/terminfo/x/xterm-vt220
 OLD_FILES+=usr/share/terminfo/x/xterm-vt52
 OLD_FILES+=usr/share/terminfo/x/xterm-x10mouse
 OLD_FILES+=usr/share/terminfo/x/xterm-x11hilite
 OLD_FILES+=usr/share/terminfo/x/xterm-x11mouse
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v32
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v33
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v333
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v40
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v43
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v44
 OLD_FILES+=usr/share/terminfo/x/xterm-xfree86
 OLD_FILES+=usr/share/terminfo/x/xterm-xi
 OLD_FILES+=usr/share/terminfo/x/xterm.js
 OLD_FILES+=usr/share/terminfo/x/xterm1
 OLD_FILES+=usr/share/terminfo/x/xtermc
 OLD_FILES+=usr/share/terminfo/x/xtermm
 OLD_FILES+=usr/share/terminfo/x/xterms
 OLD_FILES+=usr/share/terminfo/x/xterms-sun
 OLD_FILES+=usr/share/terminfo/x/xwsh
 OLD_DIRS+=usr/share/terminfo/x/
 OLD_FILES+=usr/share/terminfo/z/z-100
 OLD_FILES+=usr/share/terminfo/z/z-100bw
 OLD_FILES+=usr/share/terminfo/z/z100
 OLD_FILES+=usr/share/terminfo/z/z100bw
 OLD_FILES+=usr/share/terminfo/z/z110
 OLD_FILES+=usr/share/terminfo/z/z110bw
 OLD_FILES+=usr/share/terminfo/z/z19
 OLD_FILES+=usr/share/terminfo/z/z29
 OLD_FILES+=usr/share/terminfo/z/z29a
 OLD_FILES+=usr/share/terminfo/z/z29a-kc-bc
 OLD_FILES+=usr/share/terminfo/z/z29a-kc-uc
 OLD_FILES+=usr/share/terminfo/z/z29a-nkc-bc
 OLD_FILES+=usr/share/terminfo/z/z29a-nkc-uc
 OLD_FILES+=usr/share/terminfo/z/z29b
 OLD_FILES+=usr/share/terminfo/z/z30
 OLD_FILES+=usr/share/terminfo/z/z340
 OLD_FILES+=usr/share/terminfo/z/z340-nam
 OLD_FILES+=usr/share/terminfo/z/z39-a
 OLD_FILES+=usr/share/terminfo/z/z39a
 OLD_FILES+=usr/share/terminfo/z/z50
 OLD_FILES+=usr/share/terminfo/z/z8001
 OLD_FILES+=usr/share/terminfo/z/zen30
 OLD_FILES+=usr/share/terminfo/z/zen50
 OLD_FILES+=usr/share/terminfo/z/zen8001
 OLD_FILES+=usr/share/terminfo/z/zenith
 OLD_FILES+=usr/share/terminfo/z/zenith29
 OLD_FILES+=usr/share/terminfo/z/zenith39-a
 OLD_FILES+=usr/share/terminfo/z/zenith39-ansi
 OLD_FILES+=usr/share/terminfo/z/zt-1
 OLD_FILES+=usr/share/terminfo/z/ztx
 OLD_FILES+=usr/share/terminfo/z/ztx-1-a
 OLD_FILES+=usr/share/terminfo/z/ztx11
 OLD_DIRS+=usr/share/terminfo/z/
 OLD_DIRS+=usr/share/terminfo/
 
 # 20210316: remove obsolete NFS headers
 OLD_FILES+=usr/include/nfs/nfs_common.h
 OLD_FILES+=usr/include/nfsclient/nfsm_subs.h
 OLD_FILES+=usr/include/nfsclient/nlminfo.h
 OLD_FILES+=usr/include/nfsserver/nfs_fha_old.h
 OLD_FILES+=usr/include/nfsserver/nfsm_subs.h
 OLD_FILES+=usr/include/nfsserver/nfsrvcache.h
 
 # 20210315: Remove kernel-only crypto headers from /usr/include
 OLD_FILES+=usr/include/crypto/_cryptodev.h
 OLD_FILES+=usr/include/crypto/cbc_mac.h
 OLD_FILES+=usr/include/crypto/deflate.h
 OLD_FILES+=usr/include/crypto/gfmult.h
 OLD_FILES+=usr/include/crypto/gmac.h
 OLD_FILES+=usr/include/crypto/rijndael.h
 OLD_FILES+=usr/include/crypto/rmd160.h
 OLD_FILES+=usr/include/crypto/xform.h
 OLD_FILES+=usr/include/crypto/xform_auth.h
 OLD_FILES+=usr/include/crypto/xform_comp.h
 OLD_FILES+=usr/include/crypto/xform_enc.h
 
 # 20210305: removed Poly1305_* symbols
 OLD_FILES+=usr/include/crypto/xform_poly1305.h
 
 # 20210302: fmtree removed
 OLD_FILES+=usr/sbin/fmtree
 OLD_FILES+=usr/share/man/man8/fmtree.8.gz
 
 # 20210201: bump shared libraries which link against ncurses
 OLD_LIBS+=lib/libedit.so.7
 OLD_LIBS+=usr/lib/libdialog.so.8
 OLD_LIBS+=usr/lib/libdpv.so.1
 OLD_LIBS+=usr/lib/libform.so.5
 OLD_LIBS+=usr/lib/libformw.so.5
 OLD_LIBS+=usr/lib/libmenu.so.5
 OLD_LIBS+=usr/lib/libmenuw.so.5
 OLD_LIBS+=usr/lib/libpanel.so.5
 OLD_LIBS+=usr/lib/libpanelw.so.5
 
 # 20210125: ndis driver support removed
 OLD_FILES+=usr/sbin/ndis_events
 OLD_FILES+=usr/sbin/ndiscvt
 OLD_FILES+=usr/sbin/ndisgen
 OLD_FILES+=usr/share/man/man4/ndis.4.gz
 OLD_FILES+=usr/share/man/man4/if_ndis.4.gz
 OLD_FILES+=usr/share/man/man8/ndis_events.8.gz
 OLD_FILES+=usr/share/man/man8/ndiscvt.8.gz
 OLD_FILES+=usr/share/man/man8/ndisgen.8.gz
 OLD_FILES+=usr/share/misc/windrv_stub.c
 
 # 20210116: openpromio(4) removed
 OLD_FILES+=usr/include/dev/ofw/openpromio.h
 
 # 20210116: if_wl_wavelan.h removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/if_wl_wavelan.h
 .endif
 
 # 20210108: retire cmx, ng_bt3c, wi drivers
 OLD_FILES+=usr/include/dev/wi/if_wireg.h
 OLD_FILES+=usr/include/dev/wi/if_wavelan_ieee.h
 OLD_FILES+=usr/include/dev/wi/if_wivar.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_bt3c.h
 OLD_FILES+=usr/sbin/bt3cfw
 OLD_FILES+=usr/share/man/man4/cmw.4.gz
 OLD_FILES+=usr/share/man/man4/if_wi.4.gz
 OLD_FILES+=usr/share/man/man4/ng_bt3c.4.gz
 OLD_FILES+=usr/share/man/man4/wi.4.gz
 OLD_FILES+=usr/share/man/man8/bt3cfw.8.gz
 
 # 20210107: retire a.out support
 OLD_DIRS+=usr/lib/aout
 OLD_DIRS+=usr/lib/compat/aout
 
 # 20210107: remove cmx(4)
 OLD_FILES+=usr/share/man/man4/cmx.4.gz
 
 # 20210105: remove non widechar version of ncurses
 OLD_LIBS+=lib/libncurses.so.9
 
 # 20210103: new clang import which bumps version from 11.0.0 to 11.0.1
 OLD_FILES+=usr/lib/clang/11.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/11.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/11.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/11.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/11.0.0/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/11.0.0/include/fuzzer
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/11.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/11.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/11.0.0/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/11.0.0/include/profile
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/11.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/11.0.0/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/11.0.0/include/xray
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/cet.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/11.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/11.0.0/include
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/11.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/11.0.0/lib
 OLD_DIRS+=usr/lib/clang/11.0.0
 
 # 20201226: Siemens SAB 82532 support removed
 OLD_FILES+=usr/include/dev/ic/sab82532.h
 
 # 20201225: PMC for Xscale removed
 OLD_FILES+=usr/include/dev/hwpmc/hwpmc_xscale.h
 OLD_FILES+=usr/share/man/man3/pmc.xscale.3.gz
 
 # 20201225: libregex removed
 OLD_FILES+=usr/include/gnu/posix/regex.h
 OLD_DIRS+=usr/include/gnu/posix
 OLD_FILES+=usr/include/gnu/regex.h
 OLD_DIRS+=usr/include/gnu
 OLD_FILES+=usr/include/gnuregex.h
 OLD_FILES+=usr/lib/libgnuregex.a
 OLD_FILES+=usr/lib/libgnuregex.so
 OLD_LIBS+=usr/lib/libgnuregex.so.5
 OLD_FILES+=usr/lib/libgnuregex_p.a
 
 # 20201225: gnugrep removed
 OLD_FILES+=usr/bin/bsdgrep
 OLD_FILES+=usr/bin/gnugrep
 OLD_FILES+=usr/share/man/man1/bsdgrep.1.gz
 OLD_FILES+=usr/share/man/man1/gnugrep.1.gz
 
 # 20201224: mk48txx(4) removed
 OLD_FILES+=usr/share/man/man4/mk48txx.4.gz
 
 # 20201215: in-tree gdb removed
 OLD_FILES+=usr/libexec/gdb
 OLD_FILES+=usr/libexec/kgdb
 
 # 20201211: hme(4) removed
 OLD_FILES+=usr/share/man/man4/hme.4.gz
 OLD_FILES+=usr/share/man/man4/if_hme.4.gz
 
 # 20201129: RADIX_MPATH removed
 OLD_FILES+=usr/include/net/radix_mpath.h
 
 # 20201124: ping6(8) was merged into ping(8)
 OLD_FILES+=usr/tests/sbin/ping6/Kyuafile
 OLD_FILES+=usr/tests/sbin/ping6/ping6_c1_s8_t1.out
 OLD_FILES+=usr/tests/sbin/ping6/ping6_test
 OLD_DIRS+=usr/tests/sbin/ping6
 
 # 20201025: Remove cal data files
 OLD_FILES+=usr/share/calendar/calendar.all
 OLD_FILES+=usr/share/calendar/calendar.australia
 OLD_FILES+=usr/share/calendar/calendar.birthday
 OLD_FILES+=usr/share/calendar/calendar.brazilian
 OLD_FILES+=usr/share/calendar/calendar.christian
 OLD_FILES+=usr/share/calendar/calendar.computer
 OLD_FILES+=usr/share/calendar/calendar.croatian
 OLD_FILES+=usr/share/calendar/calendar.dutch
 OLD_FILES+=usr/share/calendar/calendar.french
 OLD_FILES+=usr/share/calendar/calendar.german
 OLD_FILES+=usr/share/calendar/calendar.history
 OLD_FILES+=usr/share/calendar/calendar.holiday
 OLD_FILES+=usr/share/calendar/calendar.hungarian
 OLD_FILES+=usr/share/calendar/calendar.judaic
 OLD_FILES+=usr/share/calendar/calendar.lotr
 OLD_FILES+=usr/share/calendar/calendar.music
 OLD_FILES+=usr/share/calendar/calendar.newzealand
 OLD_FILES+=usr/share/calendar/calendar.russian
 OLD_FILES+=usr/share/calendar/calendar.southafrica
 OLD_FILES+=usr/share/calendar/calendar.ukrainian
 OLD_FILES+=usr/share/calendar/calendar.usholiday
 OLD_FILES+=usr/share/calendar/calendar.world
 OLD_FILES+=usr/share/calendar/de_AT.ISO_8859-15/calendar.feiertag
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.feiertag
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.geschichte
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.kirche
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.literatur
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.musik
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.wissenschaft
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.fetes
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.french
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.jferies
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.proverbes
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.praznici
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.nevnapok
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.unnepek
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.commemorative
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.holidays
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.mcommemorative
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.all
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.commemorative
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.holidays
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.mcommemorative
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.all
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.common
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.holiday
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.military
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.orthodox
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.pagan
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.all
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.common
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.holiday
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.military
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.orthodox
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.pagan
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.all
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.holiday
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.misc
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.orthodox
 OLD_DIRS+=usr/share/calendar/de_AT.ISO_8859-15
 OLD_DIRS+=usr/share/calendar/de_DE.ISO8859-1
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-15
 OLD_DIRS+=usr/share/calendar/fr_FR.ISO8859-1
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-15
 OLD_DIRS+=usr/share/calendar/hr_HR.ISO8859-2
 OLD_DIRS+=usr/share/calendar/hu_HU.ISO8859-2
 OLD_DIRS+=usr/share/calendar/pt_BR.ISO8859-1
 OLD_DIRS+=usr/share/calendar/pt_BR.UTF-8
 OLD_DIRS+=usr/share/calendar/ru_RU.KOI8-R
 OLD_DIRS+=usr/share/calendar/ru_RU.UTF-8
 OLD_DIRS+=usr/share/calendar/uk_UA.KOI8-U
 
 # 20201004: logo files renamed to type-agnostic gfx-*.lua
 OLD_FILES+=boot/lua/logo-beastie.lua
 OLD_FILES+=boot/lua/logo-beastiebw.lua
 OLD_FILES+=boot/lua/logo-fbsdbw.lua
 OLD_FILES+=boot/lua/logo-orb.lua
 OLD_FILES+=boot/lua/logo-orbbw.lua
 
 # 20200828: net/route/shared.h moved to net/route/route_var.h
 OLD_FILES+=usr/include/net/route/shared.h
 
 # 20200825: merged OpenZFS support
 OLD_LIBS+=lib/libzfs.so.3
 OLD_FILES+=usr/share/man/man1/zstreamdump.1.gz
 #OLD_FILES+=usr/share/man/man7/zpool-features.7.gz
 
 # 20200923: memfd_test moved to /usr/tests/sys/posixshm
 OLD_FILES+=usr/tests/sys/kern/memfd_test
 
 # 20200910: remove vm_map_create(9) to sync with the code
 OLD_FILES+=usr/share/man/man9/vm_map_create.9.gz
 
 # 20200820: Removal of the ufm driver
 OLD_FILES+=usr/share/man/man4/ufm.4.gz
 
 # 20200816: new clang import which bumps version from 10.0.1 to 11.0.0
 OLD_FILES+=usr/lib/clang/10.0.1/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/10.0.1/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/10.0.1/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/10.0.1/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/10.0.1/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include/fuzzer
 OLD_FILES+=usr/lib/clang/10.0.1/include/openmp_wrappers/__clang_openmp_math.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/openmp_wrappers/__clang_openmp_math_declares.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/10.0.1/include/openmp_wrappers/math.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/10.0.1/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/10.0.1/include/profile
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/10.0.1/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include/xray
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/10.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/10.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/10.0.1/lib
 OLD_DIRS+=usr/lib/clang/10.0.1
 
 # 20200803: remove free_domain(9) and uma_zfree_domain(9)
 OLD_FILES+=usr/share/man/man9/free_domain.9.gz
 OLD_FILES+=usr/share/man/man9/uma_zfree_domain.9.gz
 
 # 20200729: remove long expired serial drivers
 OLD_FILES+=usr/share/man/man4/cy.4.gz
 OLD_FILES+=usr/share/man/man4/rc.4.gz
 OLD_FILES+=usr/share/man/man4/rp.4.gz
 
 # 20200721: sys/iommu.h moved to dev/iommu/
 OLD_FILES+=usr/include/sys/iommu.h
 
 # 20200715: rework of devstat(9) man page
 OLD_FILES+=usr/share/man/man9/devstat_add_entry.9.gz
 
 # 20200714: update byacc to 20200330
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_calc1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_demo.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_destroy1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_destroy2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_destroy3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit4.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit5.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit0.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit2.y
 
 # 20200706: update of sglist(9), r360574
 OLD_FILES+=usr/share/man/man9/sglist_append_ext_pgs.9.gz
 OLD_FILES+=usr/share/man/man9/sglist_append_mb_ext_pgs.9.gz
 OLD_FILES+=usr/share/man/man9/sglist_count_ext_pgs.9.gz
 OLD_FILES+=usr/share/man/man9/sglist_count_mb_ext_pgs.9.gz
 
 # 20200617: update opencsd to 0.14.2
 OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h
 
 # 20200606: retire binutils build infrastructure
 OLD_FILES+=usr/bin/as
 OLD_FILES+=usr/bin/ld.bfd
 OLD_FILES+=usr/share/man/man1/as.1.gz
 OLD_FILES+=usr/share/man/man1/ld.bfd.1.gz
 OLD_FILES+=usr/share/man/man7/as.7.gz
 OLD_FILES+=usr/share/man/man7/ld.7.gz
 OLD_FILES+=usr/share/man/man7/ldint.7.gz
 OLD_FILES+=usr/share/man/man7/binutils.7.gz
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.x
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.x
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw
 
 # 20200601: OpenSSL 32-bit compat engines moved to /usr/lib32/engines
 OLD_LIBS+=usr/lib32/capi.so
 OLD_LIBS+=usr/lib32/padlock.so
 
 # 20200528: libevent renamed libevent1
 OLD_FILES+=usr/include/private/event/event.h
 OLD_DIRS+=usr/include/private/event
 OLD_FILES+=usr/lib/libprivateevent.a
 OLD_FILES+=usr/lib/libprivateevent.so
 OLD_LIBS+=usr/lib/libprivateevent.so.1
 OLD_FILES+=usr/lib/libprivateevent_p.a
 
 # 20200523: new clang import which bumps version from 10.0.0 to 10.0.1
 OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/10.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/10.0.0/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/fuzzer
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/__clang_openmp_math.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/__clang_openmp_math_declares.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/math.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/10.0.0/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/10.0.0/include/profile
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/10.0.0/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/xray
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/10.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/10.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/10.0.0/lib
 OLD_DIRS+=usr/lib/clang/10.0.0
 
 # 20200520: xform_userland.h removed
 OLD_FILES+=usr/include/crypto/xform_userland.h
 
 # 20200515: libalias cuseeme protocol support retired
 OLD_LIBS+=lib/libalias_cuseeme.so
 OLD_FILES+=usr/lib/libalias_cuseeme.a
 OLD_FILES+=usr/lib/libalias_cuseeme_p.a
 
 # 20200511: Remove deprecated crypto algorithms
 OLD_FILES+=usr/include/crypto/cast.h
 OLD_FILES+=usr/include/crypto/castsb.h
 OLD_FILES+=usr/include/crypto/skipjack.h
 
 # 20200511: Remove ubsec(4)
 OLD_FILES+=usr/share/man/man4/ubsec.4.gz
 
 # 20200428: route_var.h moved to net/route
 OLD_FILES+=usr/include/net/route_var.h
 
 # 20200418: Make libauditd private
 OLD_FILES+=usr/lib/libauditd.a
 OLD_FILES+=usr/lib/libauditd.so
 OLD_LIBS+=usr/lib/libauditd.so.5
 OLD_FILES+=usr/lib/libauditd_p.a
 
 # 20200418: Remove bogus man links
 OLD_FILES+=usr/share/man/man3/getauusernam_R.3.gz
 OLD_FILES+=usr/share/man/man3/getauclassnam_3.3.gz
 
 # 20200414: NFS file handle affinity code for the NFS server re-organized
 OLD_FILES+=usr/include/nfs/nfs_fha.h
 
 # 20200401: Remove procfs-based process debugging
 OLD_FILES+=usr/include/sys/pioctl.h
 
 # 20200330: GDB_LIBEXEC option retired (always true)
 OLD_FILES+=usr/bin/gdb
 OLD_FILES+=usr/bin/gdbserver
 OLD_FILES+=usr/bin/kgdb
 OLD_FILES+=usr/share/man/man1/gdb.1.gz
 OLD_FILES+=usr/share/man/man1/gdbserver.1.gz
 OLD_FILES+=usr/share/man/man1/kgdb.1.gz
 
 # 20200327: OCF refactoring
 OLD_FILES+=usr/include/crypto/cryptosoft.h
 OLD_FILES+=usr/share/man/man9/crypto_find_driver.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_register.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_unregister.9.gz
 
 # 20200326: compat libs for libl are no longer built
 OLD_FILES+=usr/lib32/libfl.a
 OLD_FILES+=usr/lib32/libl.a
 OLD_FILES+=usr/lib32/libln.a
 
 # 20200323: INTERNALLIB don't install headers anymore
 OLD_FILES+=usr/include/libelftc.h
 OLD_FILES+=usr/include/libifconfig.h
 OLD_FILES+=usr/include/libpmcstat.h
 
 # 20200320: cx and ctau drivers retired
 OLD_FILES+=usr/share/man/man4/ctau.4.gz
 OLD_FILES+=usr/share/man/man4/cx.4.gz
 
 # 20200318: host.conf was deprecated a long time ago
 OLD_FILES+=etc/host.conf
 OLD_FILES+=etc/rc.d/nsswitch
 
 # 20200310: new clang import which bumps version from 9.0.1 to 10.0.0
 OLD_FILES+=usr/lib/clang/9.0.1/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/9.0.1/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/9.0.1/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/9.0.1/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/__clang_openmp_math.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/__clang_openmp_math_declares.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/math.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/9.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/9.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/9.0.1/lib
 OLD_DIRS+=usr/lib/clang/9.0.1
 
 # 20200309: amd(8) retired
 OLD_FILES+=etc/amd.map
 OLD_FILES+=etc/newsyslog.conf.d/amd.conf
 OLD_FILES+=etc/rc.d/amd
 OLD_FILES+=usr/bin/pawd
 OLD_FILES+=usr/sbin/amd
 OLD_FILES+=usr/sbin/amq
 OLD_FILES+=usr/sbin/fixmount
 OLD_FILES+=usr/sbin/fsinfo
 OLD_FILES+=usr/sbin/hlfsd
 OLD_FILES+=usr/sbin/mk-amd-map
 OLD_FILES+=usr/sbin/wire-test
 OLD_FILES+=usr/share/examples/etc/amd.map
 OLD_FILES+=usr/share/man/man1/pawd.1.gz
 OLD_FILES+=usr/share/man/man5/amd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/amd.8.gz
 OLD_FILES+=usr/share/man/man8/amq.8.gz
 OLD_FILES+=usr/share/man/man8/fixmount.8.gz
 OLD_FILES+=usr/share/man/man8/fsinfo.8.gz
 OLD_FILES+=usr/share/man/man8/hlfsd.8.gz
 OLD_FILES+=usr/share/man/man8/mk-amd-map.8.gz
 OLD_FILES+=usr/share/man/man8/wire-test.8.gz
 
 # 20200301: bktr removed
 OLD_DIRS+=usr/include/dev/bktr
 OLD_FILES+=usr/include/dev/bktr/ioctl_bktr.h
 OLD_FILES+=usr/include/dev/bktr/ioctl_bt848.h
 OLD_FILES+=usr/include/dev/bktr/ioctl_meteor.h
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/ioctl_bktr.h
 OLD_FILES+=usr/include/machine/ioctl_meteor.h
 .endif
 OLD_FILES+=usr/share/man/man4/bktr.4.gz
 OLD_FILES+=usr/share/man/man4/brooktree.4.gz
 
 # 20200229: GCC 4.2.1 removed
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/bin/gcc
 OLD_FILES+=usr/share/man/man1/g++.1.gz
 OLD_FILES+=usr/share/man/man1/gcc.1.gz
 OLD_FILES+=usr/bin/gcpp
 OLD_FILES+=usr/bin/gperf
 OLD_FILES+=usr/include/c++/4.2/algorithm
 OLD_FILES+=usr/include/c++/4.2/backward/algo.h
 OLD_FILES+=usr/include/c++/4.2/backward/algobase.h
 OLD_FILES+=usr/include/c++/4.2/backward/alloc.h
 OLD_FILES+=usr/include/c++/4.2/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/4.2/backward/bvector.h
 OLD_FILES+=usr/include/c++/4.2/backward/complex.h
 OLD_FILES+=usr/include/c++/4.2/backward/defalloc.h
 OLD_FILES+=usr/include/c++/4.2/backward/deque.h
 OLD_FILES+=usr/include/c++/4.2/backward/fstream.h
 OLD_FILES+=usr/include/c++/4.2/backward/function.h
 OLD_FILES+=usr/include/c++/4.2/backward/hash_map.h
 OLD_FILES+=usr/include/c++/4.2/backward/hash_set.h
 OLD_FILES+=usr/include/c++/4.2/backward/hashtable.h
 OLD_FILES+=usr/include/c++/4.2/backward/heap.h
 OLD_FILES+=usr/include/c++/4.2/backward/iomanip.h
 OLD_FILES+=usr/include/c++/4.2/backward/iostream.h
 OLD_FILES+=usr/include/c++/4.2/backward/istream.h
 OLD_FILES+=usr/include/c++/4.2/backward/iterator.h
 OLD_FILES+=usr/include/c++/4.2/backward/list.h
 OLD_FILES+=usr/include/c++/4.2/backward/map.h
 OLD_FILES+=usr/include/c++/4.2/backward/multimap.h
 OLD_FILES+=usr/include/c++/4.2/backward/multiset.h
 OLD_FILES+=usr/include/c++/4.2/backward/new.h
 OLD_FILES+=usr/include/c++/4.2/backward/ostream.h
 OLD_FILES+=usr/include/c++/4.2/backward/pair.h
 OLD_FILES+=usr/include/c++/4.2/backward/queue.h
 OLD_FILES+=usr/include/c++/4.2/backward/rope.h
 OLD_FILES+=usr/include/c++/4.2/backward/set.h
 OLD_FILES+=usr/include/c++/4.2/backward/slist.h
 OLD_FILES+=usr/include/c++/4.2/backward/stack.h
 OLD_FILES+=usr/include/c++/4.2/backward/stream.h
 OLD_FILES+=usr/include/c++/4.2/backward/streambuf.h
 OLD_FILES+=usr/include/c++/4.2/backward/strstream
 OLD_FILES+=usr/include/c++/4.2/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/4.2/backward/tree.h
 OLD_FILES+=usr/include/c++/4.2/backward/vector.h
 OLD_FILES+=usr/include/c++/4.2/bits/allocator.h
 OLD_FILES+=usr/include/c++/4.2/bits/atomic_word.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_file.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/basic_string.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++allocator.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++config.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++io.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++locale.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/4.2/bits/char_traits.h
 OLD_FILES+=usr/include/c++/4.2/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/codecvt.h
 OLD_FILES+=usr/include/c++/4.2/bits/compatibility.h
 OLD_FILES+=usr/include/c++/4.2/bits/concept_check.h
 OLD_FILES+=usr/include/c++/4.2/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/4.2/bits/cpu_defines.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/4.2/bits/cxxabi_tweaks.h
 OLD_FILES+=usr/include/c++/4.2/bits/deque.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/functexcept.h
 OLD_FILES+=usr/include/c++/4.2/bits/gslice.h
 OLD_FILES+=usr/include/c++/4.2/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-tpf.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr.h
 OLD_FILES+=usr/include/c++/4.2/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/ios_base.h
 OLD_FILES+=usr/include/c++/4.2/bits/istream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/list.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/4.2/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/4.2/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/localefwd.h
 OLD_FILES+=usr/include/c++/4.2/bits/mask_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/messages_members.h
 OLD_FILES+=usr/include/c++/4.2/bits/os_defines.h
 OLD_FILES+=usr/include/c++/4.2/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/ostream_insert.h
 OLD_FILES+=usr/include/c++/4.2/bits/postypes.h
 OLD_FILES+=usr/include/c++/4.2/bits/slice_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_function.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_list.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_map.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_set.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/4.2/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/4.2/bits/time_members.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_after.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_before.h
 OLD_FILES+=usr/include/c++/4.2/bits/vector.tcc
 OLD_FILES+=usr/include/c++/4.2/bitset
 OLD_FILES+=usr/include/c++/4.2/cassert
 OLD_FILES+=usr/include/c++/4.2/cctype
 OLD_FILES+=usr/include/c++/4.2/cerrno
 OLD_FILES+=usr/include/c++/4.2/cfloat
 OLD_FILES+=usr/include/c++/4.2/ciso646
 OLD_FILES+=usr/include/c++/4.2/climits
 OLD_FILES+=usr/include/c++/4.2/clocale
 OLD_FILES+=usr/include/c++/4.2/cmath
 OLD_FILES+=usr/include/c++/4.2/complex
 OLD_FILES+=usr/include/c++/4.2/csetjmp
 OLD_FILES+=usr/include/c++/4.2/csignal
 OLD_FILES+=usr/include/c++/4.2/cstdarg
 OLD_FILES+=usr/include/c++/4.2/cstddef
 OLD_FILES+=usr/include/c++/4.2/cstdio
 OLD_FILES+=usr/include/c++/4.2/cstdlib
 OLD_FILES+=usr/include/c++/4.2/cstring
 OLD_FILES+=usr/include/c++/4.2/ctime
 OLD_FILES+=usr/include/c++/4.2/cwchar
 OLD_FILES+=usr/include/c++/4.2/cwctype
 OLD_FILES+=usr/include/c++/4.2/cxxabi.h
 OLD_FILES+=usr/include/c++/4.2/debug/bitset
 OLD_FILES+=usr/include/c++/4.2/debug/debug.h
 OLD_FILES+=usr/include/c++/4.2/debug/deque
 OLD_FILES+=usr/include/c++/4.2/debug/formatter.h
 OLD_FILES+=usr/include/c++/4.2/debug/functions.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_map
 OLD_FILES+=usr/include/c++/4.2/debug/hash_map.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_multimap.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_multiset.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_set
 OLD_FILES+=usr/include/c++/4.2/debug/hash_set.h
 OLD_FILES+=usr/include/c++/4.2/debug/list
 OLD_FILES+=usr/include/c++/4.2/debug/macros.h
 OLD_FILES+=usr/include/c++/4.2/debug/map
 OLD_FILES+=usr/include/c++/4.2/debug/map.h
 OLD_FILES+=usr/include/c++/4.2/debug/multimap.h
 OLD_FILES+=usr/include/c++/4.2/debug/multiset.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_base.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_iterator.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_iterator.tcc
 OLD_FILES+=usr/include/c++/4.2/debug/safe_sequence.h
 OLD_FILES+=usr/include/c++/4.2/debug/set
 OLD_FILES+=usr/include/c++/4.2/debug/set.h
 OLD_FILES+=usr/include/c++/4.2/debug/string
 OLD_FILES+=usr/include/c++/4.2/debug/vector
 OLD_FILES+=usr/include/c++/4.2/deque
 OLD_FILES+=usr/include/c++/4.2/exception
 OLD_FILES+=usr/include/c++/4.2/exception_defines.h
 OLD_FILES+=usr/include/c++/4.2/ext/algorithm
 OLD_FILES+=usr/include/c++/4.2/ext/array_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/atomicity.h
 OLD_FILES+=usr/include/c++/4.2/ext/bitmap_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/4.2/ext/concurrence.h
 OLD_FILES+=usr/include/c++/4.2/ext/debug_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/functional
 OLD_FILES+=usr/include/c++/4.2/ext/hash_fun.h
 OLD_FILES+=usr/include/c++/4.2/ext/hash_map
 OLD_FILES+=usr/include/c++/4.2/ext/hash_set
 OLD_FILES+=usr/include/c++/4.2/ext/hashtable.h
 OLD_FILES+=usr/include/c++/4.2/ext/iterator
 OLD_FILES+=usr/include/c++/4.2/ext/malloc_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/memory
 OLD_FILES+=usr/include/c++/4.2/ext/mt_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/new_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/numeric
 OLD_FILES+=usr/include/c++/4.2/ext/numeric_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/assoc_container.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_types.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cond_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/container_base_dispatch.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/counter_lu_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/mtf_lu_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/map_debug_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/cond_dtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/child_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/cond_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/head.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/internal_node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/leaf.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/point_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/split_join_branch_bag.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/null_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_trace_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/null_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/string_trie_e_access_traits_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/type_utils.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/types_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/exception.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/hash_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/list_update_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/priority_queue.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/tag_and_trait.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/tree_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/trie_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pod_char_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/pool_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/rb_tree
 OLD_FILES+=usr/include/c++/4.2/ext/rc_string_base.h
 OLD_FILES+=usr/include/c++/4.2/ext/rope
 OLD_FILES+=usr/include/c++/4.2/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/4.2/ext/slist
 OLD_FILES+=usr/include/c++/4.2/ext/sso_string_base.h
 OLD_FILES+=usr/include/c++/4.2/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/4.2/ext/stdio_sync_filebuf.h
 OLD_FILES+=usr/include/c++/4.2/ext/throw_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/type_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/typelist.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring.tcc
 OLD_FILES+=usr/include/c++/4.2/ext/vstring_fwd.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring_util.h
 OLD_FILES+=usr/include/c++/4.2/fstream
 OLD_FILES+=usr/include/c++/4.2/functional
 OLD_FILES+=usr/include/c++/4.2/iomanip
 OLD_FILES+=usr/include/c++/4.2/ios
 OLD_FILES+=usr/include/c++/4.2/iosfwd
 OLD_FILES+=usr/include/c++/4.2/iostream
 OLD_FILES+=usr/include/c++/4.2/istream
 OLD_FILES+=usr/include/c++/4.2/iterator
 OLD_FILES+=usr/include/c++/4.2/limits
 OLD_FILES+=usr/include/c++/4.2/list
 OLD_FILES+=usr/include/c++/4.2/locale
 OLD_FILES+=usr/include/c++/4.2/map
 OLD_FILES+=usr/include/c++/4.2/memory
 OLD_FILES+=usr/include/c++/4.2/new
 OLD_FILES+=usr/include/c++/4.2/numeric
 OLD_FILES+=usr/include/c++/4.2/ostream
 OLD_FILES+=usr/include/c++/4.2/queue
 OLD_FILES+=usr/include/c++/4.2/set
 OLD_FILES+=usr/include/c++/4.2/sstream
 OLD_FILES+=usr/include/c++/4.2/stack
 OLD_FILES+=usr/include/c++/4.2/stdexcept
 OLD_FILES+=usr/include/c++/4.2/streambuf
 OLD_FILES+=usr/include/c++/4.2/string
 OLD_FILES+=usr/include/c++/4.2/tr1/array
 OLD_FILES+=usr/include/c++/4.2/tr1/bind_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/bind_repeat.h
 OLD_FILES+=usr/include/c++/4.2/tr1/boost_shared_ptr.h
 OLD_FILES+=usr/include/c++/4.2/tr1/cctype
 OLD_FILES+=usr/include/c++/4.2/tr1/cfenv
 OLD_FILES+=usr/include/c++/4.2/tr1/cfloat
 OLD_FILES+=usr/include/c++/4.2/tr1/cinttypes
 OLD_FILES+=usr/include/c++/4.2/tr1/climits
 OLD_FILES+=usr/include/c++/4.2/tr1/cmath
 OLD_FILES+=usr/include/c++/4.2/tr1/common.h
 OLD_FILES+=usr/include/c++/4.2/tr1/complex
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdarg
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdbool
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdint
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdio
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdlib
 OLD_FILES+=usr/include/c++/4.2/tr1/ctgmath
 OLD_FILES+=usr/include/c++/4.2/tr1/ctime
 OLD_FILES+=usr/include/c++/4.2/tr1/ctype.h
 OLD_FILES+=usr/include/c++/4.2/tr1/cwchar
 OLD_FILES+=usr/include/c++/4.2/tr1/cwctype
 OLD_FILES+=usr/include/c++/4.2/tr1/fenv.h
 OLD_FILES+=usr/include/c++/4.2/tr1/float.h
 OLD_FILES+=usr/include/c++/4.2/tr1/functional
 OLD_FILES+=usr/include/c++/4.2/tr1/functional_hash.h
 OLD_FILES+=usr/include/c++/4.2/tr1/functional_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/hashtable
 OLD_FILES+=usr/include/c++/4.2/tr1/hashtable_policy.h
 OLD_FILES+=usr/include/c++/4.2/tr1/inttypes.h
 OLD_FILES+=usr/include/c++/4.2/tr1/limits.h
 OLD_FILES+=usr/include/c++/4.2/tr1/math.h
 OLD_FILES+=usr/include/c++/4.2/tr1/memory
 OLD_FILES+=usr/include/c++/4.2/tr1/mu_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/random
 OLD_FILES+=usr/include/c++/4.2/tr1/random.tcc
 OLD_FILES+=usr/include/c++/4.2/tr1/ref_fwd.h
 OLD_FILES+=usr/include/c++/4.2/tr1/ref_wrap_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/repeat.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdarg.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdbool.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdint.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdio.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdlib.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tgmath.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple_defs.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/type_traits
 OLD_FILES+=usr/include/c++/4.2/tr1/type_traits_fwd.h
 OLD_FILES+=usr/include/c++/4.2/tr1/unordered_map
 OLD_FILES+=usr/include/c++/4.2/tr1/unordered_set
 OLD_FILES+=usr/include/c++/4.2/tr1/utility
 OLD_FILES+=usr/include/c++/4.2/tr1/wchar.h
 OLD_FILES+=usr/include/c++/4.2/tr1/wctype.h
 OLD_FILES+=usr/include/c++/4.2/typeinfo
 OLD_FILES+=usr/include/c++/4.2/utility
 OLD_FILES+=usr/include/c++/4.2/valarray
 OLD_FILES+=usr/include/c++/4.2/vector
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_aes.h
 OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/gcc/4.2/ammintrin.h
 OLD_FILES+=usr/include/gcc/4.2/emmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/mm3dnow.h
 OLD_FILES+=usr/include/gcc/4.2/mm_malloc.h
 OLD_FILES+=usr/include/gcc/4.2/mmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/pmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/tmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/wmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/xmmintrin.h
 .elif ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/gcc/4.2/mmintrin.h
 .elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/include/gcc/4.2/altivec.h
 OLD_FILES+=usr/include/gcc/4.2/ppc-asm.h
 OLD_FILES+=usr/include/gcc/4.2/spe.h
 .endif
 OLD_FILES+=usr/lib/libgcov.a
 OLD_FILES+=usr/lib/libgomp.a
 OLD_FILES+=usr/lib/libstdc++.a
 OLD_FILES+=usr/lib/libstdc++.so
 OLD_LIBS+=usr/lib/libstdc++.so.6
 OLD_FILES+=usr/lib/libstdc++_p.a
 OLD_FILES+=usr/lib/libsupc++.a
 OLD_FILES+=usr/lib/libsupc++.so
 OLD_LIBS+=usr/lib/libsupc++.so.1
 OLD_FILES+=usr/lib/libsupc++_p.a
 OLD_LIBS+=usr/lib/libgomp.so.1
 OLD_FILES+=usr/lib/libgomp_p.a
 OLD_FILES+=usr/libexec/cc1
 OLD_FILES+=usr/libexec/cc1plus
 OLD_FILES+=usr/share/man/man1/gcpp.1.gz
 OLD_FILES+=usr/share/man/man1/gperf.1.gz
 OLD_FILES+=usr/share/man/man7/gperf.7.gz
 OLD_DIRS+=usr/include/c++/4.2/tr1
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds
 OLD_DIRS+=usr/include/c++/4.2/ext
 OLD_DIRS+=usr/include/c++/4.2/debug
 OLD_DIRS+=usr/include/c++/4.2/bits
 OLD_DIRS+=usr/include/c++/4.2/backward
 OLD_DIRS+=usr/include/c++/4.2
 OLD_DIRS+=usr/include/gcc/4.2
 OLD_DIRS+=usr/include/gcc
 
 # 20200220: Upgrade of ncurses, shlib bumped to version 9
 OLD_LIBS+=lib/libncurses.so.8
 OLD_LIBS+=lib/libncursesw.so.8
 
 # 20200206: Remove elf2aout
 OLD_FILES+=usr/bin/elf2aout
 OLD_FILES+=usr/share/man/man1/elf2aout.1.gz
 
 # 20200204: simple_httpd removed
 OLD_FILES+=usr/sbin/simple_httpd
 
 # 20200127: vpo removed
 OLD_FILES+=usr/include/dev/ppbus/vpoio.h
 OLD_FILES+=usr/share/man/man4/imm.4.gz
 OLD_FILES+=usr/share/man/man4/vpo.4.gz
 
 # 20200104: gcc libssp removed
 OLD_FILES+=usr/lib/libssp.a
 
 # 20191229: GEOM_SCHED class and gsched tool removed
 OLD_LIBS+=lib/geom/geom_sched.so
 OLD_FILES+=sbin/gsched
 OLD_FILES+=usr/share/man/man8/gsched.8.gz
 
 # 20191222: new clang import which bumps version from 9.0.0 to 9.0.1
 OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/9.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/__clang_openmp_math.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/__clang_openmp_math_declares.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/math.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/9.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/9.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/9.0.0/lib
 OLD_DIRS+=usr/lib/clang/9.0.0
 # 20191221: Update libpcap from 1.9.0 to 1.9.1
 OLD_FILES+=usr/share/man/man3/pcap_set_immediate_mode.3.gz
 OLD_FILES+=usr/share/man/man3/pcap_set_protocol.3.gz
 # 20191214: Removal of sranddev(3)
 OLD_FILES+=usr/share/man/man3/sranddev.3.gz
 # 20191213: Renamed (BIT|CPU)_NAND to (BIT|CPU)_ANDNOT
 OLD_FILES+=usr/share/man/man9/BIT_NAND.9.gz
 OLD_FILES+=usr/share/man/man9/CPU_NAND.9.gz
 # 20191213: remove timeout(9)
 OLD_FILES+=usr/share/man/man9/callout_handle_init.9.gz
 OLD_FILES+=usr/share/man/man9/timeout.9.gz
 OLD_FILES+=usr/share/man/man9/untimeout.9.gz
 # 20191128: Removal of trm(4)
 OLD_FILES+=usr/share/man/man4/trm.4.gz
 # 20191121: Removal of sio(4)
 OLD_FILES+=usr/share/man/man4/sio.4.gz
 # 20191105: picobsd(8), et al, removed
 OLD_FILES+=usr/share/man/man8/picobsd.8.gz
 # 20191017: taskqueue_start_threads_pinned became taskqueue_start_threads_cpuset
 OLD_FILES+=usr/share/man/man9/taskqueue_start_threads_pinned.9.gz
 # 20191009: new clang import which bumps version from 8.0.1 to 9.0.0
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/8.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/8.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/8.0.1/include
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/8.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/8.0.1/lib
 OLD_DIRS+=usr/lib/clang/8.0.1
 # 20191009: libc++ 9.0.0 removed some experimental files
 OLD_FILES+=usr/include/c++/v1/experimental/any
 OLD_FILES+=usr/include/c++/v1/experimental/chrono
 OLD_FILES+=usr/include/c++/v1/experimental/numeric
 OLD_FILES+=usr/include/c++/v1/experimental/optional
 OLD_FILES+=usr/include/c++/v1/experimental/ratio
 OLD_FILES+=usr/include/c++/v1/experimental/string_view
 OLD_FILES+=usr/include/c++/v1/experimental/system_error
 OLD_FILES+=usr/include/c++/v1/experimental/tuple
 OLD_FILES+=usr/lib/libc++fs.a
 # 20191003: Remove useless ZFS tests
 OLD_FILES+=usr/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_013_neg.ksh
 OLD_FILES+=usr/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_014_neg.ksh
 OLD_FILES+=usr/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_016_pos.ksh
 # 20190910: mklocale(1) and colldef(1) removed
 OLD_FILES+=usr/bin/mklocale
 OLD_FILES+=usr/share/man/man1/mklocale.1.gz
 OLD_FILES+=usr/bin/colldef
 OLD_FILES+=usr/share/man/man1/colldef.1.gz
 # 20190904: Remove boot1.efifat and gptboot.efifat (which never should have been)
 OLD_FILES+=boot/boot1.efifat
 OLD_FILES+=boot/gptboot.efifat
 # 20190903: pc-sysinstall(8) removed
 OLD_FILES+=usr/share/examples/pc-sysinstall/README
 OLD_FILES+=usr/share/examples/pc-sysinstall/pc-autoinstall.conf
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.fbsd-netinstall
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.geli
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.gmirror
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.netinstall
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.restore
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.rsync
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.upgrade
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.zfs
 OLD_FILES+=usr/share/man/man8/pc-sysinstall.8.gz
 OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/create-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/delete-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-emulation.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-laptop.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-nics.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-info.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-list.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/enable-net.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/get-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-components.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-config.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-mirrors.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-rsync-backups.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-tzones.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/query-langs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/send-logs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/setup-ssh-keys.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/set-mirror.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/sys-mem.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-live.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-netup.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/update-part-list.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-layouts.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-models.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-variants.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-bsdlabel.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-cleanup.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-disk.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-extractimage.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-ftp.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installcomponents.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installpackages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-localize.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountdisk.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountoptical.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-networking.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-newfs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-parse.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-runcommands.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-unmount.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-upgrade.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-users.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/installimage.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/parseconfig.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/startautoinstall.sh
 OLD_FILES+=usr/share/pc-sysinstall/conf/avail-langs
 OLD_FILES+=usr/share/pc-sysinstall/conf/exclude-from-upgrade
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/bsd-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/intel-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/nvidia-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/pc-sysinstall.conf
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-list
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-size
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-index
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-start-autoinstall
 OLD_FILES+=usr/sbin/pc-sysinstall
 OLD_DIRS+=usr/share/examples/pc-sysinstall
 OLD_DIRS+=usr/share/pc-sysinstall/backend
 OLD_DIRS+=usr/share/pc-sysinstall/backend-partmanager
 OLD_DIRS+=usr/share/pc-sysinstall/backend-query
 OLD_DIRS+=usr/share/pc-sysinstall/conf/license
 OLD_DIRS+=usr/share/pc-sysinstall/conf
 OLD_DIRS+=usr/share/pc-sysinstall/doc
 OLD_DIRS+=usr/share/pc-sysinstall
 # 20190825: zlib 1.0.4 removed from kernel
 OLD_FILES+=usr/include/sys/zlib.h
 OLD_FILES+=usr/include/sys/zutil.h
 # 20190817: pft_ping.py and sniffer.py moved to /usr/tests/sys/netpfil/common
 OLD_FILES+=usr/tests/sys/netpfil/pf/sniffer.py
 OLD_FILES+=usr/tests/sys/netpfil/pf/pft_ping.py
 # 20190816: dir.h removed from POSIX
 OLD_FILES+=usr/include/sys/dir.h
 # 20190813: deprecated GEOM classes removed
 OLD_FILES+=usr/share/man/man4/geom_fox.4.gz
 # 20190729: gzip'ed a.out support removed
 OLD_FILES+=usr/include/sys/inflate.h
 # 20190722: cap_random(3) removed
 OLD_LIBS+=lib/casper/libcap_random.so.1
 OLD_FILES+=usr/include/casper/cap_random.h
 OLD_LIBS+=usr/lib/libcap_random.so
 OLD_FILES+=usr/share/man/man3/libcap_random.3.gz
 OLD_FILES+=usr/share/man/man3/cap_random.3.gz
 OLD_FILES+=usr/share/man/man3/cap_random_buf.3.gz
 # 20190708: vm_page_hold() and _unhold() removed
 OLD_FILES+=usr/share/man/man9/vm_page_hold.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_unhold.9.gz
 # 20190625: Remove NAND and NANDFS support
 OLD_FILES+=usr/share/man/man4/nand.4.gz
 OLD_FILES+=usr/share/man/man4/nandsim.4.gz
 # 20190618: sys/capability.h removed (sys/capsicum.h is the one to use)
 OLD_FILES+=usr/include/sys/capability.h
 # 20190615: sys/pwm.h renamed to dev/pwmc.h
 OLD_FILES+=usr/include/sys/pwm.h
 # 20190612: new clang import which bumps version from 8.0.0 to 8.0.1
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/8.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/8.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/8.0.0/include
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/8.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/8.0.0/lib
 OLD_DIRS+=usr/lib/clang/8.0.0
 # 20190523: Remove obsolete kgzip and support files
 OLD_FILES+=usr/sbin/kgzip
 OLD_FILES+=usr/lib/kgzldr.o
 OLD_FILES+=usr/share/man/man8/kgzip.8.gz
 # 20190517: Remove obsolete 10 and 10/100 ethernet drivers
 OLD_FILES+=usr/share/man/man4/bm.4.gz
 OLD_FILES+=usr/share/man/man4/cs.4.gz
 OLD_FILES+=usr/share/man/man4/de.4.gz
 OLD_FILES+=usr/share/man/man4/if_de.4.gz
 OLD_FILES+=usr/share/man/man4/ed.4.gz
 OLD_FILES+=usr/share/man/man4/if_ed.4.gz
 OLD_FILES+=usr/share/man/man4/ep.4.gz
 OLD_FILES+=usr/share/man/man4/ex.4.gz
 OLD_FILES+=usr/share/man/man4/fe.4.gz
 OLD_FILES+=usr/share/man/man4/pcn.4.gz
 OLD_FILES+=usr/share/man/man4/if_pcn.4.gz
 OLD_FILES+=usr/share/man/man4/sf.4.gz
 OLD_FILES+=usr/share/man/man4/if_sf.4.gz
 OLD_FILES+=usr/share/man/man4/sn.4.gz
 OLD_FILES+=usr/share/man/man4/if_sn.4.gz
 OLD_FILES+=usr/share/man/man4/tl.4.gz
 OLD_FILES+=usr/share/man/man4/if_tl.4.gz
 OLD_FILES+=usr/share/man/man4/tx.4.gz
 OLD_FILES+=usr/share/man/man4/if_tx.4.gz
 OLD_FILES+=usr/share/man/man4/txp.4.gz
 OLD_FILES+=usr/share/man/man4/if_txp.4.gz
 OLD_FILES+=usr/share/man/man4/vx.4.gz
 OLD_FILES+=usr/share/man/man4/wb.4.gz
 OLD_FILES+=usr/share/man/man4/if_wb.4.gz
 OLD_FILES+=usr/share/man/man4/xe.4.gz
 OLD_FILES+=usr/share/man/man4/if_xe.4.gz
 # 20190513: libcap_sysctl interface change
 OLD_LIBS+=lib/casper/libcap_sysctl.so.1
 # 20190509: tests/sys/opencrypto requires the net/py-dpkt package
 OLD_FILES+=usr/tests/sys/opencrypto/dpkt.py
 OLD_FILES+=usr/tests/sys/opencrypto/dpkt.pyc
 # 20190304: new libc++ import which bumps version from 7.0.1 to 8.0.0
 OLD_FILES+=usr/include/c++/v1/experimental/dynarray
 # 20190304: new clang import which bumps version from 7.0.1 to 8.0.0
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/7.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/7.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/7.0.1/include
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/7.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/7.0.1/lib
 OLD_DIRS+=usr/lib/clang/7.0.1
 # 20190227: rename seq.h to seqc.h
 OLD_FILES+=usr/include/sys/seq.h
 # 20190222: libifconfig made INTERNALLIB
 OLD_FILES+=usr/lib/libprivateifconfig.a
 OLD_FILES+=usr/lib/libprivateifconfig_p.a
 # 20190131: pfil(9) changed
 OLD_FILES+=usr/share/man/man9/pfil_hook_get.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_rlock.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_runlock.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_wlock.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_wunlock.9.gz
 # 20190126: adv(4) / adw(4) removal
 OLD_FILES+=usr/share/man/man4/adv.4.gz
 OLD_FILES+=usr/share/man/man4/adw.4.gz
 # 20190123: nonexistant cred_update_thread(9) removed
 OLD_FILES+=usr/share/man/man9/cred_update_thread.9.gz
 # 20190114: old pbuf allocator removed
 OLD_FILES+=usr/share/man/man9/getpbuf.9.gz
 OLD_FILES+=usr/share/man/man9/pbuf.9.gz
 OLD_FILES+=usr/share/man/man9/relpbuf.9.gz
 OLD_FILES+=usr/share/man/man9/trypbuf.9.gz
 # 20181219: ibcs removal
 OLD_FILES+=usr/share/examples/ibcs2/hello.uu
 OLD_FILES+=usr/share/examples/ibcs2/README
 OLD_DIRS+=usr/share/examples/ibcs2
 # 20181215: Migration of CTM to ports
 OLD_FILES+=usr/sbin/ctm
 OLD_FILES+=usr/sbin/ctm_dequeue
 OLD_FILES+=usr/sbin/ctm_rmail
 OLD_FILES+=usr/sbin/ctm_smail
 OLD_FILES+=usr/share/man/man1/ctm.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_dequeue.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_rmail.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_smail.1.gz
 OLD_FILES+=usr/share/man/man5/ctm.5.gz
 # 20181214: Remove timed files
 OLD_FILES+=etc/rc.d/timed
 OLD_FILES+=usr/sbin/timed
 OLD_FILES+=usr/sbin/timedc
 OLD_FILES+=usr/share/man/man8/timed.8.gz
 OLD_FILES+=usr/share/man/man8/timedc.8.gz
 # 20181211: new clang import which bumps version from 6.0.1 to 7.0.1
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/6.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/6.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/6.0.1/include
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/6.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/6.0.1/lib
 OLD_DIRS+=usr/lib/clang/6.0.1
 # 20181116: Rename test file
 OLD_FILES+=usr/tests/sys/netinet/reuseport_lb
 # 20181113: libufs version bumped to 7
 OLD_LIBS+=lib/libufs.so.6
 # 20181112: Cleanup old libcap_dns
 OLD_LIBS+=lib/casper/libcap_dns.so.1
 # 20181030: malloc_domain(9) KPI change
 OLD_FILES+=usr/share/man/man9/malloc_domain.9.gz
 # 20181026: joy(4) removal
 OLD_FILES+=usr/share/man/man4/joy.4.gz
 # 20181025: OpenSSL libraries version bump to avoid conflict with ports
 OLD_LIBS+=lib/libcrypto.so.9
 OLD_LIBS+=usr/lib/libssl.so.9
 # 20181022: aha(4) removal
 OLD_FILES+=usr/share/man/man4/aha.4.gz
 # 20181022: dpt(4) removal
 OLD_FILES+=usr/share/man/man4/dpt.4.gz
 # 20181022: ncr(4) removal
 OLD_FILES+=usr/share/man/man4/ncr.4.gz
 # 20181022: ncv(4) removal
 OLD_FILES+=usr/share/man/man4/ncv.4.gz
 # 20181022: nsp(4) removal
 OLD_FILES+=usr/share/man/man4/nsp.4.gz
 # 20181022: stg(4) removal
 OLD_FILES+=usr/share/man/man4/stg.4.gz
 # 20181021: mse(4) removal
 OLD_FILES+=usr/share/man/man4/mse.4.gz
 # 20181015: Stale libcasper(3) files following r329452
 OLD_LIBS+=lib/casper/libcap_sysctl.so.0
 OLD_LIBS+=lib/casper/libcap_grp.so.0
 OLD_LIBS+=lib/casper/libcap_pwd.so.0
 OLD_LIBS+=lib/casper/libcap_random.so.0
 OLD_LIBS+=lib/casper/libcap_dns.so.0
 OLD_LIBS+=lib/casper/libcap_syslog.so.0
 # 20181012: rename of ixlv(4) to iavf(4)
 OLD_FILES+=usr/share/man/man4/if_ixlv.4.gz
 OLD_FILES+=usr/share/man/man4/ixlv.4.gz
 # 20181009: OpenSSL 1.1.1
 OLD_FILES+=usr/include/openssl/des_old.h
 OLD_FILES+=usr/include/openssl/dso.h
 OLD_FILES+=usr/include/openssl/krb5_asn.h
 OLD_FILES+=usr/include/openssl/kssl.h
 OLD_FILES+=usr/include/openssl/pqueue.h
 OLD_FILES+=usr/include/openssl/ssl23.h
 OLD_FILES+=usr/include/openssl/ui_compat.h
 OLD_FILES+=usr/share/openssl/man/man1/dss1.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/md2.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/md4.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/md5.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/mdc2.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/ripemd160.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha1.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha224.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha256.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha384.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha512.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/x509v3_config.1.gz
 OLD_FILES+=usr/share/openssl/man/man3/ASN1_STRING_length_set.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_get_conn_int_port.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_get_conn_ip.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_set.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_set_conn_int_port.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_set_conn_ip.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_get_thread_id.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_set_thread_id.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_thread_id.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_MONT_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_RECP_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_memdup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_memdup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strdup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strlcat.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strlcpy.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strndup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CMS_set1_signer_cert.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_cmp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_cpy.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_current.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_get_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_hash.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_set_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_destroy_dynlockid.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_get_new_dynlockid.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_lock.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_num_locks.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_create_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_destroy_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_lock_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_locking_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/DES_ede3_cbcm_encrypt.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/DES_enc_read.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/DES_enc_write.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EC_KEY_get_key_method_data.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EC_KEY_insert_key_method_data.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EC_POINT_set_Jprojective_coordinates.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ERR_load_UI_strings.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_CIPHER_CTX_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_CIPHER_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MAX_MD_SIZE.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_create.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_destroy.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEVP_PKEY_CTX_set_app_data.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_CTX_set_rsa_rsa_keygen_bits.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_get_default_digest.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_dss.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_dss1.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_sha.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/HMAC_CTX_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/HMAC_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/HMAC_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/OPENSSL_ia32cap_loc.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/PEM.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/RAND_SSLeay.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/RSA_PKCS1_SSLeay.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/RSA_null_method.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_need_tmp_rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_custom_cli_ext.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_default_read_ahead.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_tmp_rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_tmp_rsa_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_add_session.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_flush_sessions.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_get_accept_state.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_get_msg_callback_arg.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_need_tmp_rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_remove_session.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_set_tmp_rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_set_tmp_rsa_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLeay.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLeay_add_ssl_algorithms.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLeay_version.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLv2_client_method.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLv2_method.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSLv2_server_method.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/X509_STORE_CTX_set_chain.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/X509_STORE_CTX_trusted_stack.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/blowfish.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_add_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_check_top.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_cmp_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_div_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_dump.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_expand.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_expand2.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_fix_top.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_internal.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_add_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_comba4.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_comba8.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_high.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_low_normal.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_low_recursive.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_normal.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_part_recursive.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_recursive.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_mul_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_print.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_set_high.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_set_low.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_set_max.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_comba4.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_comba8.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_normal.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_recursive.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_sub_words.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/bn_wexpand.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/buffer.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/crypto.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_ECPKParameters_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_ECPKParameters_fp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_ECPrivate_key.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_Netscape_RSA.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_PKCS8PrivateKey.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_Private_key.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_2passwords.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_password.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_pw.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_pw_string.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/dh.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/dsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ec.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ecdsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/engine.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/err.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/evp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/hmac.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/i2d_ECPKParameters_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/i2d_ECPKParameters_fp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/i2d_Netscape_RSA.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_delete.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_doall.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_doall_arg.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_error.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_free.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_insert.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_new.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_stats.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_stats_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_usage_stats.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_usage_stats_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_retrieve.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_stats.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_stats_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lhash.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/md5.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/mdc2.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/pem.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/rand.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/rc4.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ripemd.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/sha.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ssl.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/threads.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ui.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ui_compat.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/x509.3.gz
 OLD_LIBS+=lib/libcrypto.so.8
 OLD_LIBS+=usr/lib/engines/lib4758cca.so
 OLD_LIBS+=usr/lib/engines/libaep.so
 OLD_LIBS+=usr/lib/engines/libatalla.so
 OLD_LIBS+=usr/lib/engines/libcapi.so
 OLD_LIBS+=usr/lib/engines/libchil.so
 OLD_LIBS+=usr/lib/engines/libcswift.so
 OLD_LIBS+=usr/lib/engines/libgost.so
 OLD_LIBS+=usr/lib/engines/libnuron.so
 OLD_LIBS+=usr/lib/engines/libsureware.so
 OLD_LIBS+=usr/lib/engines/libubsec.so
 OLD_LIBS+=usr/lib/libssl.so.8
 OLD_LIBS+=usr/lib32/lib4758cca.so
 OLD_LIBS+=usr/lib32/libaep.so
 OLD_LIBS+=usr/lib32/libatalla.so
 OLD_LIBS+=usr/lib32/libcapi.so
 OLD_LIBS+=usr/lib32/libchil.so
 OLD_LIBS+=usr/lib32/libcswift.so
 OLD_LIBS+=usr/lib32/libgost.so
 OLD_LIBS+=usr/lib32/libnuron.so
 OLD_LIBS+=usr/lib32/libsureware.so
 OLD_LIBS+=usr/lib32/libubsec.so
 # 20180824: libbe(3) SHLIBDIR fixed to reflect correct location
 MOVED_LIBS+=usr/lib/libbe.so.1
 # 20180819: Remove deprecated arc4random(3) stir/addrandom interfaces
 OLD_FILES+=usr/share/man/man3/arc4random_addrandom.3.gz
 OLD_FILES+=usr/share/man/man3/arc4random_stir.3.gz
 # 20180819: send-pr(1) placeholder removal
 OLD_FILES+=usr/bin/send-pr
 # 20180801: jedec_ts(4) removed
 OLD_FILES+=usr/share/man/man4/jedec_ts.4.gz
 # 20180725: Cleanup old libcasper.so.0
 OLD_LIBS+=lib/libcasper.so.0
 # 20180722: indent(1) option renamed, test files follow
 OLD_FILES+=usr/bin/indent/tests/nsac.0
 OLD_FILES+=usr/bin/indent/tests/nsac.0.pro
 OLD_FILES+=usr/bin/indent/tests/nsac.0.stdout
 OLD_FILES+=usr/bin/indent/tests/sac.0
 OLD_FILES+=usr/bin/indent/tests/sac.0.pro
 OLD_FILES+=usr/bin/indent/tests/sac.0.stdout
 # 20180721: move of libmlx5.so.1 and libibverbs.so.1
 MOVED_LIBS+=usr/lib/libmlx5.so.1
 MOVED_LIBS+=usr/lib/libibverbs.so.1
 # 20180720: zfsloader.8 merged into loader.8
 OLD_FILES+=usr/share/man/man8/zfsloader.8.gz
 # 20180710: old numa cleanup
 OLD_FILES+=usr/include/sys/numa.h
 OLD_FILES+=usr/share/man/man2/numa_getaffinity.2.gz
 OLD_FILES+=usr/share/man/man2/numa_setaffinity.2.gz
 OLD_FILES+=usr/share/man/man1/numactl.1.gz
 OLD_FILES+=usr/bin/numactl
 # 20180630: new clang import which bumps version from 6.0.0 to 6.0.1
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/6.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/6.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/6.0.0/include
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/6.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/6.0.0/lib
 OLD_DIRS+=usr/lib/clang/6.0.0
 # 20180615: asf(8) removed
 OLD_FILES+=usr/sbin/asf
 OLD_FILES+=usr/share/man/man8/asf.8.gz
 # 20180609: obsolete libc++ files missed from the 5.0.0 import
 OLD_FILES+=usr/include/c++/v1/__refstring
 OLD_FILES+=usr/include/c++/v1/__undef_min_max
 OLD_FILES+=usr/include/c++/v1/tr1/__refstring
 OLD_FILES+=usr/include/c++/v1/tr1/__undef_min_max
 # 20180607: remove nls support from grep
 OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/grep.cat
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/grep.cat
 OLD_FILES+=usr/share/nls/ja_JP.SJIS/grep.cat
 OLD_FILES+=usr/share/nls/ja_JP.eucJP/grep.cat
 OLD_FILES+=usr/share/nls/gl_ES.ISO8859-1/grep.cat
 OLD_FILES+=usr/share/nls/zh_CN.UTF-8/grep.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/grep.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/grep.cat
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/grep.cat
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/grep.cat
 # 20180528: libpcap update removed header file
 OLD_FILES+=usr/include/pcap/export-defs.h
 # 20180517: retire vxge
 OLD_FILES+=usr/share/man/man4/if_vxge.4.gz
 OLD_FILES+=usr/share/man/man4/vxge.4.gz
 # 20180512: Rename Unbound tools
 OLD_FILES+=usr/sbin/unbound
 OLD_FILES+=usr/sbin/unbound-anchor
 OLD_FILES+=usr/sbin/unbound-checkconf
 OLD_FILES+=usr/sbin/unbound-control
 OLD_FILES+=usr/share/man/man5/unbound.conf.5.gz
 OLD_FILES+=usr/share/man/man8/unbound-anchor.8.gz
 OLD_FILES+=usr/share/man/man8/unbound-checkconf.8.gz
 OLD_FILES+=usr/share/man/man8/unbound-control.8.gz
 OLD_FILES+=usr/share/man/man8/unbound.8.gz
 # 20180508: retire nxge
 OLD_FILES+=usr/share/man/man4/if_nxge.4.gz
 OLD_FILES+=usr/share/man/man4/nxge.4.gz
 # 20180505: rhosts
 OLD_FILES+=usr/share/skel/dot.rhosts
 # 20180502: retire ixgb
 OLD_FILES+=usr/share/man/man4/if_ixgb.4.gz
 OLD_FILES+=usr/share/man/man4/ixgb.4.gz
 # 20180501: retire lmc
 OLD_FILES+=usr/include/dev/lmc/if_lmc.h
 OLD_DIRS+=usr/include/dev/lmc
 OLD_FILES+=usr/sbin/lmcconfig
 OLD_FILES+=usr/share/man/man4/lmc.4.gz
 OLD_FILES+=usr/share/man/man4/if_lmc.4.gz
 OLD_FILES+=usr/share/man/man8/lmcconfig.8.gz
 # 20180417: remove fuswintr and suswintr
 OLD_FILES+=usr/share/man/man9/fuswintr.9.gz
 OLD_FILES+=usr/share/man/man9/suswintr.9.gz
 # 20180413: remove Arcnet support
 OLD_FILES+=usr/include/net/if_arc.h
 OLD_FILES+=usr/share/man/man4/cm.4.gz
 # 20180409: remove FDDI support
 OLD_FILES+=usr/include/net/fddi.h
 OLD_FILES+=usr/share/man/man4/fpa.4.gz
 # 20180319: remove /boot/overlays, replaced by /boot/dtb/overlays
 OLD_DIRS+=boot/overlays
 # 20180311: remove sys/sys/i386/include/pcaudioio.h
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/pcaudioio.h
 .endif
 # 20180310: remove sys/sys/dataacq.h
 OLD_FILES+=usr/include/sys/dataacq.h
 # 20180306: remove DTrace scripts made obsolete by dwatch(1)
 OLD_FILES+=usr/share/dtrace/watch_execve
 OLD_FILES+=usr/share/dtrace/watch_kill
 OLD_FILES+=usr/share/dtrace/watch_vop_remove
 # 20180212: move devmatch
 OLD_FILES+=usr/sbin/devmatch
 # 20180211: remove usb.conf
 OLD_FILES+=etc/devd/usb.conf
 # 20180208: remove c_rehash(1)
 OLD_FILES+=usr/share/openssl/man/man1/c_rehash.1.gz
 # 20180206: remove gdbtui
 OLD_FILES+=usr/bin/gdbtui
 # 20180201: Obsolete forth files
 OLD_FILES+=boot/pcibios.4th
 # 20180114: new clang import which bumps version from 5.0.1 to 6.0.0
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/5.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/5.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/5.0.1/include
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/5.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/5.0.1/lib
 OLD_DIRS+=usr/lib/clang/5.0.1
 # 20180109: Remove vestiges of digi(4) driver
 OLD_FILES+=usr/include/sys/digiio.h
 OLD_FILES+=usr/sbin/digictl
 OLD_FILES+=usr/share/man/man8/digictl.8.gz
 # 20180107: Convert remaining geli(8) tests to ATF
 OLD_FILES+=tests/sys/geom/class/eli/nokey_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/readonly_test.sh
 # 20180106: Convert most geli(8) tests to ATF
 OLD_FILES+=tests/sys/geom/class/eli/attach_d_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/configure_b_B_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/detach_l_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_B_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_J_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_a_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_alias_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_i_P_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/integrity_copy_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/integrity_data_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/integrity_hmac_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/onetime_a_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/onetime_d_test.sh
 # 20171230: Remove /etc/skel from mtree
 OLD_DIRS+=etc/skel
 # 20171208: Remove basename_r(3)
 OLD_FILES+=usr/share/man/man3/basename_r.3.gz
 # 20171206: Remove sponge(1)
 OLD_FILES+=usr/bin/sponge
 OLD_FILES+=usr/share/man/man1/sponge.1.gz
 # 20171204: Move fdformat man page from volume 1 to volume 8
 OLD_FILES+=usr/share/man/man1/fdformat.1.gz
 # 20171203: libproc version bump
 OLD_LIBS+=usr/lib/libproc.so.4
 # 20171203: new clang import which bumps version from 5.0.0 to 5.0.1
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/5.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/5.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/5.0.0/include
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/5.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/5.0.0/lib
 OLD_DIRS+=usr/lib/clang/5.0.0
 # 20171118: Remove old etc casper files
 OLD_FILES+=etc/casper/system.dns
 OLD_FILES+=etc/casper/system.grp
 OLD_FILES+=etc/casper/system.pwd
 OLD_FILES+=etc/casper/system.random
 OLD_FILES+=etc/casper/system.sysctl
 OLD_DIRS+=etc/casper
 # 20171116: lint(1) removal
 OLD_FILES+=usr/bin/lint
 OLD_FILES+=usr/libexec/lint1
 OLD_FILES+=usr/libexec/lint2
 OLD_FILES+=usr/libdata/lint/llib-lposix.ln
 OLD_FILES+=usr/libdata/lint/llib-lstdc.ln
 OLD_FILES+=usr/share/man/man1/lint.1.gz
 OLD_FILES+=usr/share/man/man7/lint.7.gz
 OLD_DIRS+=usr/libdata/lint
 # 20171114: Removal of all fortune datfiles other than freebsd-tips
 OLD_FILES+=usr/share/games/fortune/fortunes
 OLD_FILES+=usr/share/games/fortune/fortunes.dat
 OLD_FILES+=usr/share/games/fortune/gerrold.limerick
 OLD_FILES+=usr/share/games/fortune/gerrold.limerick.dat
 OLD_FILES+=usr/share/games/fortune/limerick
 OLD_FILES+=usr/share/games/fortune/limerick.dat
 OLD_FILES+=usr/share/games/fortune/murphy
 OLD_FILES+=usr/share/games/fortune/murphy-o
 OLD_FILES+=usr/share/games/fortune/murphy-o.dat
 OLD_FILES+=usr/share/games/fortune/murphy.dat
 OLD_FILES+=usr/share/games/fortune/startrek
 OLD_FILES+=usr/share/games/fortune/startrek.dat
 OLD_FILES+=usr/share/games/fortune/zippy
 OLD_FILES+=usr/share/games/fortune/zippy.dat
 # 20171112: Removal of eqnchar definition
 OLD_FILES+=usr/share/misc/eqnchar
 # 20171110: Removal of mailaddr man page
 OLD_FILES+=usr/share/man/man7/mailaddr.7.gz
 # 20171108: Rename of NgSendMsgReply to NgSendReplyMsg
 OLD_FILES+=usr/share/man/man3/NgSendMsgReply.3.gz
 # 20171108: badsect(8) removal
 OLD_FILES+=sbin/badsect
 OLD_FILES+=rescue/badsect
 OLD_FILES+=usr/share/man/man8/badsect.8.gz
 # 20171105: fixing lib/libclang_rt CRTARCH for arm:armv[67]
 .if ${MACHINE_ARCH:Marmv[67]*} != "" && \
     (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_LIBS+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.safestack-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 .endif
 # 20171104: libcap_random should be in /lib not in /usr/lib
 OLD_LIBS+=usr/lib/libcap_random.so.0
 # 20171104: Casper can work only as shared library
 OLD_FILES+=usr/lib/libcap_dns.a
 OLD_FILES+=usr/lib/libcap_dns_p.a
 OLD_FILES+=usr/lib/libcap_grp.a
 OLD_FILES+=usr/lib/libcap_grp_p.a
 OLD_FILES+=usr/lib/libcap_pwd.a
 OLD_FILES+=usr/lib/libcap_pwd_p.a
 OLD_FILES+=usr/lib/libcap_random.a
 OLD_FILES+=usr/lib/libcap_random_p.a
 OLD_FILES+=usr/lib/libcap_sysctl.a
 OLD_FILES+=usr/lib/libcap_sysctl_p.a
 OLD_FILES+=usr/lib/libcasper.a
 OLD_FILES+=usr/lib/libcasper_p.a
 # 20171031: Removal of adding_user man page
 OLD_FILES+=usr/share/man/man7/adding_user.7.gz
 # 20171031: Disconnected libpathconv tests
 OLD_DIRS+=usr/tests/lib/libpathconv
 # 20171017: Removal of mbpool(9)
 OLD_FILES+=usr/include/sys/mbpool.h
 OLD_FILES+=usr/share/man/man9/mbpool.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_destroy.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_alloc.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_ext_free.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_count.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_card_free.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_get_keep.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_free.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_get.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_create.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_sync.9.gz
 # 20171010: Remove libstand
 OLD_FILES+=usr/lib/libstand.a
 OLD_FILES+=usr/lib/libstand_p.a
 OLD_FILES+=usr/include/stand.h
 OLD_FILES+=usr/share/man/man3/libstand.3.gz
 # 20171003: remove RCMDS
 OLD_FILES+=bin/rcp
 OLD_FILES+=rescue/rcp
 OLD_FILES+=usr/bin/rlogin
 OLD_FILES+=usr/bin/rsh
 OLD_FILES+=usr/libexec/rlogind
 OLD_FILES+=usr/libexec/rshd
 OLD_FILES+=usr/share/man/man1/rcp.1.gz
 OLD_FILES+=usr/share/man/man1/rlogin.1.gz
 OLD_FILES+=usr/share/man/man1/rsh.1.gz
 OLD_FILES+=usr/share/man/man8/rlogind.8.gz
 OLD_FILES+=usr/share/man/man8/rshd.8.gz
 # 20170927: crshared
 OLD_FILES+=usr/share/man/man9/crshared.9.gz
 # 20170927: procctl
 OLD_FILES+=usr/share/man/man8/procctl.8.gz
 OLD_FILES+=usr/sbin/procctl
 # 20170926: remove unneeded man aliases and locales directory
 OLD_FILES+=usr/share/man/en.ISO8859-1/man1
 OLD_FILES+=usr/share/man/en.ISO8859-1/man2
 OLD_FILES+=usr/share/man/en.ISO8859-1/man3
 OLD_FILES+=usr/share/man/en.ISO8859-1/man4
 OLD_FILES+=usr/share/man/en.ISO8859-1/man5
 OLD_FILES+=usr/share/man/en.ISO8859-1/man6
 OLD_FILES+=usr/share/man/en.ISO8859-1/man7
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8
 OLD_FILES+=usr/share/man/en.ISO8859-1/man9
 OLD_DIRS+=usr/share/man/en.ISO8859-1
 OLD_FILES+=usr/share/man/en.ISO8859-1/mandoc.db
 OLD_FILES+=usr/share/man/en.UTF-8/man1
 OLD_FILES+=usr/share/man/en.UTF-8/man2
 OLD_FILES+=usr/share/man/en.UTF-8/man3
 OLD_FILES+=usr/share/man/en.UTF-8/man4
 OLD_FILES+=usr/share/man/en.UTF-8/man5
 OLD_FILES+=usr/share/man/en.UTF-8/man6
 OLD_FILES+=usr/share/man/en.UTF-8/man7
 OLD_FILES+=usr/share/man/en.UTF-8/man8
 OLD_FILES+=usr/share/man/en.UTF-8/man9
 OLD_FILES+=usr/share/man/en.UTF-8/mandoc.db
 OLD_DIRS+=usr/share/man/en.UTF-8
 OLD_FILES+=usr/share/man/en.ISO8859-15
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-1/man1
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-1/man3
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-1/mandoc.db
 OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-15
 OLD_DIRS+=usr/share/man/ja/man1
 OLD_DIRS+=usr/share/man/ja/man2
 OLD_DIRS+=usr/share/man/ja/man3
 OLD_DIRS+=usr/share/man/ja/man4
 OLD_DIRS+=usr/share/man/ja/man5
 OLD_DIRS+=usr/share/man/ja/man6
 OLD_DIRS+=usr/share/man/ja/man7
 OLD_DIRS+=usr/share/man/ja/man8
 OLD_DIRS+=usr/share/man/ja/man9
 OLD_DIRS+=usr/share/man/ja
 # 20170913: remove unneeded catman utility
 OLD_FILES+=etc/periodic/weekly/330.catman
 OLD_FILES+=usr/bin/catman
 OLD_FILES+=usr/libexec/catman.local
 OLD_FILES+=usr/share/man/man1/catman.1.gz
 OLD_FILES+=usr/share/man/man8/catman.local.8.gz
 OLD_DIRS+=usr/share/man/cat1
 OLD_DIRS+=usr/share/man/cat2
 OLD_DIRS+=usr/share/man/cat3
 OLD_DIRS+=usr/share/man/cat4/amd64
 OLD_DIRS+=usr/share/man/cat4/arm
 OLD_DIRS+=usr/share/man/cat4/i386
 OLD_DIRS+=usr/share/man/cat4/powerpc
 OLD_DIRS+=usr/share/man/cat4/sparc64
 OLD_DIRS+=usr/share/man/cat4
 OLD_DIRS+=usr/share/man/cat5
 OLD_DIRS+=usr/share/man/cat6
 OLD_DIRS+=usr/share/man/cat7
 OLD_DIRS+=usr/share/man/cat8/amd64
 OLD_DIRS+=usr/share/man/cat8/arm
 OLD_DIRS+=usr/share/man/cat8/i386
 OLD_DIRS+=usr/share/man/cat8/powerpc
 OLD_DIRS+=usr/share/man/cat8/sparc64
 OLD_DIRS+=usr/share/man/cat8
 OLD_DIRS+=usr/share/man/cat9
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat1
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat2
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat3
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/amd64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/arm
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/i386
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/powerpc
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/sparc64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat5
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat6
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat7
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/amd64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/arm
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/i386
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/powerpc
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/sparc64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat9
 OLD_DIRS+=usr/share/man/en.UTF-8/cat1
 OLD_DIRS+=usr/share/man/en.UTF-8/cat2
 OLD_DIRS+=usr/share/man/en.UTF-8/cat3
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/amd64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/arm
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/i386
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/powerpc
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/sparc64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4
 OLD_DIRS+=usr/share/man/en.UTF-8/cat5
 OLD_DIRS+=usr/share/man/en.UTF-8/cat6
 OLD_DIRS+=usr/share/man/en.UTF-8/cat7
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/amd64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/arm
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/i386
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/powerpc
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/sparc64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8
 OLD_DIRS+=usr/share/man/en.UTF-8/cat9
 OLD_DIRS+=usr/share/man/ja/cat1
 OLD_DIRS+=usr/share/man/ja/cat2
 OLD_DIRS+=usr/share/man/ja/cat3
 OLD_DIRS+=usr/share/man/ja/cat4/amd64
 OLD_DIRS+=usr/share/man/ja/cat4/arm
 OLD_DIRS+=usr/share/man/ja/cat4/i386
 OLD_DIRS+=usr/share/man/ja/cat4/powerpc
 OLD_DIRS+=usr/share/man/ja/cat4/sparc64
 OLD_DIRS+=usr/share/man/ja/cat4
 OLD_DIRS+=usr/share/man/ja/cat5
 OLD_DIRS+=usr/share/man/ja/cat6
 OLD_DIRS+=usr/share/man/ja/cat7
 OLD_DIRS+=usr/share/man/ja/cat8/amd64
 OLD_DIRS+=usr/share/man/ja/cat8/arm
 OLD_DIRS+=usr/share/man/ja/cat8/powerpc
 OLD_DIRS+=usr/share/man/ja/cat8/sparc64
 OLD_DIRS+=usr/share/man/ja/cat8
 OLD_DIRS+=usr/share/man/ja/cat9
 OLD_DIRS+=usr/share/openssl/man/cat1
 OLD_DIRS+=usr/share/openssl/man/cat3
 OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat1
 OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat3
 # 20170830: rename ntb_hw(4) to ntb_hw_intel(4)
 OLD_FILES+=usr/share/man/man4/ntb_hw.4.gz
 # 20170802: ksyms(4) ioctl interface was removed
 OLD_FILES+=usr/include/sys/ksyms.h
 # 20170729: the iicbus/pcf8563 driver is replaced with iicbus/nxprtc
 OLD_FILES+=usr/include/dev/iicbus/pcf8563reg.h
 # 20170727: options FLOWTABLE removed
 OLD_FILES+=usr/include/net/flowtable.h
 # 20170722: new clang import which bumps version from 4.0.0 to 5.0.0
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/4.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/4.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/4.0.0/include
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/4.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/4.0.0/lib
 OLD_DIRS+=usr/lib/clang/4.0.0
 OLD_FILES+=usr/bin/llvm-pdbdump
 # 20170717: Remove documentation of vaporware
 OLD_FILES+=usr/share/man/man2/pdwait4.2.gz
 # 20170610: chown-f_test replaced by chown_test
 OLD_FILES+=usr/tests/usr.sbin/chown/chown-f_test
 # 20170609: drop obsolete manpage link (if_rtwn.ko -> rtwn.ko)
 OLD_FILES+=usr/share/man/man4/if_rtwn.4.gz
 # 20170531: removal of groff
 OLD_FILES+=usr/bin/addftinfo
 OLD_FILES+=usr/bin/afmtodit
 OLD_FILES+=usr/bin/checknr
 OLD_FILES+=usr/bin/colcrt
 OLD_FILES+=usr/bin/eqn
 OLD_FILES+=usr/bin/grn
 OLD_FILES+=usr/bin/grodvi
 OLD_FILES+=usr/bin/groff
 OLD_FILES+=usr/bin/grog
 OLD_FILES+=usr/bin/grolbp
 OLD_FILES+=usr/bin/grolj4
 OLD_FILES+=usr/bin/grops
 OLD_FILES+=usr/bin/grotty
 OLD_FILES+=usr/bin/hpftodit
 OLD_FILES+=usr/bin/indxbib
 OLD_FILES+=usr/bin/lkbib
 OLD_FILES+=usr/bin/lookbib
 OLD_FILES+=usr/bin/mmroff
 OLD_FILES+=usr/bin/neqn
 OLD_FILES+=usr/bin/nroff
 OLD_FILES+=usr/bin/pfbtops
 OLD_FILES+=usr/bin/pic
 OLD_FILES+=usr/bin/post-grohtml
 OLD_FILES+=usr/bin/pre-grohtml
 OLD_FILES+=usr/bin/psroff
 OLD_FILES+=usr/bin/refer
 OLD_FILES+=usr/bin/tbl
 OLD_FILES+=usr/bin/tfmtodit
 OLD_FILES+=usr/bin/troff
 OLD_FILES+=usr/bin/vgrind
 OLD_FILES+=usr/libexec/vfontedpr
 OLD_FILES+=usr/share/dict/eign
 OLD_FILES+=usr/share/groff_font/devX100-12/CB
 OLD_FILES+=usr/share/groff_font/devX100-12/CBI
 OLD_FILES+=usr/share/groff_font/devX100-12/CI
 OLD_FILES+=usr/share/groff_font/devX100-12/CR
 OLD_FILES+=usr/share/groff_font/devX100-12/DESC
 OLD_FILES+=usr/share/groff_font/devX100-12/HB
 OLD_FILES+=usr/share/groff_font/devX100-12/HBI
 OLD_FILES+=usr/share/groff_font/devX100-12/HI
 OLD_FILES+=usr/share/groff_font/devX100-12/HR
 OLD_FILES+=usr/share/groff_font/devX100-12/NB
 OLD_FILES+=usr/share/groff_font/devX100-12/NBI
 OLD_FILES+=usr/share/groff_font/devX100-12/NI
 OLD_FILES+=usr/share/groff_font/devX100-12/NR
 OLD_FILES+=usr/share/groff_font/devX100-12/S
 OLD_FILES+=usr/share/groff_font/devX100-12/TB
 OLD_FILES+=usr/share/groff_font/devX100-12/TBI
 OLD_FILES+=usr/share/groff_font/devX100-12/TI
 OLD_FILES+=usr/share/groff_font/devX100-12/TR
 OLD_DIRS+=usr/share/groff_font/devX100-12
 OLD_FILES+=usr/share/groff_font/devX100/CB
 OLD_FILES+=usr/share/groff_font/devX100/CBI
 OLD_FILES+=usr/share/groff_font/devX100/CI
 OLD_FILES+=usr/share/groff_font/devX100/CR
 OLD_FILES+=usr/share/groff_font/devX100/DESC
 OLD_FILES+=usr/share/groff_font/devX100/HB
 OLD_FILES+=usr/share/groff_font/devX100/HBI
 OLD_FILES+=usr/share/groff_font/devX100/HI
 OLD_FILES+=usr/share/groff_font/devX100/HR
 OLD_FILES+=usr/share/groff_font/devX100/NB
 OLD_FILES+=usr/share/groff_font/devX100/NBI
 OLD_FILES+=usr/share/groff_font/devX100/NI
 OLD_FILES+=usr/share/groff_font/devX100/NR
 OLD_FILES+=usr/share/groff_font/devX100/S
 OLD_FILES+=usr/share/groff_font/devX100/TB
 OLD_FILES+=usr/share/groff_font/devX100/TBI
 OLD_FILES+=usr/share/groff_font/devX100/TI
 OLD_FILES+=usr/share/groff_font/devX100/TR
 OLD_DIRS+=usr/share/groff_font/devX100
 OLD_FILES+=usr/share/groff_font/devX75-12/CB
 OLD_FILES+=usr/share/groff_font/devX75-12/CBI
 OLD_FILES+=usr/share/groff_font/devX75-12/CI
 OLD_FILES+=usr/share/groff_font/devX75-12/CR
 OLD_FILES+=usr/share/groff_font/devX75-12/DESC
 OLD_FILES+=usr/share/groff_font/devX75-12/HB
 OLD_FILES+=usr/share/groff_font/devX75-12/HBI
 OLD_FILES+=usr/share/groff_font/devX75-12/HI
 OLD_FILES+=usr/share/groff_font/devX75-12/HR
 OLD_FILES+=usr/share/groff_font/devX75-12/NB
 OLD_FILES+=usr/share/groff_font/devX75-12/NBI
 OLD_FILES+=usr/share/groff_font/devX75-12/NI
 OLD_FILES+=usr/share/groff_font/devX75-12/NR
 OLD_FILES+=usr/share/groff_font/devX75-12/S
 OLD_FILES+=usr/share/groff_font/devX75-12/TB
 OLD_FILES+=usr/share/groff_font/devX75-12/TBI
 OLD_FILES+=usr/share/groff_font/devX75-12/TI
 OLD_FILES+=usr/share/groff_font/devX75-12/TR
 OLD_DIRS+=usr/share/groff_font/devX75-12
 OLD_FILES+=usr/share/groff_font/devX75/CB
 OLD_FILES+=usr/share/groff_font/devX75/CBI
 OLD_FILES+=usr/share/groff_font/devX75/CI
 OLD_FILES+=usr/share/groff_font/devX75/CR
 OLD_FILES+=usr/share/groff_font/devX75/DESC
 OLD_FILES+=usr/share/groff_font/devX75/HB
 OLD_FILES+=usr/share/groff_font/devX75/HBI
 OLD_FILES+=usr/share/groff_font/devX75/HI
 OLD_FILES+=usr/share/groff_font/devX75/HR
 OLD_FILES+=usr/share/groff_font/devX75/NB
 OLD_FILES+=usr/share/groff_font/devX75/NBI
 OLD_FILES+=usr/share/groff_font/devX75/NI
 OLD_FILES+=usr/share/groff_font/devX75/NR
 OLD_FILES+=usr/share/groff_font/devX75/S
 OLD_FILES+=usr/share/groff_font/devX75/TB
 OLD_FILES+=usr/share/groff_font/devX75/TBI
 OLD_FILES+=usr/share/groff_font/devX75/TI
 OLD_FILES+=usr/share/groff_font/devX75/TR
 OLD_DIRS+=usr/share/groff_font/devX75
 OLD_FILES+=usr/share/groff_font/devascii/B
 OLD_FILES+=usr/share/groff_font/devascii/BI
 OLD_FILES+=usr/share/groff_font/devascii/CW
 OLD_FILES+=usr/share/groff_font/devascii/DESC
 OLD_FILES+=usr/share/groff_font/devascii/I
 OLD_FILES+=usr/share/groff_font/devascii/L
 OLD_FILES+=usr/share/groff_font/devascii/R
 OLD_FILES+=usr/share/groff_font/devascii/S
 OLD_DIRS+=usr/share/groff_font/devascii
 OLD_FILES+=usr/share/groff_font/devcp1047/B
 OLD_FILES+=usr/share/groff_font/devcp1047/BI
 OLD_FILES+=usr/share/groff_font/devcp1047/CW
 OLD_FILES+=usr/share/groff_font/devcp1047/DESC
 OLD_FILES+=usr/share/groff_font/devcp1047/I
 OLD_FILES+=usr/share/groff_font/devcp1047/L
 OLD_FILES+=usr/share/groff_font/devcp1047/R
 OLD_FILES+=usr/share/groff_font/devcp1047/S
 OLD_DIRS+=usr/share/groff_font/devcp1047
 OLD_FILES+=usr/share/groff_font/devdvi/CW
 OLD_FILES+=usr/share/groff_font/devdvi/CWEC
 OLD_FILES+=usr/share/groff_font/devdvi/CWI
 OLD_FILES+=usr/share/groff_font/devdvi/CWIEC
 OLD_FILES+=usr/share/groff_font/devdvi/CWITC
 OLD_FILES+=usr/share/groff_font/devdvi/CWTC
 OLD_FILES+=usr/share/groff_font/devdvi/CompileFonts
 OLD_FILES+=usr/share/groff_font/devdvi/DESC
 OLD_FILES+=usr/share/groff_font/devdvi/EX
 OLD_FILES+=usr/share/groff_font/devdvi/HB
 OLD_FILES+=usr/share/groff_font/devdvi/HBEC
 OLD_FILES+=usr/share/groff_font/devdvi/HBI
 OLD_FILES+=usr/share/groff_font/devdvi/HBIEC
 OLD_FILES+=usr/share/groff_font/devdvi/HBITC
 OLD_FILES+=usr/share/groff_font/devdvi/HBTC
 OLD_FILES+=usr/share/groff_font/devdvi/HI
 OLD_FILES+=usr/share/groff_font/devdvi/HIEC
 OLD_FILES+=usr/share/groff_font/devdvi/HITC
 OLD_FILES+=usr/share/groff_font/devdvi/HR
 OLD_FILES+=usr/share/groff_font/devdvi/HREC
 OLD_FILES+=usr/share/groff_font/devdvi/HRTC
 OLD_FILES+=usr/share/groff_font/devdvi/MI
 OLD_FILES+=usr/share/groff_font/devdvi/Makefile
 OLD_FILES+=usr/share/groff_font/devdvi/S
 OLD_FILES+=usr/share/groff_font/devdvi/SA
 OLD_FILES+=usr/share/groff_font/devdvi/SB
 OLD_FILES+=usr/share/groff_font/devdvi/SC
 OLD_FILES+=usr/share/groff_font/devdvi/TB
 OLD_FILES+=usr/share/groff_font/devdvi/TBEC
 OLD_FILES+=usr/share/groff_font/devdvi/TBI
 OLD_FILES+=usr/share/groff_font/devdvi/TBIEC
 OLD_FILES+=usr/share/groff_font/devdvi/TBITC
 OLD_FILES+=usr/share/groff_font/devdvi/TBTC
 OLD_FILES+=usr/share/groff_font/devdvi/TI
 OLD_FILES+=usr/share/groff_font/devdvi/TIEC
 OLD_FILES+=usr/share/groff_font/devdvi/TITC
 OLD_FILES+=usr/share/groff_font/devdvi/TR
 OLD_FILES+=usr/share/groff_font/devdvi/TREC
 OLD_FILES+=usr/share/groff_font/devdvi/TRTC
 OLD_FILES+=usr/share/groff_font/devdvi/ec.map
 OLD_FILES+=usr/share/groff_font/devdvi/msam.map
 OLD_FILES+=usr/share/groff_font/devdvi/msbm.map
 OLD_FILES+=usr/share/groff_font/devdvi/tc.map
 OLD_FILES+=usr/share/groff_font/devdvi/texb.map
 OLD_FILES+=usr/share/groff_font/devdvi/texex.map
 OLD_FILES+=usr/share/groff_font/devdvi/texi.map
 OLD_FILES+=usr/share/groff_font/devdvi/texmi.map
 OLD_FILES+=usr/share/groff_font/devdvi/texr.map
 OLD_FILES+=usr/share/groff_font/devdvi/texsy.map
 OLD_FILES+=usr/share/groff_font/devdvi/textex.map
 OLD_FILES+=usr/share/groff_font/devdvi/textt.map
 OLD_DIRS+=usr/share/groff_font/devdvi
 OLD_FILES+=usr/share/groff_font/devhtml/B
 OLD_FILES+=usr/share/groff_font/devhtml/BI
 OLD_FILES+=usr/share/groff_font/devhtml/CB
 OLD_FILES+=usr/share/groff_font/devhtml/CBI
 OLD_FILES+=usr/share/groff_font/devhtml/CI
 OLD_FILES+=usr/share/groff_font/devhtml/CR
 OLD_FILES+=usr/share/groff_font/devhtml/DESC
 OLD_FILES+=usr/share/groff_font/devhtml/I
 OLD_FILES+=usr/share/groff_font/devhtml/R
 OLD_FILES+=usr/share/groff_font/devhtml/S
 OLD_DIRS+=usr/share/groff_font/devhtml
 OLD_FILES+=usr/share/groff_font/devkoi8-r/B
 OLD_FILES+=usr/share/groff_font/devkoi8-r/BI
 OLD_FILES+=usr/share/groff_font/devkoi8-r/CW
 OLD_FILES+=usr/share/groff_font/devkoi8-r/DESC
 OLD_FILES+=usr/share/groff_font/devkoi8-r/I
 OLD_FILES+=usr/share/groff_font/devkoi8-r/L
 OLD_FILES+=usr/share/groff_font/devkoi8-r/R
 OLD_FILES+=usr/share/groff_font/devkoi8-r/S
 OLD_DIRS+=usr/share/groff_font/devkoi8-r
 OLD_FILES+=usr/share/groff_font/devlatin1/B
 OLD_FILES+=usr/share/groff_font/devlatin1/BI
 OLD_FILES+=usr/share/groff_font/devlatin1/CW
 OLD_FILES+=usr/share/groff_font/devlatin1/DESC
 OLD_FILES+=usr/share/groff_font/devlatin1/I
 OLD_FILES+=usr/share/groff_font/devlatin1/L
 OLD_FILES+=usr/share/groff_font/devlatin1/R
 OLD_FILES+=usr/share/groff_font/devlatin1/S
 OLD_DIRS+=usr/share/groff_font/devlatin1
 OLD_FILES+=usr/share/groff_font/devlbp/CB
 OLD_FILES+=usr/share/groff_font/devlbp/CI
 OLD_FILES+=usr/share/groff_font/devlbp/CR
 OLD_FILES+=usr/share/groff_font/devlbp/DESC
 OLD_FILES+=usr/share/groff_font/devlbp/EB
 OLD_FILES+=usr/share/groff_font/devlbp/EI
 OLD_FILES+=usr/share/groff_font/devlbp/ER
 OLD_FILES+=usr/share/groff_font/devlbp/HB
 OLD_FILES+=usr/share/groff_font/devlbp/HBI
 OLD_FILES+=usr/share/groff_font/devlbp/HI
 OLD_FILES+=usr/share/groff_font/devlbp/HNB
 OLD_FILES+=usr/share/groff_font/devlbp/HNBI
 OLD_FILES+=usr/share/groff_font/devlbp/HNI
 OLD_FILES+=usr/share/groff_font/devlbp/HNR
 OLD_FILES+=usr/share/groff_font/devlbp/HR
 OLD_FILES+=usr/share/groff_font/devlbp/TB
 OLD_FILES+=usr/share/groff_font/devlbp/TBI
 OLD_FILES+=usr/share/groff_font/devlbp/TI
 OLD_FILES+=usr/share/groff_font/devlbp/TR
 OLD_DIRS+=usr/share/groff_font/devlbp
 OLD_FILES+=usr/share/groff_font/devlj4/AB
 OLD_FILES+=usr/share/groff_font/devlj4/ABI
 OLD_FILES+=usr/share/groff_font/devlj4/AI
 OLD_FILES+=usr/share/groff_font/devlj4/ALBB
 OLD_FILES+=usr/share/groff_font/devlj4/ALBR
 OLD_FILES+=usr/share/groff_font/devlj4/AOB
 OLD_FILES+=usr/share/groff_font/devlj4/AOI
 OLD_FILES+=usr/share/groff_font/devlj4/AOR
 OLD_FILES+=usr/share/groff_font/devlj4/AR
 OLD_FILES+=usr/share/groff_font/devlj4/CB
 OLD_FILES+=usr/share/groff_font/devlj4/CBI
 OLD_FILES+=usr/share/groff_font/devlj4/CI
 OLD_FILES+=usr/share/groff_font/devlj4/CLARENDON
 OLD_FILES+=usr/share/groff_font/devlj4/CORONET
 OLD_FILES+=usr/share/groff_font/devlj4/CR
 OLD_FILES+=usr/share/groff_font/devlj4/DESC
 OLD_FILES+=usr/share/groff_font/devlj4/GB
 OLD_FILES+=usr/share/groff_font/devlj4/GBI
 OLD_FILES+=usr/share/groff_font/devlj4/GI
 OLD_FILES+=usr/share/groff_font/devlj4/GR
 OLD_FILES+=usr/share/groff_font/devlj4/LGB
 OLD_FILES+=usr/share/groff_font/devlj4/LGI
 OLD_FILES+=usr/share/groff_font/devlj4/LGR
 OLD_FILES+=usr/share/groff_font/devlj4/MARIGOLD
 OLD_FILES+=usr/share/groff_font/devlj4/OB
 OLD_FILES+=usr/share/groff_font/devlj4/OBI
 OLD_FILES+=usr/share/groff_font/devlj4/OI
 OLD_FILES+=usr/share/groff_font/devlj4/OR
 OLD_FILES+=usr/share/groff_font/devlj4/S
 OLD_FILES+=usr/share/groff_font/devlj4/SYMBOL
 OLD_FILES+=usr/share/groff_font/devlj4/TB
 OLD_FILES+=usr/share/groff_font/devlj4/TBI
 OLD_FILES+=usr/share/groff_font/devlj4/TI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRB
 OLD_FILES+=usr/share/groff_font/devlj4/TNRBI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRR
 OLD_FILES+=usr/share/groff_font/devlj4/TR
 OLD_FILES+=usr/share/groff_font/devlj4/UB
 OLD_FILES+=usr/share/groff_font/devlj4/UBI
 OLD_FILES+=usr/share/groff_font/devlj4/UCB
 OLD_FILES+=usr/share/groff_font/devlj4/UCBI
 OLD_FILES+=usr/share/groff_font/devlj4/UCI
 OLD_FILES+=usr/share/groff_font/devlj4/UCR
 OLD_FILES+=usr/share/groff_font/devlj4/UI
 OLD_FILES+=usr/share/groff_font/devlj4/UR
 OLD_FILES+=usr/share/groff_font/devlj4/WINGDINGS
 OLD_DIRS+=usr/share/groff_font/devlj4
 OLD_FILES+=usr/share/groff_font/devps/AB
 OLD_FILES+=usr/share/groff_font/devps/ABI
 OLD_FILES+=usr/share/groff_font/devps/AI
 OLD_FILES+=usr/share/groff_font/devps/AR
 OLD_FILES+=usr/share/groff_font/devps/BMB
 OLD_FILES+=usr/share/groff_font/devps/BMBI
 OLD_FILES+=usr/share/groff_font/devps/BMI
 OLD_FILES+=usr/share/groff_font/devps/BMR
 OLD_FILES+=usr/share/groff_font/devps/CB
 OLD_FILES+=usr/share/groff_font/devps/CBI
 OLD_FILES+=usr/share/groff_font/devps/CI
 OLD_FILES+=usr/share/groff_font/devps/CR
 OLD_FILES+=usr/share/groff_font/devps/DESC
 OLD_FILES+=usr/share/groff_font/devps/EURO
 OLD_FILES+=usr/share/groff_font/devps/HB
 OLD_FILES+=usr/share/groff_font/devps/HBI
 OLD_FILES+=usr/share/groff_font/devps/HI
 OLD_FILES+=usr/share/groff_font/devps/HNB
 OLD_FILES+=usr/share/groff_font/devps/HNBI
 OLD_FILES+=usr/share/groff_font/devps/HNI
 OLD_FILES+=usr/share/groff_font/devps/HNR
 OLD_FILES+=usr/share/groff_font/devps/HR
 OLD_FILES+=usr/share/groff_font/devps/Makefile
 OLD_FILES+=usr/share/groff_font/devps/NB
 OLD_FILES+=usr/share/groff_font/devps/NBI
 OLD_FILES+=usr/share/groff_font/devps/NI
 OLD_FILES+=usr/share/groff_font/devps/NR
 OLD_FILES+=usr/share/groff_font/devps/PB
 OLD_FILES+=usr/share/groff_font/devps/PBI
 OLD_FILES+=usr/share/groff_font/devps/PI
 OLD_FILES+=usr/share/groff_font/devps/PR
 OLD_FILES+=usr/share/groff_font/devps/S
 OLD_FILES+=usr/share/groff_font/devps/SS
 OLD_FILES+=usr/share/groff_font/devps/TB
 OLD_FILES+=usr/share/groff_font/devps/TBI
 OLD_FILES+=usr/share/groff_font/devps/TI
 OLD_FILES+=usr/share/groff_font/devps/TR
 OLD_FILES+=usr/share/groff_font/devps/ZCMI
 OLD_FILES+=usr/share/groff_font/devps/ZD
 OLD_FILES+=usr/share/groff_font/devps/ZDR
 OLD_FILES+=usr/share/groff_font/devps/afmname
 OLD_FILES+=usr/share/groff_font/devps/dingbats.map
 OLD_FILES+=usr/share/groff_font/devps/dingbats.rmap
 OLD_FILES+=usr/share/groff_font/devps/download
 OLD_FILES+=usr/share/groff_font/devps/freeeuro.pfa
 OLD_FILES+=usr/share/groff_font/devps/lgreekmap
 OLD_FILES+=usr/share/groff_font/devps/prologue
 OLD_FILES+=usr/share/groff_font/devps/symbol.sed
 OLD_FILES+=usr/share/groff_font/devps/symbolchars
 OLD_FILES+=usr/share/groff_font/devps/symbolsl.afm
 OLD_FILES+=usr/share/groff_font/devps/symbolsl.pfa
 OLD_FILES+=usr/share/groff_font/devps/text.enc
 OLD_FILES+=usr/share/groff_font/devps/textmap
 OLD_FILES+=usr/share/groff_font/devps/zapfdr.pfa
 OLD_DIRS+=usr/share/groff_font/devps
 OLD_FILES+=usr/share/groff_font/devutf8/B
 OLD_FILES+=usr/share/groff_font/devutf8/BI
 OLD_FILES+=usr/share/groff_font/devutf8/CW
 OLD_FILES+=usr/share/groff_font/devutf8/DESC
 OLD_FILES+=usr/share/groff_font/devutf8/I
 OLD_FILES+=usr/share/groff_font/devutf8/L
 OLD_FILES+=usr/share/groff_font/devutf8/R
 OLD_FILES+=usr/share/groff_font/devutf8/S
 OLD_DIRS+=usr/share/groff_font/devutf8
 OLD_DIRS+=usr/share/groff_font
 OLD_FILES+=usr/share/man/man1/addftinfo.1.gz
 OLD_FILES+=usr/share/man/man1/afmtodit.1.gz
 OLD_FILES+=usr/share/man/man1/checknr.1.gz
 OLD_FILES+=usr/share/man/man1/colcrt.1.gz
 OLD_FILES+=usr/share/man/man1/eqn.1.gz
 OLD_FILES+=usr/share/man/man1/grn.1.gz
 OLD_FILES+=usr/share/man/man1/grodvi.1.gz
 OLD_FILES+=usr/share/man/man1/groff.1.gz
 OLD_FILES+=usr/share/man/man1/grog.1.gz
 OLD_FILES+=usr/share/man/man1/grolbp.1.gz
 OLD_FILES+=usr/share/man/man1/grolj4.1.gz
 OLD_FILES+=usr/share/man/man1/grops.1.gz
 OLD_FILES+=usr/share/man/man1/grotty.1.gz
 OLD_FILES+=usr/share/man/man1/hpftodit.1.gz
 OLD_FILES+=usr/share/man/man1/indxbib.1.gz
 OLD_FILES+=usr/share/man/man1/lkbib.1.gz
 OLD_FILES+=usr/share/man/man1/lookbib.1.gz
 OLD_FILES+=usr/share/man/man1/mmroff.1.gz
 OLD_FILES+=usr/share/man/man1/neqn.1.gz
 OLD_FILES+=usr/share/man/man1/nroff.1.gz
 OLD_FILES+=usr/share/man/man1/pfbtops.1.gz
 OLD_FILES+=usr/share/man/man1/pic.1.gz
 OLD_FILES+=usr/share/man/man1/psroff.1.gz
 OLD_FILES+=usr/share/man/man1/refer.1.gz
 OLD_FILES+=usr/share/man/man1/tbl.1.gz
 OLD_FILES+=usr/share/man/man1/tfmtodit.1.gz
 OLD_FILES+=usr/share/man/man1/troff.1.gz
 OLD_FILES+=usr/share/man/man1/vgrind.1.gz
 OLD_FILES+=usr/share/man/man5/groff_font.5.gz
 OLD_FILES+=usr/share/man/man5/groff_out.5.gz
 OLD_FILES+=usr/share/man/man5/groff_tmac.5.gz
 OLD_FILES+=usr/share/man/man5/lj4_font.5.gz
 OLD_FILES+=usr/share/man/man5/tmac.5.gz
 OLD_FILES+=usr/share/man/man5/vgrindefs.5.gz
 OLD_FILES+=usr/share/man/man7/ditroff.7.gz
 OLD_FILES+=usr/share/man/man7/groff.7.gz
 OLD_FILES+=usr/share/man/man7/groff_char.7.gz
 OLD_FILES+=usr/share/man/man7/groff_diff.7.gz
 OLD_FILES+=usr/share/man/man7/groff_man.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mdoc.7.gz
 OLD_FILES+=usr/share/man/man7/groff_me.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mm.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mmse.7.gz
 OLD_FILES+=usr/share/man/man7/groff_ms.7.gz
 OLD_FILES+=usr/share/man/man7/groff_trace.7.gz
 OLD_FILES+=usr/share/man/man7/groff_www.7.gz
 OLD_FILES+=usr/share/man/man7/mdoc.samples.7.gz
 OLD_FILES+=usr/share/man/man7/me.7.gz
 OLD_FILES+=usr/share/man/man7/mm.7.gz
 OLD_FILES+=usr/share/man/man7/mmse.7.gz
 OLD_FILES+=usr/share/man/man7/ms.7.gz
 OLD_FILES+=usr/share/man/man7/orig_me.7.gz
 OLD_FILES+=usr/share/me/acm.me
 OLD_FILES+=usr/share/me/chars.me
 OLD_FILES+=usr/share/me/deltext.me
 OLD_FILES+=usr/share/me/eqn.me
 OLD_FILES+=usr/share/me/float.me
 OLD_FILES+=usr/share/me/footnote.me
 OLD_FILES+=usr/share/me/index.me
 OLD_FILES+=usr/share/me/letterhead.me
 OLD_FILES+=usr/share/me/local.me
 OLD_FILES+=usr/share/me/null.me
 OLD_FILES+=usr/share/me/refer.me
 OLD_FILES+=usr/share/me/revisions
 OLD_FILES+=usr/share/me/sh.me
 OLD_FILES+=usr/share/me/tbl.me
 OLD_FILES+=usr/share/me/thesis.me
 OLD_DIRS+=usr/share/me
 OLD_FILES+=usr/share/misc/vgrindefs
 OLD_FILES+=usr/share/misc/vgrindefs.db
 OLD_FILES+=usr/share/tmac/X.tmac
 OLD_FILES+=usr/share/tmac/Xps.tmac
 OLD_FILES+=usr/share/tmac/a4.tmac
 OLD_FILES+=usr/share/tmac/an-old.tmac
 OLD_FILES+=usr/share/tmac/an.tmac
 OLD_FILES+=usr/share/tmac/andoc.tmac
 OLD_FILES+=usr/share/tmac/composite.tmac
 OLD_FILES+=usr/share/tmac/cp1047.tmac
 OLD_FILES+=usr/share/tmac/devtag.tmac
 OLD_FILES+=usr/share/tmac/doc.tmac
 OLD_FILES+=usr/share/tmac/dvi.tmac
 OLD_FILES+=usr/share/tmac/e.tmac
 OLD_FILES+=usr/share/tmac/ec.tmac
 OLD_FILES+=usr/share/tmac/eqnrc
 OLD_FILES+=usr/share/tmac/europs.tmac
 OLD_FILES+=usr/share/tmac/html-end.tmac
 OLD_FILES+=usr/share/tmac/html.tmac
 OLD_FILES+=usr/share/tmac/hyphen.ru
 OLD_FILES+=usr/share/tmac/hyphen.us
 OLD_FILES+=usr/share/tmac/hyphenex.us
 OLD_FILES+=usr/share/tmac/koi8-r.tmac
 OLD_FILES+=usr/share/tmac/latin1.tmac
 OLD_FILES+=usr/share/tmac/latin2.tmac
 OLD_FILES+=usr/share/tmac/latin9.tmac
 OLD_FILES+=usr/share/tmac/lbp.tmac
 OLD_FILES+=usr/share/tmac/lj4.tmac
 OLD_FILES+=usr/share/tmac/m.tmac
 OLD_FILES+=usr/share/tmac/man.local
 OLD_FILES+=usr/share/tmac/man.tmac
 OLD_FILES+=usr/share/tmac/mandoc.tmac
 OLD_FILES+=usr/share/tmac/mdoc.local
 OLD_FILES+=usr/share/tmac/mdoc.tmac
 OLD_FILES+=usr/share/tmac/mdoc/doc-common
 OLD_FILES+=usr/share/tmac/mdoc/doc-ditroff
 OLD_FILES+=usr/share/tmac/mdoc/doc-nroff
 OLD_FILES+=usr/share/tmac/mdoc/doc-syms
 OLD_FILES+=usr/share/tmac/mdoc/fr.ISO8859-1
 OLD_FILES+=usr/share/tmac/mdoc/ru.KOI8-R
 OLD_DIRS+=usr/share/tmac/mdoc
 OLD_FILES+=usr/share/tmac/me.tmac
 OLD_FILES+=usr/share/tmac/mm/0.MT
 OLD_FILES+=usr/share/tmac/mm/4.MT
 OLD_FILES+=usr/share/tmac/mm/5.MT
 OLD_FILES+=usr/share/tmac/mm/locale
 OLD_FILES+=usr/share/tmac/mm/mm.tmac
 OLD_FILES+=usr/share/tmac/mm/mmse.tmac
 OLD_FILES+=usr/share/tmac/mm/ms.cov
 OLD_FILES+=usr/share/tmac/mm/se_locale
 OLD_FILES+=usr/share/tmac/mm/se_ms.cov
 OLD_DIRS+=usr/share/tmac/mm
 OLD_FILES+=usr/share/tmac/ms.tmac
 OLD_FILES+=usr/share/tmac/mse.tmac
 OLD_FILES+=usr/share/tmac/papersize.tmac
 OLD_FILES+=usr/share/tmac/pic.tmac
 OLD_FILES+=usr/share/tmac/ps.tmac
 OLD_FILES+=usr/share/tmac/psatk.tmac
 OLD_FILES+=usr/share/tmac/psold.tmac
 OLD_FILES+=usr/share/tmac/pspic.tmac
 OLD_FILES+=usr/share/tmac/s.tmac
 OLD_FILES+=usr/share/tmac/safer.tmac
 OLD_FILES+=usr/share/tmac/tmac.orig_me
 OLD_FILES+=usr/share/tmac/tmac.vgrind
 OLD_FILES+=usr/share/tmac/trace.tmac
 OLD_FILES+=usr/share/tmac/troffrc
 OLD_FILES+=usr/share/tmac/troffrc-end
 OLD_FILES+=usr/share/tmac/tty-char.tmac
 OLD_FILES+=usr/share/tmac/tty.tmac
 OLD_FILES+=usr/share/tmac/unicode.tmac
 OLD_FILES+=usr/share/tmac/www.tmac
 OLD_DIRS+=usr/share/tmac
 # 20170607: remove incorrect atf_check(1) manpage link
 OLD_FILES+=usr/share/man/man1/atf_check.1.gz
 # 20170601: remove stale manpage
 OLD_FILES+=usr/share/man/man2/cap_rights_get.2.gz
 # 20170601: old libifconfig and libifc
 OLD_FILES+=usr/lib/libifc.a
 OLD_FILES+=usr/lib/libifc_p.a
 OLD_FILES+=usr/lib/libifconfig.a
 OLD_FILES+=usr/lib/libifconfig_p.a
 # 20170529: mount.conf(8) -> mount.conf(5)
 OLD_FILES+=usr/share/man/man8/mount.conf.8.gz
 # 20170525: remove misleading template
 OLD_FILES+=usr/share/misc/man.template
 # 20170525: disconnect the roff docs from the build
 OLD_FILES+=usr/share/doc/papers/beyond43.ascii.gz
 OLD_FILES+=usr/share/doc/papers/bio.ascii.gz
 OLD_FILES+=usr/share/doc/papers/contents.ascii.gz
 OLD_FILES+=usr/share/doc/papers/devfs.ascii.gz
 OLD_FILES+=usr/share/doc/papers/diskperf.ascii.gz
 OLD_FILES+=usr/share/doc/papers/fsinterface.ascii.gz
 OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/jail.ascii.gz
 OLD_FILES+=usr/share/doc/papers/kernmalloc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/kerntune.ascii.gz
 OLD_FILES+=usr/share/doc/papers/malloc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/newvm.ascii.gz
 OLD_FILES+=usr/share/doc/papers/releng.ascii.gz
 OLD_FILES+=usr/share/doc/papers/sysperf.ascii.gz
 OLD_FILES+=usr/share/doc/papers/timecounter.ascii.gz
 OLD_DIRS+=usr/share/doc/papers
 OLD_FILES+=usr/share/doc/psd/01.cacm/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/01.cacm
 OLD_FILES+=usr/share/doc/psd/02.implement/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/02.implement
 OLD_FILES+=usr/share/doc/psd/03.iosys/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/03.iosys
 OLD_FILES+=usr/share/doc/psd/04.uprog/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/04.uprog
 OLD_FILES+=usr/share/doc/psd/05.sysman/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/05.sysman
 OLD_FILES+=usr/share/doc/psd/06.Clang/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/06.Clang
 OLD_FILES+=usr/share/doc/psd/12.make/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/12.make
 OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/13.rcs
 OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/13.rcs
 OLD_FILES+=usr/share/doc/psd/15.yacc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/15.yacc
 OLD_FILES+=usr/share/doc/psd/16.lex/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/16.lex
 OLD_FILES+=usr/share/doc/psd/17.m4/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/17.m4
 OLD_FILES+=usr/share/doc/psd/18.gprof/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/18.gprof
 OLD_FILES+=usr/share/doc/psd/20.ipctut/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/20.ipctut
 OLD_FILES+=usr/share/doc/psd/21.ipc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/21.ipc
 OLD_FILES+=usr/share/doc/psd/22.rpcgen/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/22.rpcgen
 OLD_FILES+=usr/share/doc/psd/23.rpc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/23.rpc
 OLD_FILES+=usr/share/doc/psd/24.xdr/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/24.xdr
 OLD_FILES+=usr/share/doc/psd/25.xdrrfc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/25.xdrrfc
 OLD_FILES+=usr/share/doc/psd/26.rpcrfc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/26.rpcrfc
 OLD_FILES+=usr/share/doc/psd/27.nfsrfc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/27.nfsrfc
 OLD_FILES+=usr/share/doc/psd/Title.ascii.gz
 OLD_FILES+=usr/share/doc/psd/contents.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/
 OLD_FILES+=usr/share/doc/smm/01.setup/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/01.setup
 OLD_FILES+=usr/share/doc/smm/02.config/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/02.config
 OLD_FILES+=usr/share/doc/smm/03.fsck/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/03.fsck
 OLD_FILES+=usr/share/doc/smm/04.quotas/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/04.quotas
 OLD_FILES+=usr/share/doc/smm/05.fastfs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/05.fastfs
 OLD_FILES+=usr/share/doc/smm/06.nfs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/06.nfs
 OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/07.lpd
 OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/08.sendmailop
 OLD_FILES+=usr/share/doc/smm/11.timedop/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/11.timedop
 OLD_FILES+=usr/share/doc/smm/12.timed/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/12.timed
 OLD_FILES+=usr/share/doc/smm/18.net/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/18.net
 OLD_FILES+=usr/share/doc/smm/Title.ascii.gz
 OLD_FILES+=usr/share/doc/smm/contents.ascii.gz
 OLD_DIRS+=usr/share/doc/smm
 OLD_FILES+=usr/share/doc/usd/04.csh/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/04.csh
 OLD_FILES+=usr/share/doc/usd/05.dc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/05.dc
 OLD_FILES+=usr/share/doc/usd/06.bc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/06.bc
 OLD_FILES+=usr/share/doc/usd/07.mail/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/07.mail
 OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/10.exref
 OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/11.edit
 OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz
 OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/12.vi
 OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/13.viref
 OLD_FILES+=usr/share/doc/usd/18.msdiffs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/18.msdiffs
 OLD_FILES+=usr/share/doc/usd/19.memacros/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/19.memacros
 OLD_FILES+=usr/share/doc/usd/20.meref/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/20.meref
 OLD_FILES+=usr/share/doc/usd/21.troff/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/21.troff
 OLD_FILES+=usr/share/doc/usd/22.trofftut/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/22.trofftut
 OLD_FILES+=usr/share/doc/usd/Title.ascii.gz
 OLD_FILES+=usr/share/doc/usd/contents.ascii.gz
 OLD_DIRS+=usr/share/doc/usd
 # 20170523: 64-bit inode support, library version bumps
 OLD_LIBS+=lib/libzfs.so.2
 OLD_LIBS+=usr/lib/libarchive.so.6
 OLD_LIBS+=usr/lib/libmilter.so.5
 # 20170427: NATM configuration support removed
 OLD_FILES+=etc/rc.d/atm1
 OLD_FILES+=etc/rc.d/atm2
 OLD_FILES+=etc/rc.d/atm3
 OLD_FILES+=usr/share/man/man8/rc.atm.8.gz
 # 20170426: UMA_ZONE_REFCNT removed
 OLD_FILES+=usr/share/man/man9/uma_find_refcnt.9.gz
 # 20170424: NATM support removed
 OLD_FILES+=rescue/atmconfig
 OLD_FILES+=sbin/atmconfig
 OLD_FILES+=usr/include/bsnmp/snmp_atm.h
 OLD_FILES+=usr/include/dev/utopia/idtphy.h
 OLD_FILES+=usr/include/dev/utopia/suni.h
 OLD_FILES+=usr/include/dev/utopia/utopia.h
 OLD_FILES+=usr/include/dev/utopia/utopia_priv.h
 OLD_DIRS+=usr/include/dev/utopia
 OLD_FILES+=usr/include/net/if_atm.h
 OLD_FILES+=usr/include/netgraph/atm/ng_atm.h
 OLD_FILES+=usr/include/netinet/if_atm.h
 OLD_FILES+=usr/include/netnatm/natm.h
 OLD_FILES+=usr/lib/snmp_atm.so
 OLD_LIBS+=usr/lib/snmp_atm.so.6
 OLD_FILES+=usr/share/doc/atm/atmconfig.help
 OLD_FILES+=usr/share/doc/atm/atmconfig_device.help
 OLD_DIRS+=usr/share/doc/atm
 OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz
 OLD_FILES+=usr/share/man/man4/en.4.gz
 OLD_FILES+=usr/share/man/man4/fatm.4.gz
 OLD_FILES+=usr/share/man/man4/hatm.4.gz
 OLD_FILES+=usr/share/man/man4/if_en.4.gz
 OLD_FILES+=usr/share/man/man4/if_fatm.4.gz
 OLD_FILES+=usr/share/man/man4/if_hatm.4.gz
 OLD_FILES+=usr/share/man/man4/if_patm.4.gz
 OLD_FILES+=usr/share/man/man4/natm.4.gz
 OLD_FILES+=usr/share/man/man4/natmip.4.gz
 OLD_FILES+=usr/share/man/man4/ng_atm.4.gz
 OLD_FILES+=usr/share/man/man4/patm.4.gz
 OLD_FILES+=usr/share/man/man4/utopia.4.gz
 OLD_FILES+=usr/share/man/man8/atmconfig.8.gz
 OLD_FILES+=usr/share/man/man9/utopia.9.gz
 OLD_FILES+=usr/share/snmp/defs/atm_freebsd.def
 OLD_FILES+=usr/share/snmp/defs/atm_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM-FREEBSD-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt
 # 20170420: remove GNU diff
 OLD_FILES+=usr/share/man/man7/diff.7.gz
 # 20170322: rename <x> to <x>_test to match the FreeBSD test suite name scheme
 OLD_FILES+=usr/tests/usr.bin/col/col
 OLD_FILES+=usr/tests/usr.bin/diff/diff
 OLD_FILES+=usr/tests/usr.bin/ident/ident
 OLD_FILES+=usr/tests/usr.bin/mkimg/mkimg
 OLD_FILES+=usr/tests/usr.bin/sdiff/sdiff
 OLD_FILES+=usr/tests/usr.bin/soelim/soelim
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_config
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_etcdir
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupadd
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupdel
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupmod
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_lock
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_useradd
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_userdel
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_usermod
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_usernext
 # 20170319: io_test requires zh_TW.Big5 locale
 OLD_FILES+=usr/tests/lib/libc/locale/io_test
 # 20170319: remove nls for non supported Big5* locales
 OLD_DIRS+=usr/share/nls/zh_HK.Big5HKSCS
 OLD_DIRS+=usr/share/nls/zh_TW.Big5
 # 20170313: move .../sys/geom/eli/... to .../sys/geom/class/eli/...
 OLD_FILES+=usr/tests/sys/geom/eli/pbkdf2/pbkdf2
 OLD_FILES+=usr/tests/sys/geom/eli/pbkdf2/Kyuafile
 OLD_FILES+=usr/tests/sys/geom/eli/Kyuafile
 OLD_DIRS+=usr/tests/sys/geom/eli/pbkdf2
 OLD_DIRS+=usr/tests/sys/geom/eli
 # 20170313: sbin/ipftest and ipresend temporarily disconnected
 OLD_FILES+=sbin/ipftest
 OLD_FILES+=sbin/ipresend
 OLD_FILES+=usr/share/man/man1/ipftest.1.gz
 OLD_FILES+=usr/share/man/man1/ipresend.1.gz
 # 20170311: Remove WITHOUT_MANDOCDB option
 OLD_FILES+=usr/share/man/man1/makewhatis.1.gz
 # 20170308: rename some tests
 OLD_FILES+=usr/tests/bin/pwait/pwait
 OLD_FILES+=usr/tests/usr.bin/timeout/timeout
 # 20170307: remove pcap-int.h
 OLD_FILES+=usr/include/pcap-int.h
 # 20170302: new libc++ import which bumps version from 3.9.1 to 4.0.0
 OLD_FILES+=usr/include/c++/v1/__undef___deallocate
 OLD_FILES+=usr/include/c++/v1/tr1/__undef___deallocate
 # 20170302: new clang import which bumps version from 3.9.1 to 4.0.0
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.9.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.9.1/include/msa.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.9.1/include
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.9.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.9.1/lib
 OLD_DIRS+=usr/lib/clang/3.9.1
 # 20170226: SVR4 compatibility removed
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/streams.4
 OLD_FILES+=usr/share/man/man4/svr4.4
 .endif
 # 20170219: OpenPAM RADULA upgrade removed the libpam tests
 OLD_FILES+=usr/tests/lib/libpam/Kyuafile
 OLD_FILES+=usr/tests/lib/libpam/t_openpam_ctype
 OLD_FILES+=usr/tests/lib/libpam/t_openpam_readlinev
 OLD_FILES+=usr/tests/lib/libpam/t_openpam_readword
 OLD_DIRS+=usr/test/lib/libpam
 # 20170216: remove ahb(4)
 OLD_FILES+=usr/share/man/man4/ahb.4.gz
 # 20170216: remove fea(4)
 OLD_FILES+=usr/share/man/man4/fea.4.gz
 # 20170206: remove bdes(1)
 OLD_FILES+=usr/bin/bdes
 OLD_FILES+=usr/share/man/man1/bdes.1.gz
 # 20170206: merged projects/ipsec
 OLD_FILES+=usr/include/netinet/ip_ipsec.h
 OLD_FILES+=usr/include/netinet6/ip6_ipsec.h
 # 20170128: remove pc98 support
 OLD_FILES+=usr/include/dev/ic/i8251.h
 OLD_FILES+=usr/include/dev/ic/i8255.h
 OLD_FILES+=usr/include/dev/ic/rsa.h
 OLD_FILES+=usr/include/dev/ic/wd33c93reg.h
 OLD_FILES+=usr/include/sys/disk/pc98.h
 OLD_FILES+=usr/include/sys/diskpc98.h
 OLD_FILES+=usr/share/man/man4/i386/ct.4.gz
 OLD_FILES+=usr/share/man/man4/i386/snc.4.gz
 OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.kbd
 OLD_FILES+=usr/share/vt/keymaps/jp.pc98.iso.kbd
 OLD_FILES+=usr/share/vt/keymaps/jp.pc98.kbd
 # 20170110: Four files from ggate tests consolidated into one
 OLD_FILES+=usr/tests/sys/geom/class/gate/1_test
 OLD_FILES+=usr/tests/sys/geom/class/gate/2_test
 OLD_FILES+=usr/tests/sys/geom/class/gate/3_test
 OLD_FILES+=usr/tests/sys/geom/class/gate/conf.sh
 # 20170103: libbsnmptools.so made into an INTERNALLIB
 OLD_FILES+=usr/lib/libbsnmptools.a
 OLD_FILES+=usr/lib/libbsnmptools_p.a
 OLD_LIBS+=usr/lib/libbsnmptools.so.0
 OLD_FILES+=usr/lib/libbsnmptools.so
 # 20170102: sysdecode_getfsstat_flags() renamed to sysdecode_getfsstat_mode()
 OLD_FILES+=usr/share/man/man3/sysdecode_getfsstat_flags.3.gz
 # 20161230: libarchive ACL pax test renamed to test_acl_pax_posix1e.tar.uu
 OLD_FILES+=usr/tests/lib/libarchive/test_acl_pax.tar.uu
 # 20161229: Three files from gnop tests consolidated into one
 OLD_FILES+=usr/tests/sys/geom/class/nop/1_test
 OLD_FILES+=usr/tests/sys/geom/class/nop/2_test
 OLD_FILES+=usr/tests/sys/geom/class/nop/conf.sh
 # 20161217: new clang import which bumps version from 3.9.0 to 3.9.1
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.9.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.9.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.9.0/include
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.9.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.9.0/lib
 OLD_DIRS+=usr/lib/clang/3.9.0
 # 20161205: libproc version bump
 OLD_LIBS+=usr/lib/libproc.so.3
 # 20161127: Remove vm_page_cache(9)
 OLD_FILES+=usr/share/man/man9/vm_page_cache.9.gz
 # 20161124: new clang import which bumps version from 3.8.0 to 3.9.0
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.8.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.8.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.8.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.8.0/include
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.8.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.8.0/lib
 OLD_DIRS+=usr/lib/clang/3.8.0
 # 20161121: Hyper-V manuals only apply to amd64 and i386
 .if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "i386"
 OLD_FILES+=usr/share/man/man4/hv_kvp.4.gz
 OLD_FILES+=usr/share/man/man4/hv_netvsc.4.gz
 OLD_FILES+=usr/share/man/man4/hv_storvsc.4.gz
 OLD_FILES+=usr/share/man/man4/hv_utils.4.gz
 OLD_FILES+=usr/share/man/man4/hv_vmbus.4.gz
 OLD_FILES+=usr/share/man/man4/hv_vss.4.gz
 .endif
 # 20161118: Remove hv_ata_pci_disengage(4)
 OLD_FILES+=usr/share/man/man4/hv_ata_pci_disengage.4.gz
 # 20161017: urtwn(4) was merged into rtwn(4)
 OLD_FILES+=usr/share/man/man4/if_urtwn.4.gz
 OLD_FILES+=usr/share/man/man4/urtwn.4.gz
 OLD_FILES+=usr/share/man/man4/urtwnfw.4.gz
 # 20161015: Remove GNU rcs
 OLD_FILES+=usr/bin/ci
 OLD_FILES+=usr/bin/co
 OLD_FILES+=usr/bin/merge
 OLD_FILES+=usr/bin/rcs
 OLD_FILES+=usr/bin/rcsclean
 OLD_FILES+=usr/bin/rcsdiff
 OLD_FILES+=usr/bin/rcsfreeze
 OLD_FILES+=usr/bin/rcsmerge
 OLD_FILES+=usr/bin/rlog
 OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/13.rcs
 OLD_FILES+=usr/share/man/man1/ci.1.gz
 OLD_FILES+=usr/share/man/man1/co.1.gz
 OLD_FILES+=usr/share/man/man1/merge.1.gz
 OLD_FILES+=usr/share/man/man1/rcs.1.gz
 OLD_FILES+=usr/share/man/man1/rcsclean.1.gz
 OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz
 OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz
 OLD_FILES+=usr/share/man/man1/rcsintro.1.gz
 OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz
 OLD_FILES+=usr/share/man/man1/rlog.1.gz
 OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
 # 20161010: remove link to removed m_getclr(9) macro
 OLD_FILES+=usr/share/man/man9/m_getclr.9.gz
 # 20161003: MK_ELFCOPY_AS_OBJCOPY option retired
 OLD_FILES+=usr/bin/elfcopy
 OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
 # 20160906: libkqueue tests moved to /usr/tests/sys/kqueue/libkqueue
 OLD_FILES+=usr/tests/sys/kqueue/kqtest
 OLD_FILES+=usr/tests/sys/kqueue/kqueue_test
 # 20160903: idle page zeroing support removed
 OLD_FILES+=usr/share/man/man9/pmap_zero_idle.9.gz
 # 20160901: Remove digi(4)
 OLD_FILES+=usr/share/man/man4/digi.4.gz
 # 20160819: Remove ie(4)
 OLD_FILES+=usr/share/man/man4/i386/ie.4.gz
 # 20160819: Remove spic(4)
 OLD_FILES+=usr/share/man/man4/spic.4.gz
 # 20160819: Remove wl(4) and wlconfig(8)
 OLD_FILES+=usr/share/man/man4/i386/wl.4.gz
 OLD_FILES+=usr/sbin/wlconfig
 OLD_FILES+=usr/share/man/man8/i386/wlconfig.8.gz
 # 20160819: Remove si(4) and sicontrol(8)
 OLD_FILES+=usr/share/man/man4/si.4.gz
 OLD_FILES+=usr/sbin/sicontrol
 OLD_FILES+=usr/share/man/man8/sicontrol.8.gz
 # 20160819: Remove scd(4)
 OLD_FILES+=usr/share/man/man4/scd.4.gz
 # 20160815: Remove mcd(4)
 OLD_FILES+=usr/share/man/man4/mcd.4.gz
 # 20160805: lockmgr_waiters(9) removed
 OLD_FILES+=usr/share/man/man9/lockmgr_waiters.9.gz
 # 20160703: POSIXify locales with variants
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_TW.UTF-8
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_TW.Big5
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_HK.UTF-8
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.eucCN
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.UTF-8
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.GBK
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB2312
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB18030
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Latn_RS.UTF-8
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Latn_RS.ISO8859-2
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Cyrl_RS.UTF-8
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Cyrl_RS.ISO8859-5
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/mn_Cyrl_MN.UTF-8
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/kk_Cyrl_KZ.UTF-8
 # 20160608: removed pam_verbose_error
 OLD_LIBS+=usr/lib/libpam.so.5
 OLD_LIBS+=usr/lib/pam_chroot.so.5
 OLD_LIBS+=usr/lib/pam_deny.so.5
 OLD_LIBS+=usr/lib/pam_echo.so.5
 OLD_LIBS+=usr/lib/pam_exec.so.5
 OLD_LIBS+=usr/lib/pam_ftpusers.so.5
 OLD_LIBS+=usr/lib/pam_group.so.5
 OLD_LIBS+=usr/lib/pam_guest.so.5
 OLD_LIBS+=usr/lib/pam_krb5.so.5
 OLD_LIBS+=usr/lib/pam_ksu.so.5
 OLD_LIBS+=usr/lib/pam_lastlog.so.5
 OLD_LIBS+=usr/lib/pam_login_access.so.5
 OLD_LIBS+=usr/lib/pam_nologin.so.5
 OLD_LIBS+=usr/lib/pam_opie.so.5
 OLD_LIBS+=usr/lib/pam_opieaccess.so.5
 OLD_LIBS+=usr/lib/pam_passwdqc.so.5
 OLD_LIBS+=usr/lib/pam_permit.so.5
 OLD_LIBS+=usr/lib/pam_radius.so.5
 OLD_LIBS+=usr/lib/pam_rhosts.so.5
 OLD_LIBS+=usr/lib/pam_rootok.so.5
 OLD_LIBS+=usr/lib/pam_securetty.so.5
 OLD_LIBS+=usr/lib/pam_self.so.5
 OLD_LIBS+=usr/lib/pam_ssh.so.5
 OLD_LIBS+=usr/lib/pam_tacplus.so.5
 OLD_LIBS+=usr/lib/pam_unix.so.5
 # 20160523: remove extranous ALTQ files
 OLD_FILES+=usr/include/altq/altq_codel.h
 OLD_FILES+=usr/include/altq/altq_fairq.h
 # 20160519: remove DTrace Toolkit from base
 OLD_FILES+=usr/sbin/dtruss
 OLD_FILES+=usr/share/dtrace/toolkit/execsnoop
 OLD_FILES+=usr/share/dtrace/toolkit/hotkernel
 OLD_FILES+=usr/share/dtrace/toolkit/hotuser
 OLD_FILES+=usr/share/dtrace/toolkit/opensnoop
 OLD_FILES+=usr/share/dtrace/toolkit/procsystime
 OLD_DIRS+=usr/share/dtrace/toolkit
 OLD_FILES+=usr/share/man/man1/dtruss.1.gz
 # 20160519: stale MLINK removed
 OLD_FILES+=usr/share/man/man9/rman_await_resource.9.gz
 # 20160517: ReiserFS removed
 OLD_FILES+=usr/share/man/man5/reiserfs.5.gz
 # 20160504: tests rework
 OLD_FILES+=usr/tests/lib/libc/regex/data/README
 # 20160430: kvm_getfiles(3) removed from kvm(3)
 OLD_LIBS+=lib/libkvm.so.6
 OLD_FILES+=usr/share/man/man3/kvm_getfiles.3.gz
 # 20160423: remove mroute6d
 OLD_FILES+=etc/rc.d/mroute6d
 # 20160419: rename units.lib -> definitions.units
 OLD_FILES+=usr/share/misc/units.lib
 # 20160419: remove Big5HKSCS locales
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_HK.Big5HKSCS
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_HK.Big5HKSCS
 # 20160317: rman_res_t size bump to uintmax_t
 OLD_LIBS+=usr/lib/libdevinfo.so.5
 # 20160305: new clang import which bumps version from 3.7.1 to 3.8.0
 OLD_FILES+=usr/bin/macho-dump
 OLD_FILES+=usr/bin/tblgen
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.7.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.7.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.7.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.7.1/include
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.7.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.7.1/lib
 OLD_DIRS+=usr/lib/clang/3.7.1
 OLD_FILES+=usr/share/man/man1/tblgen.1.gz
 # 20160301: Remove taskqueue_enqueue_fast
 OLD_FILES+=usr/share/man/man9/taskqueue_enqueue_fast.9.gz
 # 20160225: Remove casperd and libcapsicum
 OLD_FILES+=sbin/casperd
 OLD_FILES+=etc/rc.d/casperd
 OLD_FILES+=usr/share/man/man8/casperd.8.gz
 OLD_FILES+=usr/include/libcapsicum.h
 OLD_FILES+=usr/include/libcapsicum_service.h
 OLD_FILES+=usr/include/libcapsicum.h
 OLD_FILES+=usr/share/man/man3/libcapsicum.3.gz
 OLD_FILES+=usr/include/libcapsicum_dns.h
 OLD_FILES+=usr/include/libcapsicum_grp.h
 OLD_FILES+=usr/include/libcapsicum_impl.h
 OLD_FILES+=usr/include/libcapsicum_pwd.h
 OLD_FILES+=usr/include/libcapsicum_random.h
 OLD_FILES+=usr/include/libcapsicum_sysctl.h
 OLD_FILES+=libexec/casper/dns
 OLD_FILES+=libexec/casper/grp
 OLD_FILES+=libexec/casper/pwd
 OLD_FILES+=libexec/casper/random
 OLD_FILES+=libexec/casper/sysctl
 OLD_FILES+=libexec/casper/.debug/random.debug
 OLD_FILES+=libexec/casper/.debug/dns.debug
 OLD_FILES+=libexec/casper/.debug/sysctl.debug
 OLD_FILES+=libexec/casper/.debug/pwd.debug
 OLD_FILES+=libexec/casper/.debug/grp.debug
 OLD_DIRS+=libexec/casper/.debug
 OLD_DIRS+=libexec/casper
 OLD_FILES+=usr/lib/libcapsicum.a
 OLD_FILES+=usr/lib/libcapsicum.so
 OLD_LIBS+=lib/libcapsicum.so.0
 OLD_FILES+=usr/lib/libcapsicum_p.a
 # 20160223: functionality from mkulzma(1) merged into mkuzip(1)
 OLD_FILES+=usr/bin/mkulzma
 OLD_FILES+=usr/share/man/man4/geom_uncompress.4.gz
 OLD_FILES+=usr/share/man/man8/mkulzma.8.gz
 # 20160211: Remove obsolete unbound-control-setup
 OLD_FILES+=usr/sbin/unbound-control-setup
 # 20160121: cc.h moved
 OLD_FILES+=usr/include/netinet/cc.h
 # 20160116: Update mandoc to cvs snapshot 20160116
 OLD_FILES+=usr/share/mdocml/example.style.css
 OLD_FILES+=usr/share/mdocml/style.css
 OLD_DIRS+=usr/share/mdocml
 # 20160114: SA-16:06.snmpd
 OLD_FILES+=usr/share/examples/etc/snmpd.config
 # 20160107: GNU ld installed as ld.bfd and linked as ld
 OLD_FILES+=usr/lib/debug/usr/bin/ld.debug
 # 20151225: new clang import which bumps version from 3.7.0 to 3.7.1
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.7.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.7.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.7.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.7.0/include
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.7.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.7.0/lib
 OLD_DIRS+=usr/lib/clang/3.7.0
 # 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406)
 MOVED_LIBS+=usr/lib/libelf.so.2
 # 20151115: Fox bad upgrade scheme
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/zh_Hans_CN.GB18030
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/zh_Hans_CN.GB2312
 OLD_FILES+=usr/share/locale/zh_CN.GBK/zh_Hans_CN.GBK
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/zh_Hans_CN.UTF-8
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/zh_Hans_CN.eucCN
 OLD_FILES+=usr/share/locale/zh_TW.Big5/zh_Hant_TW.Big5
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/zh_Hant_TW.UTF-8
 # 20151107: String collation improvements
 OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE
 OLD_DIRS+=usr/share/locale/UTF-8
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_COLLATE
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_CTYPE
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MESSAGES
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MONETARY
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_NUMERIC
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_TIME
 OLD_DIRS+=usr/share/locale/kk_KZ.PT154/
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-1
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-13/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-13/LC_CTYPE
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-13
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-15
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-2
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-4
 OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.US-ASCII
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_TIME
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_COLLATE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MONETARY
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_CTYPE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_NUMERIC
 OLD_DIRS+=usr/share/locale/lt_LT.ISO8859-4
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/no_NO.ISO8859-1
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/no_NO.ISO8859-15
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/no_NO.UTF-8
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_TIME
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_MONETARY
 OLD_DIRS+=usr/share/locale/sr_YU.ISO8859-2
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_TIME
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_MESSAGES
 OLD_DIRS+=usr/share/locale/sr_YU.ISO8859-5
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MESSAGES
 OLD_DIRS+=usr/share/locale/sr_YU.UTF-8
 # 20151101: added missing _test suffix on multiple tests in lib/libc
 OLD_FILES+=usr/tests/lib/libc/c063/faccessat
 OLD_FILES+=usr/tests/lib/libc/c063/fchmodat
 OLD_FILES+=usr/tests/lib/libc/c063/fchownat
 OLD_FILES+=usr/tests/lib/libc/c063/fexecve
 OLD_FILES+=usr/tests/lib/libc/c063/fstatat
 OLD_FILES+=usr/tests/lib/libc/c063/linkat
 OLD_FILES+=usr/tests/lib/libc/c063/mkdirat
 OLD_FILES+=usr/tests/lib/libc/c063/mkfifoat
 OLD_FILES+=usr/tests/lib/libc/c063/mknodat
 OLD_FILES+=usr/tests/lib/libc/c063/openat
 OLD_FILES+=usr/tests/lib/libc/c063/readlinkat
 OLD_FILES+=usr/tests/lib/libc/c063/renameat
 OLD_FILES+=usr/tests/lib/libc/c063/symlinkat
 OLD_FILES+=usr/tests/lib/libc/c063/unlinkat
 OLD_FILES+=usr/tests/lib/libc/c063/utimensat
 OLD_FILES+=usr/tests/lib/libc/string/memchr
 OLD_FILES+=usr/tests/lib/libc/string/memcpy
 OLD_FILES+=usr/tests/lib/libc/string/memmem
 OLD_FILES+=usr/tests/lib/libc/string/memset
 OLD_FILES+=usr/tests/lib/libc/string/strcat
 OLD_FILES+=usr/tests/lib/libc/string/strchr
 OLD_FILES+=usr/tests/lib/libc/string/strcmp
 OLD_FILES+=usr/tests/lib/libc/string/strcpy
 OLD_FILES+=usr/tests/lib/libc/string/strcspn
 OLD_FILES+=usr/tests/lib/libc/string/strerror
 OLD_FILES+=usr/tests/lib/libc/string/strlen
 OLD_FILES+=usr/tests/lib/libc/string/strpbrk
 OLD_FILES+=usr/tests/lib/libc/string/strrchr
 OLD_FILES+=usr/tests/lib/libc/string/strspn
 OLD_FILES+=usr/tests/lib/libc/string/swab
 # 20151101: 430.status-rwho was renamed to 430.status-uptime
 OLD_FILES+=etc/periodic/daily/430.status-rwho
 # 20151030: OpenSSL 1.0.2d import
 OLD_FILES+=usr/share/openssl/man/man3/CMS_set1_signer_certs.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_ctrl.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_ctrl_str.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_509_CRL_fp.3.gz
 OLD_LIBS+=lib/libcrypto.so.7
 OLD_LIBS+=usr/lib/libssl.so.7
 # 20151029: LinuxKPI moved to sys/compat/linuxkpi
 OLD_FILES+=usr/include/dev/usb/usb_compat_linux.h
 # 20151015: test symbols moved to /usr/lib/debug
 OLD_DIRS+=usr/tests/lib/atf/libatf-c++/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/atf_c++_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/build_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/check_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/config_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/macros_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/tests_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/utils_test.debug
 OLD_DIRS+=usr/tests/lib/atf/libatf-c++/detail/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/application_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/env_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/exceptions_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/fs_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/process_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/sanity_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/text_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/version_helper.debug
 OLD_DIRS+=usr/tests/lib/atf/libatf-c/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/atf_c_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/build_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/check_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/config_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/error_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/macros_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/tc_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/tp_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/utils_test.debug
 OLD_DIRS+=usr/tests/lib/atf/libatf-c/detail/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/dynstr_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/env_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/fs_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/list_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/map_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/process_helpers.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/process_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/sanity_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/text_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/user_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/version_helper.debug
 OLD_DIRS+=usr/tests/lib/atf/test-programs/.debug
 OLD_FILES+=usr/tests/lib/atf/test-programs/.debug/c_helpers.debug
 OLD_FILES+=usr/tests/lib/atf/test-programs/.debug/cpp_helpers.debug
 OLD_DIRS+=usr/tests/lib/libc/c063/.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/faccessat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fchmodat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fchownat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fexecve.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fstatat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/linkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/mkdirat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/mkfifoat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/mknodat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/openat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/readlinkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/renameat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/symlinkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/unlinkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/utimensat.debug
 OLD_DIRS+=usr/tests/lib/libc/db/.debug
 OLD_FILES+=usr/tests/lib/libc/db/.debug/h_db.debug
 OLD_DIRS+=usr/tests/lib/libc/gen/.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/alarm_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/arc4random_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/assert_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/basedirname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/dir_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/floatunditf_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fnmatch_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpclassify2_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpclassify_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpsetmask_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpsetround_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/ftok_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/getcwd_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/getgrent_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/glob_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/humanize_number_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/isnan_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/nice_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/pause_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/raise_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/realpath_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/setdomainname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/sethostname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/sleep_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/syslog_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/time_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/ttyname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/vis_test.debug
 OLD_DIRS+=usr/tests/lib/libc/gen/execve/.debug
 OLD_FILES+=usr/tests/lib/libc/gen/execve/.debug/execve_test.debug
 OLD_DIRS+=usr/tests/lib/libc/gen/posix_spawn/.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/fileactions_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/h_fileactions.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/h_spawn.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/h_spawnattr.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/spawn_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/spawnattr_test.debug
 OLD_DIRS+=usr/tests/lib/libc/hash/.debug
 OLD_FILES+=usr/tests/lib/libc/hash/.debug/h_hash.debug
 OLD_FILES+=usr/tests/lib/libc/hash/.debug/sha2_test.debug
 OLD_DIRS+=usr/tests/lib/libc/inet/.debug
 OLD_FILES+=usr/tests/lib/libc/inet/.debug/inet_network_test.debug
 OLD_DIRS+=usr/tests/lib/libc/locale/.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/io_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbrtowc_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbsnrtowcs_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbstowcs_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbtowc_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcscspn_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcspbrk_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcsspn_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcstod_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wctomb_test.debug
 OLD_DIRS+=usr/tests/lib/libc/net/.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/ether_aton_test.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/getprotoent_test.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_dns_server.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_nsd_recurse.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_protoent.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_servent.debug
 OLD_DIRS+=usr/tests/lib/libc/regex/.debug
 OLD_FILES+=usr/tests/lib/libc/regex/.debug/exhaust_test.debug
 OLD_FILES+=usr/tests/lib/libc/regex/.debug/h_regex.debug
 OLD_FILES+=usr/tests/lib/libc/regex/.debug/regex_att_test.debug
 OLD_DIRS+=usr/tests/lib/libc/ssp/.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_fgets.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_getcwd.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_gets.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_memcpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_memmove.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_memset.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_raw.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_read.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_readlink.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_snprintf.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_sprintf.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_stpcpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_stpncpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strcat.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strcpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strncat.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strncpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_vsnprintf.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_vsprintf.debug
 OLD_DIRS+=usr/tests/lib/libc/stdio/.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/clearerr_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fflush_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fmemopen2_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fmemopen_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fopen_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fputc_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/mktemp_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/popen_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/printf_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/scanf_test.debug
 OLD_DIRS+=usr/tests/lib/libc/stdlib/.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/abs_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/atoi_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/div_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/exit_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/getenv_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/h_getopt.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/h_getopt_long.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/hsearch_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/posix_memalign_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/random_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/strtod_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/strtol_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/system_test.debug
 OLD_DIRS+=usr/tests/lib/libc/string/.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memchr.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memcpy.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memmem.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memset.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcat.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strchr.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcmp.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcpy.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcspn.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strerror.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strlen.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strpbrk.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strrchr.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strspn.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/swab.debug
 OLD_DIRS+=usr/tests/lib/libc/sys/.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/access_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/chroot_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/clock_gettime_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/connect_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/dup_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/fsync_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getcontext_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getgroups_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getitimer_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getlogin_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getpid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getrusage_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getsid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/gettimeofday_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/issetugid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/kevent_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/kill_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/link_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/listen_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mincore_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mkdir_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mkfifo_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mknod_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mlock_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mmap_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mprotect_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgctl_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgget_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgrcv_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgsnd_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msync_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/nanosleep_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/pipe2_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/pipe_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/poll_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/revoke_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/select_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/setrlimit_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/setuid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/sigaction_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/sigqueue_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/sigtimedwait_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/socketpair_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/stat_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/timer_create_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/truncate_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/ucontext_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/umask_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/unlink_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/write_test.debug
 OLD_DIRS+=usr/tests/lib/libc/termios/.debug
 OLD_FILES+=usr/tests/lib/libc/termios/.debug/tcsetpgrp_test.debug
 OLD_DIRS+=usr/tests/lib/libc/tls/.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/h_tls_dlopen.so.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/libh_tls_dynamic.so.1.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/tls_dlopen_test.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/tls_dynamic_test.debug
 OLD_DIRS+=usr/tests/lib/libc/ttyio/.debug
 OLD_FILES+=usr/tests/lib/libc/ttyio/.debug/ttyio_test.debug
 OLD_DIRS+=usr/tests/lib/libcrypt/.debug
 OLD_FILES+=usr/tests/lib/libcrypt/.debug/crypt_tests.debug
 OLD_DIRS+=usr/tests/lib/libmp/.debug
 OLD_FILES+=usr/tests/lib/libmp/.debug/legacy_test.debug
 OLD_DIRS+=usr/tests/lib/libnv/.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/dnv_tests.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nv_array_tests.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nv_tests.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_add_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_exists_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_free_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_get_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_move_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_send_recv_test.debug
 OLD_DIRS+=usr/tests/lib/libpam/.debug
 OLD_FILES+=usr/tests/lib/libpam/.debug/t_openpam_ctype.debug
 OLD_FILES+=usr/tests/lib/libpam/.debug/t_openpam_readlinev.debug
 OLD_FILES+=usr/tests/lib/libpam/.debug/t_openpam_readword.debug
 OLD_DIRS+=usr/tests/lib/libproc/.debug
 OLD_FILES+=usr/tests/lib/libproc/.debug/proc_test.debug
 OLD_FILES+=usr/tests/lib/libproc/.debug/target_prog.debug
 OLD_DIRS+=usr/tests/lib/librt/.debug
 OLD_FILES+=usr/tests/lib/librt/.debug/sched_test.debug
 OLD_FILES+=usr/tests/lib/librt/.debug/sem_test.debug
 OLD_DIRS+=usr/tests/lib/libthr/.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/barrier_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/cond_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/condwait_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/detach_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/equal_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/fork_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/fpu_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_atexit.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_cancel.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_exit.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_resolv.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/join_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/kill_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/mutex_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/once_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/preempt_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/rwlock_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sem_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/siglongjmp_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sigmask_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sigsuspend_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sleep_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/swapcontext_test.debug
 OLD_DIRS+=usr/tests/lib/libthr/dlopen/.debug
 OLD_FILES+=usr/tests/lib/libthr/dlopen/.debug/dlopen_test.debug
 OLD_FILES+=usr/tests/lib/libthr/dlopen/.debug/h_pthread_dlopen.so.1.debug
 OLD_FILES+=usr/tests/lib/libthr/dlopen/.debug/main_pthread_create_test.debug
 OLD_DIRS+=usr/tests/lib/libutil/.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/flopen_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/grp_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/humanize_number_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/pidfile_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/trimdomain-nodomain_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/trimdomain_test.debug
 OLD_DIRS+=usr/tests/lib/libxo/.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/libenc_test.so.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_01.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_02.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_03.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_04.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_05.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_06.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_07.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_08.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_09.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_10.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_11.debug
 OLD_DIRS+=usr/tests/lib/msun/.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/acos_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/asin_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/atan_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/cbrt_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/ceil_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/cos_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/cosh_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/erf_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/exp_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/fmod_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/infinity_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/ldexp_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/log_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/pow_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/precision_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/round_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/scalbn_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/sin_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/sinh_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/sqrt_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/tan_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/tanh_test.debug
 OLD_DIRS+=usr/tests/libexec/rtld-elf/.debug
 OLD_FILES+=usr/tests/libexec/rtld-elf/.debug/ld_library_pathfds.debug
 OLD_FILES+=usr/tests/libexec/rtld-elf/.debug/libpythagoras.so.0.debug
 OLD_FILES+=usr/tests/libexec/rtld-elf/.debug/target.debug
 OLD_DIRS+=usr/tests/sbin/devd/.debug
 OLD_FILES+=usr/tests/sbin/devd/.debug/client_test.debug
 OLD_DIRS+=usr/tests/sbin/dhclient/.debug
 OLD_FILES+=usr/tests/sbin/dhclient/.debug/option-domain-search_test.debug
 OLD_DIRS+=usr/tests/share/examples/tests/atf/.debug
 OLD_FILES+=usr/tests/share/examples/tests/atf/.debug/printf_test.debug
 OLD_DIRS+=usr/tests/share/examples/tests/plain/.debug
 OLD_FILES+=usr/tests/share/examples/tests/plain/.debug/printf_test.debug
 OLD_DIRS+=usr/tests/sys/aio/.debug
 OLD_FILES+=usr/tests/sys/aio/.debug/aio_kqueue_test.debug
 OLD_FILES+=usr/tests/sys/aio/.debug/aio_test.debug
 OLD_FILES+=usr/tests/sys/aio/.debug/lio_kqueue_test.debug
 OLD_DIRS+=usr/tests/sys/fifo/.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_create.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_io.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_misc.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_open.debug
 OLD_DIRS+=usr/tests/sys/file/.debug
 OLD_FILES+=usr/tests/sys/file/.debug/closefrom_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/dup_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/fcntlflags_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/flock_helper.debug
 OLD_FILES+=usr/tests/sys/file/.debug/ftruncate_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/newfileops_on_fork_test.debug
 OLD_DIRS+=usr/tests/sys/kern/.debug
 OLD_FILES+=usr/tests/sys/kern/.debug/kern_descrip_test.debug
 OLD_FILES+=usr/tests/sys/kern/.debug/ptrace_test.debug
 OLD_FILES+=usr/tests/sys/kern/.debug/unix_seqpacket_test.debug
 OLD_DIRS+=usr/tests/sys/kern/execve/.debug
 OLD_FILES+=usr/tests/sys/kern/execve/.debug/execve_helper.debug
 OLD_FILES+=usr/tests/sys/kern/execve/.debug/good_aout.debug
 OLD_DIRS+=usr/tests/sys/kqueue/.debug
 OLD_FILES+=usr/tests/sys/kqueue/.debug/kqtest.debug
 OLD_DIRS+=usr/tests/sys/mqueue/.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest1.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest2.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest3.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest4.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest5.debug
 OLD_DIRS+=usr/tests/sys/netinet/.debug
 OLD_FILES+=usr/tests/sys/netinet/.debug/udp_dontroute.debug
 OLD_DIRS+=usr/tests/sys/pjdfstest/.debug
 OLD_FILES+=usr/tests/sys/pjdfstest/.debug/pjdfstest.debug
 OLD_DIRS+=usr/tests/sys/vm/.debug
 OLD_FILES+=usr/tests/sys/vm/.debug/mmap_test.debug
 # 20151015: Rename files due to file-installed-as-dir bug
 OLD_FILES+=usr/share/doc/legal/realtek
 OLD_FILES+=usr/share/doc/legal/realtek/LICENSE
 OLD_DIRS+=usr/share/doc/legal/realtek
 OLD_DIRS+=usr/share/doc/legal/intel_ipw
 OLD_FILES+=usr/share/doc/legal/intel_ipw/LICENSE
 OLD_FILES+=usr/share/doc/legal/intel_iwn
 OLD_FILES+=usr/share/doc/legal/intel_iwn/LICENSE
 OLD_DIRS+=usr/share/doc/legal/intel_iwn
 OLD_DIRS+=usr/share/doc/legal/intel_iwi
 OLD_FILES+=usr/share/doc/legal/intel_iwi/LICENSE
 OLD_DIRS+=usr/share/doc/legal/intel_wpi
 OLD_FILES+=usr/share/doc/legal/intel_wpi/LICENSE
 # 20151006: new libc++ import
 OLD_FILES+=usr/include/c++/__tuple_03
 OLD_FILES+=usr/include/c++/v1/__tuple_03
 OLD_FILES+=usr/include/c++/v1/tr1/__tuple_03
 # 20151006: new clang import which bumps version from 3.6.1 to 3.7.0
 OLD_FILES+=usr/lib/clang/3.6.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.6.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/xopintrin.h
 OLD_DIRS+=usr/lib/clang/3.6.1/include
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.6.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.6.1/lib
 OLD_DIRS+=usr/lib/clang/3.6.1
 # 20150928: unused sgsmsg utility is removed
 OLD_FILES+=usr/bin/sgsmsg
 # 20150926: remove links to removed/unimplemented mbuf(9) macros
 OLD_FILES+=usr/share/man/man9/MEXT_ADD_REF.9.gz
 OLD_FILES+=usr/share/man/man9/MEXTFREE.9.gz
 OLD_FILES+=usr/share/man/man9/MEXT_IS_REF.9.gz
 OLD_FILES+=usr/share/man/man9/MEXT_REM_REF.9.gz
 OLD_FILES+=usr/share/man/man9/MFREE.9.gz
 # 20150818: *allocm() are gone in jemalloc 4.0.0
 OLD_FILES+=usr/share/man/man3/allocm.3.gz
 OLD_FILES+=usr/share/man/man3/dallocm.3.gz
 OLD_FILES+=usr/share/man/man3/nallocm.3.gz
 OLD_FILES+=usr/share/man/man3/rallocm.3.gz
 OLD_FILES+=usr/share/man/man3/sallocm.3.gz
 # 20150802: Remove netbsd's test on pw(8)
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_test
 # 20150719: Remove libarchive.pc
 OLD_FILES+=usr/libdata/pkgconfig/libarchive.pc
 # 20150705: Rename DTrace provider man pages
 OLD_FILES+=usr/share/man/man4/dtrace-io.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-ip.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-proc.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-sched.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-tcp.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-udp.4.gz
 # 20150704: nvlist private headers no longer installed
 OLD_FILES+=usr/include/sys/nv_impl.h
 OLD_FILES+=usr/include/sys/nvlist_impl.h
 OLD_FILES+=usr/include/sys/nvpair_impl.h
 # 20150624
 OLD_LIBS+=usr/lib/libugidfw.so.4
 # 20150604: Move nvlist man pages to section 9
 OLD_FILES+=usr/share/man/man3/libnv.3.gz
 OLD_FILES+=usr/share/man/man3/nv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_stringf.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_stringv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_clone.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_create.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_dump.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_empty.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_error.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_fdump.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_flags.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_parent.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_next.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_pack.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_recv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_send.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_set_error.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_size.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_unpack.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_xfer.3.gz
 # 20150702: Remove duplicated nvlist includes
 OLD_FILES+=usr/include/dnv.h
 OLD_FILES+=usr/include/nv.h
 # 20150528: PCI IOV device driver methods moved to a separate kobj interface
 OLD_FILES+=usr/share/man/man9/PCI_ADD_VF.9.gz
 OLD_FILES+=usr/share/man/man9/PCI_INIT_IOV.9.gz
 OLD_FILES+=usr/share/man/man9/PCI_UNINIT_IOV.9.gz
 # 20150525: new clang import which bumps version from 3.6.0 to 3.6.1
 OLD_FILES+=usr/lib/clang/3.6.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.6.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/xopintrin.h
 OLD_DIRS+=usr/lib/clang/3.6.0/include
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.6.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.6.0/lib
 OLD_DIRS+=usr/lib/clang/3.6.0
 # 20150521
 OLD_FILES+=usr/bin/demandoc
 OLD_FILES+=usr/share/man/man1/demandoc.1.gz
 OLD_FILES+=usr/share/man/man3/mandoc.3.gz
 OLD_FILES+=usr/share/man/man3/mandoc_headers.3.gz
 # 20150520
 OLD_FILES+=usr/lib/libheimsqlite.a
 OLD_FILES+=usr/lib/libheimsqlite.so
 OLD_LIBS+=usr/lib/libheimsqlite.so.11
 OLD_FILES+=usr/lib/libheimsqlite_p.a
 # 20150506
 OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz
 # 20150504
 OLD_FILES+=usr/share/examples/etc/libmap32.conf
 OLD_FILES+=usr/include/bsdstat.h
 OLD_DIRS+=usr/lib32/private
 OLD_LIBS+=usr/lib/private/libatf-c++.so.2
 OLD_LIBS+=usr/lib/private/libbsdstat.so.1
 OLD_LIBS+=usr/lib/private/libheimipcs.so.11
 OLD_LIBS+=usr/lib/private/libsqlite3.so.0
 OLD_LIBS+=usr/lib/private/libunbound.so.5
 OLD_LIBS+=usr/lib/private/libatf-c.so.1
 OLD_LIBS+=usr/lib/private/libheimipcc.so.11
 OLD_LIBS+=usr/lib/private/libldns.so.5
 OLD_LIBS+=usr/lib/private/libssh.so.5
 OLD_LIBS+=usr/lib/private/libucl.so.1
 OLD_DIRS+=usr/lib/private
 # 20150501
 OLD_FILES+=usr/bin/soeliminate
 OLD_FILES+=usr/share/man/man1/soeliminate.1.gz
 # 20150501: Remove the nvlist_.*[vf] functions manpages
 OLD_FILES+=usr/share/man/man3/nvlist_addf_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_string.3.gz
 # 20150429: remove never written documentation
 OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz
 # 20150427: test/sys/kern/mmap_test moved to test/sys/vm/mmap_test
 OLD_FILES+=usr/tests/sys/kern/mmap_test
 # 20150422: zlib.c moved from net to libkern
 OLD_FILES+=usr/include/net/zlib.h
 OLD_FILES+=usr/include/net/zutil.h
 # 20150418
 OLD_FILES+=sbin/mount_oldnfs
 OLD_FILES+=usr/share/man/man8/mount_oldnfs.8.gz
 # 20150416: ALTQ moved to net/altq
 OLD_FILES+=usr/include/altq/altq_rmclass_debug.h
 OLD_FILES+=usr/include/altq/altq.h
 OLD_FILES+=usr/include/altq/altq_cdnr.h
 OLD_FILES+=usr/include/altq/altq_hfsc.h
 OLD_FILES+=usr/include/altq/altq_priq.h
 OLD_FILES+=usr/include/altq/altqconf.h
 OLD_FILES+=usr/include/altq/altq_classq.h
 OLD_FILES+=usr/include/altq/altq_red.h
 OLD_FILES+=usr/include/altq/if_altq.h
 OLD_FILES+=usr/include/altq/altq_var.h
 OLD_FILES+=usr/include/altq/altq_rmclass.h
 OLD_FILES+=usr/include/altq/altq_cbq.h
 OLD_FILES+=usr/include/altq/altq_rio.h
 OLD_DIRS+=usr/include/altq
 # 20150330: ntp 4.2.8p1
 OLD_FILES+=usr/share/doc/ntp/driver1.html
 OLD_FILES+=usr/share/doc/ntp/driver10.html
 OLD_FILES+=usr/share/doc/ntp/driver11.html
 OLD_FILES+=usr/share/doc/ntp/driver12.html
 OLD_FILES+=usr/share/doc/ntp/driver16.html
 OLD_FILES+=usr/share/doc/ntp/driver18.html
 OLD_FILES+=usr/share/doc/ntp/driver19.html
 OLD_FILES+=usr/share/doc/ntp/driver2.html
 OLD_FILES+=usr/share/doc/ntp/driver20.html
 OLD_FILES+=usr/share/doc/ntp/driver22.html
 OLD_FILES+=usr/share/doc/ntp/driver26.html
 OLD_FILES+=usr/share/doc/ntp/driver27.html
 OLD_FILES+=usr/share/doc/ntp/driver28.html
 OLD_FILES+=usr/share/doc/ntp/driver29.html
 OLD_FILES+=usr/share/doc/ntp/driver3.html
 OLD_FILES+=usr/share/doc/ntp/driver30.html
 OLD_FILES+=usr/share/doc/ntp/driver32.html
 OLD_FILES+=usr/share/doc/ntp/driver33.html
 OLD_FILES+=usr/share/doc/ntp/driver34.html
 OLD_FILES+=usr/share/doc/ntp/driver35.html
 OLD_FILES+=usr/share/doc/ntp/driver36.html
 OLD_FILES+=usr/share/doc/ntp/driver37.html
 OLD_FILES+=usr/share/doc/ntp/driver4.html
 OLD_FILES+=usr/share/doc/ntp/driver5.html
 OLD_FILES+=usr/share/doc/ntp/driver6.html
 OLD_FILES+=usr/share/doc/ntp/driver7.html
 OLD_FILES+=usr/share/doc/ntp/driver8.html
 OLD_FILES+=usr/share/doc/ntp/driver9.html
 OLD_FILES+=usr/share/doc/ntp/ldisc.html
 OLD_FILES+=usr/share/doc/ntp/measure.html
 OLD_FILES+=usr/share/doc/ntp/mx4200data.html
 OLD_FILES+=usr/share/doc/ntp/notes.html
 OLD_FILES+=usr/share/doc/ntp/patches.html
 OLD_FILES+=usr/share/doc/ntp/porting.html
 OLD_FILES+=usr/share/man/man1/sntp.1.gz
 # 20150329
 .if ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/bootconfig.h
 .endif
 # 20150326
 OLD_FILES+=usr/share/man/man1/pmcstudy.1.gz
 # 20150315: new clang import which bumps version from 3.5.1 to 3.6.0
 OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.5.1/altivec.h
 OLD_FILES+=usr/include/clang/3.5.1/ammintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/arm_acle.h
 OLD_FILES+=usr/include/clang/3.5.1/arm_neon.h
 OLD_FILES+=usr/include/clang/3.5.1/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/avxintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/cpuid.h
 OLD_FILES+=usr/include/clang/3.5.1/emmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/ia32intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/immintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.5.1/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.5.1/mmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/module.modulemap
 OLD_FILES+=usr/include/clang/3.5.1/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/shaintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/smmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/x86intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.5.1
 OLD_DIRS+=usr/include/clang
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.5.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.5.1/lib
 OLD_DIRS+=usr/lib/clang/3.5.1
 # 20150302: binutils documentation distributed as a manpage
 OLD_FILES+=usr/share/doc/binutils/as.txt
 OLD_FILES+=usr/share/doc/binutils/ld.txt
 OLD_DIRS+=usr/share/doc/binutils
 # 20150222: Removed bcd(6) and ppt(6)
 OLD_FILES+=usr/bin/bcd
 OLD_FILES+=usr/bin/ppt
 OLD_FILES+=usr/share/man/man6/bcd.6.gz
 OLD_FILES+=usr/share/man/man6/ppt.6.gz
 # 20150217: Removed remnants of ar(4) driver
 OLD_FILES+=usr/include/dev/ic/hd64570.h
 # 20150212: /usr/games moving into /usr/bin
 OLD_FILES+=usr/games/bcd
 OLD_FILES+=usr/games/caesar
 OLD_FILES+=usr/games/factor
 OLD_FILES+=usr/games/fortune
 OLD_FILES+=usr/games/grdc
 OLD_FILES+=usr/games/morse
 OLD_FILES+=usr/games/number
 OLD_FILES+=usr/games/pom
 OLD_FILES+=usr/games/ppt
 OLD_FILES+=usr/games/primes
 OLD_FILES+=usr/games/random
 OLD_FILES+=usr/games/rot13
 OLD_FILES+=usr/games/strfile
 OLD_FILES+=usr/games/unstr
 OLD_DIRS+=usr/games
 # 20150209: liblzma header
 OLD_FILES+=usr/include/lzma/lzma.h
 # 20150124: spl.9 and friends
 OLD_FILES+=usr/share/man/man9/spl.9.gz
 OLD_FILES+=usr/share/man/man9/spl0.9.gz
 OLD_FILES+=usr/share/man/man9/splbio.9.gz
 OLD_FILES+=usr/share/man/man9/splclock.9.gz
 OLD_FILES+=usr/share/man/man9/splhigh.9.gz
 OLD_FILES+=usr/share/man/man9/splimp.9.gz
 OLD_FILES+=usr/share/man/man9/splnet.9.gz
 OLD_FILES+=usr/share/man/man9/splsoftclock.9.gz
 OLD_FILES+=usr/share/man/man9/splsofttty.9.gz
 OLD_FILES+=usr/share/man/man9/splstatclock.9.gz
 OLD_FILES+=usr/share/man/man9/spltty.9.gz
 OLD_FILES+=usr/share/man/man9/splvm.9.gz
 OLD_FILES+=usr/share/man/man9/splx.9.gz
 # 20150118: toeplitz.c moved from netinet to net
 OLD_FILES+=usr/include/netinet/toeplitz.h
 # 20150118: new clang import which bumps version from 3.5.0 to 3.5.1
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.5.0/altivec.h
 OLD_FILES+=usr/include/clang/3.5.0/ammintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/arm_acle.h
 OLD_FILES+=usr/include/clang/3.5.0/arm_neon.h
 OLD_FILES+=usr/include/clang/3.5.0/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/avxintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/cpuid.h
 OLD_FILES+=usr/include/clang/3.5.0/emmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/ia32intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/immintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.5.0/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.5.0/mmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/module.modulemap
 OLD_FILES+=usr/include/clang/3.5.0/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/shaintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/smmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/x86intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.5.0
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.5.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.5.0/lib
 OLD_DIRS+=usr/lib/clang/3.5.0
 # 20150102: removal of asr(4)
 OLD_FILES+=usr/share/man/man4/asr.4.gz
 # 20150102: removal of texinfo
 OLD_FILES+=usr/bin/info
 OLD_FILES+=usr/bin/infokey
 OLD_FILES+=usr/bin/install-info
 OLD_FILES+=usr/bin/makeinfo
 OLD_FILES+=usr/bin/texindex
 OLD_FILES+=usr/share/info/am-utils.info.gz
 OLD_FILES+=usr/share/info/as.info.gz
 OLD_FILES+=usr/share/info/binutils.info.gz
 OLD_FILES+=usr/share/info/com_err.info.gz
 OLD_FILES+=usr/share/info/cpp.info.gz
 OLD_FILES+=usr/share/info/cppinternals.info.gz
 OLD_FILES+=usr/share/info/diff.info.gz
 OLD_FILES+=usr/share/info/dir
 OLD_FILES+=usr/share/info/gcc.info.gz
 OLD_FILES+=usr/share/info/gccint.info.gz
 OLD_FILES+=usr/share/info/gdb.info.gz
 OLD_FILES+=usr/share/info/gdbint.info.gz
 OLD_FILES+=usr/share/info/gperf.info.gz
 OLD_FILES+=usr/share/info/grep.info.gz
 OLD_FILES+=usr/share/info/groff.info.gz
 OLD_FILES+=usr/share/info/heimdal.info.gz
 OLD_FILES+=usr/share/info/history.info.gz
 OLD_FILES+=usr/share/info/info-stnd.info.gz
 OLD_FILES+=usr/share/info/info.info.gz
 OLD_FILES+=usr/share/info/ld.info.gz
 OLD_FILES+=usr/share/info/regex.info.gz
 OLD_FILES+=usr/share/info/rluserman.info.gz
 OLD_FILES+=usr/share/info/stabs.info.gz
 OLD_FILES+=usr/share/info/texinfo.info.gz
 OLD_FILES+=usr/share/man/man1/info.1.gz
 OLD_FILES+=usr/share/man/man1/infokey.1.gz
 OLD_FILES+=usr/share/man/man1/install-info.1.gz
 OLD_FILES+=usr/share/man/man1/makeinfo.1.gz
 OLD_FILES+=usr/share/man/man1/texindex.1.gz
 OLD_FILES+=usr/share/man/man5/info.5.gz
 OLD_FILES+=usr/share/man/man5/texinfo.5.gz
 OLD_DIRS+=usr/share/info
 # 20141231: new clang import which bumps version from 3.4.1 to 3.5.0
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.4.1/altivec.h
 OLD_FILES+=usr/include/clang/3.4.1/ammintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/arm_neon.h
 OLD_FILES+=usr/include/clang/3.4.1/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/avxintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/cpuid.h
 OLD_FILES+=usr/include/clang/3.4.1/emmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/immintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.4.1/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.4.1/mmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/module.map
 OLD_FILES+=usr/include/clang/3.4.1/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/shaintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/smmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/x86intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.4.1
 # 20141225: Remove gpib/ieee488
 OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h
 OLD_FILES+=usr/include/dev/ieee488/tnt4882.h
 OLD_FILES+=usr/include/dev/ieee488/ugpib.h
 OLD_FILES+=usr/include/dev/ieee488/upd7210.h
 OLD_DIRS+=usr/include/dev/ieee488
 OLD_FILES+=usr/include/gpib/gpib.h
 OLD_DIRS+=usr/include/gpib
 OLD_FILES+=usr/lib/libgpib.a
 OLD_FILES+=usr/lib/libgpib_p.a
 OLD_FILES+=usr/lib/libgpib.so
 OLD_LIBS+=usr/lib/libgpib.so.3
 OLD_FILES+=usr/share/man/man3/gpib.3.gz
 OLD_FILES+=usr/share/man/man3/ibclr.3.gz
 OLD_FILES+=usr/share/man/man3/ibdev.3.gz
 OLD_FILES+=usr/share/man/man3/ibdma.3.gz
 OLD_FILES+=usr/share/man/man3/ibeos.3.gz
 OLD_FILES+=usr/share/man/man3/ibeot.3.gz
 OLD_FILES+=usr/share/man/man3/ibloc.3.gz
 OLD_FILES+=usr/share/man/man3/ibonl.3.gz
 OLD_FILES+=usr/share/man/man3/ibpad.3.gz
 OLD_FILES+=usr/share/man/man3/ibrd.3.gz
 OLD_FILES+=usr/share/man/man3/ibsad.3.gz
 OLD_FILES+=usr/share/man/man3/ibsic.3.gz
 OLD_FILES+=usr/share/man/man3/ibtmo.3.gz
 OLD_FILES+=usr/share/man/man3/ibtrg.3.gz
 OLD_FILES+=usr/share/man/man3/ibwrt.3.gz
 OLD_FILES+=usr/share/man/man4/gpib.4.gz
 OLD_FILES+=usr/share/man/man4/pcii.4.gz
 OLD_FILES+=usr/share/man/man4/tnt4882.4.gz
 # 20141224: libxo moved to /lib
 MOVED_LIBS+=usr/lib/libxo.so.0
 # 20141223: remove in6_gif.h and in_gif.h
 OLD_FILES+=usr/include/netinet/in_gif.h
 OLD_FILES+=usr/include/netinet6/in6_gif.h
 # 20141209: pw tests broken into a file per command
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_delete
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_modify
 # 20141202: update to mandoc CVS 20141201
 OLD_FILES+=usr.bin/preconv
 OLD_FILES+=usr/share/man/man1/preconv.1.gz
 # 20141129: mrouted rc.d scripts removed from base
 OLD_FILES+=etc/rc.d/mrouted
 # 20141126: convert sbin/mdconfig/tests to ATF format tests
 OLD_FILES+=usr/tests/sbin/mdconfig/legacy_test
 OLD_FILES+=usr/tests/sbin/mdconfig/mdconfig.test
 OLD_FILES+=usr/tests/sbin/mdconfig/run.pl
 # 20141126: remove xform_ipip decapsulation fallback
 OLD_FILES+=usr/include/netipsec/ipip_var.h
 # 20141122: mandoc updated to 1.13.1
 OLD_FILES+=usr/share/mdocml/external.png
 # 20141111: SF_KQUEUE code removed
 OLD_FILES+=usr/include/sys/sf_base.h
 OLD_FILES+=usr/include/sys/sf_sync.h
 # 20141109: faith/faithd removal
 OLD_FILES+=etc/rc.d/faith
 OLD_FILES+=usr/share/man/man4/faith.4.gz
 OLD_FILES+=usr/share/man/man4/if_faith.4.gz
 OLD_FILES+=usr/sbin/faithd
 OLD_FILES+=usr/share/man/man8/faithd.8.gz
 # 20141107: overhaul if_gre(4)
 OLD_FILES+=usr/include/netinet/ip_gre.h
 # 20141102: postrandom obsoleted by new /dev/random code
 OLD_FILES+=etc/rc.d/postrandom
 # 20141031: initrandom obsoleted by new /dev/random code
 OLD_FILES+=etc/rc.d/initrandom
 # 20141030: atf 0.21 import
 OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz
 # 20141028: debug files accidentally installed as directory name
 OLD_FILES+=usr/lib/debug/usr/lib/i18n
 OLD_FILES+=usr/lib/debug/usr/lib/private
 OLD_FILES+=usr/lib/debug/usr/lib32/i18n
 OLD_FILES+=usr/lib/debug/usr/lib32/private
 # 20141015: OpenSSL 1.0.1j import
 OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz
 # 20141003: libproc version bump
 OLD_LIBS+=usr/lib/libproc.so.2
 # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed
 OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz
 OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz
 # 20140917: hv_kvpd rc.d script removed in favor of devd configuration
 OLD_FILES+=etc/rc.d/hv_kvpd
 # 20140917: libnv was accidentally being installed to /usr/lib instead of /lib
 MOVED_LIBS+=usr/lib/libnv.so.0
 # 20140829: rc.d/kerberos removed
 OLD_FILES+=etc/rc.d/kerberos
 # 20140814: libopie version bump
 OLD_LIBS+=usr/lib/libopie.so.7
 # 20140811: otp-sha renamed to otp-sha1
 OLD_FILES+=usr/bin/otp-sha
 OLD_FILES+=usr/share/man/man1/otp-sha.1.gz
 # 20140807: Remove private lib files that should not be installed
 OLD_FILES+=usr/lib/private/libatf-c.a
 OLD_FILES+=usr/lib/private/libatf-c.so
 OLD_FILES+=usr/lib/private/libatf-c_p.a
 OLD_FILES+=usr/lib/private/libatf-c++.a
 OLD_FILES+=usr/lib/private/libatf-c++.so
 OLD_FILES+=usr/lib/private/libatf-c++_p.a
 OLD_FILES+=usr/lib/private/libbsdstat.a
 OLD_FILES+=usr/lib/private/libbsdstat.so
 OLD_FILES+=usr/lib/private/libbsdstat_p.a
 OLD_FILES+=usr/lib/private/libheimipcc.a
 OLD_FILES+=usr/lib/private/libheimipcc.so
 OLD_FILES+=usr/lib/private/libheimipcc_p.a
 OLD_FILES+=usr/lib/private/libheimipcs.a
 OLD_FILES+=usr/lib/private/libheimipcs.so
 OLD_FILES+=usr/lib/private/libheimipcs_p.a
 OLD_FILES+=usr/lib/private/libldns.a
 OLD_FILES+=usr/lib/private/libldns.so
 OLD_FILES+=usr/lib/private/libldns_p.a
 OLD_FILES+=usr/lib/private/libssh.a
 OLD_FILES+=usr/lib/private/libssh.so
 OLD_FILES+=usr/lib/private/libssh_p.a
 OLD_FILES+=usr/lib/private/libunbound.a
 OLD_FILES+=usr/lib/private/libunbound.so
 OLD_FILES+=usr/lib/private/libunbound_p.a
 OLD_FILES+=usr/lib/private/libucl.a
 OLD_FILES+=usr/lib/private/libucl.so
 OLD_FILES+=usr/lib/private/libucl_p.a
 # 20140803: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_change_wiring.9.gz
 # 20140731
 OLD_FILES+=usr/share/man/man9/SYSCTL_ADD_OID.9.gz
 # 20140728: libsbuf restored to old version
 OLD_LIBS+=lib/libsbuf.so.7
 # 20140728: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz
 # 20140723: renamed to PCBGROUP.9
 OLD_FILES+=usr/share/man/man9/PCBGROUPS.9.gz
 # 20140722: browse_packages_ftp.sh removed
 OLD_FILES+=usr/share/examples/bsdconfig/browse_packages_ftp.sh
 # 20140718: Remove obsolete man pages
 OLD_FILES+=usr/share/man/man9/zero_copy.9.gz
 OLD_FILES+=usr/share/man/man9/zero_copy_sockets.9.gz
 # 20140718: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_page_protect.9.gz
 # 20140717: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_clear_reference.9.gz
 # 20140716: Remove an incorrectly named man page
 OLD_FILES+=usr/share/man/man9/pmap_ts_modified.9.gz
 # 20140712: Removal of bsd.dtrace.mk
 OLD_FILES+=usr/share/mk/bsd.dtrace.mk
 # 20140705: turn libreadline into an internal lib
 OLD_LIBS+=lib/libreadline.so.8
 OLD_FILES+=usr/lib/libreadline.a
 OLD_FILES+=usr/lib/libreadline_p.a
 OLD_FILES+=usr/lib/libreadline.so
 OLD_FILES+=usr/lib/libhistory.a
 OLD_FILES+=usr/lib/libhistory_p.a
 OLD_FILES+=usr/lib/libhistory.so
 OLD_LIBS+=usr/lib/libhistory.so.8
 OLD_FILES+=usr/include/readline/chardefs.h
 OLD_FILES+=usr/include/readline/history.h
 OLD_FILES+=usr/include/readline/keymaps.h
 OLD_FILES+=usr/include/readline/readline.h
 OLD_FILES+=usr/include/readline/tilde.h
 OLD_FILES+=usr/include/readline/rlconf.h
 OLD_FILES+=usr/include/readline/rlstdc.h
 OLD_FILES+=usr/include/readline/rltypedefs.h
 OLD_FILES+=usr/include/readline/rltypedefs.h
 OLD_DIRS+=usr/include/readline
 OLD_FILES+=usr/share/info/readline.info.gz
 OLD_FILES+=usr/share/man/man3/readline.3.gz
 OLD_FILES+=usr/share/man/man3/rlhistory.3.gz
 # 20140625: csup removal
 OLD_FILES+=usr/bin/csup
 OLD_FILES+=usr/bin/cpasswd
 OLD_FILES+=usr/share/man/man1/csup.1.gz
 OLD_FILES+=usr/share/man/man1/cpasswd.1.gz
 OLD_FILES+=usr/share/examples/cvsup/README
 OLD_FILES+=usr/share/examples/cvsup/cvs-supfile
 OLD_FILES+=usr/share/examples/cvsup/stable-supfile
 OLD_FILES+=usr/share/examples/cvsup/standard-supfile
 OLD_DIRS+=usr/share/examples/cvsup
 # 20140614: send-pr removal
 OLD_FILES+=usr/bin/sendbug
 OLD_FILES+=usr/share/info/send-pr.info.gz
 OLD_FILES+=usr/share/man/man1/send-pr.1.gz
 OLD_FILES+=usr/share/man/man1/sendbug.1.gz
 OLD_FILES+=etc/gnats/freefall
 OLD_DIRS+=etc/gnats
 # 20140512: new clang import which bumps version from 3.4 to 3.4.1
 OLD_FILES+=usr/include/clang/3.4/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.4/altivec.h
 OLD_FILES+=usr/include/clang/3.4/ammintrin.h
 OLD_FILES+=usr/include/clang/3.4/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.4/avxintrin.h
 OLD_FILES+=usr/include/clang/3.4/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.4/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.4/cpuid.h
 OLD_FILES+=usr/include/clang/3.4/emmintrin.h
 OLD_FILES+=usr/include/clang/3.4/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.4/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.4/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.4/immintrin.h
 OLD_FILES+=usr/include/clang/3.4/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.4/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.4/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.4/mmintrin.h
 OLD_FILES+=usr/include/clang/3.4/module.map
 OLD_FILES+=usr/include/clang/3.4/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.4/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.4/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.4/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.4/shaintrin.h
 OLD_FILES+=usr/include/clang/3.4/smmintrin.h
 OLD_FILES+=usr/include/clang/3.4/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.4/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/x86intrin.h
 OLD_FILES+=usr/include/clang/3.4/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/xopintrin.h
 OLD_FILES+=usr/include/clang/3.4/arm_neon.h
 OLD_FILES+=usr/include/clang/3.4/module.map
 OLD_DIRS+=usr/include/clang/3.4
 # 20140505: Bogusly installing src.opts.mk
 OLD_FILES+=usr/share/mk/src.opts.mk
 # 20140505: Reject PR kern/187551
 OLD_FILES+=usr/tests/sbin/ifconfig/fibs_test
 # 20140502: Removal of lindev(4)
 OLD_FILES+=usr/share/man/man4/lindev.4.gz
 # 20140425
 OLD_FILES+=usr/lib/libssp_p.a
 OLD_FILES+=usr/lib/libstand_p.a
 # 20140413: Removed NO_MANCOMPRESS from mount_fusefs
 OLD_FILES+=usr/share/man/man8/mount_fusefs.8
 # 20140314: AppleTalk
 OLD_DIRS+=usr/include/netatalk
 OLD_FILES+=usr/include/netatalk/aarp.h
 OLD_FILES+=usr/include/netatalk/at.h
 OLD_FILES+=usr/include/netatalk/at_extern.h
 OLD_FILES+=usr/include/netatalk/at_var.h
 OLD_FILES+=usr/include/netatalk/ddp.h
 OLD_FILES+=usr/include/netatalk/ddp_pcb.h
 OLD_FILES+=usr/include/netatalk/ddp_var.h
 OLD_FILES+=usr/include/netatalk/endian.h
 OLD_FILES+=usr/include/netatalk/phase2.h
 # 20140314: Remove IPX/SPX
 OLD_LIBS+=lib/libipx.so.5
 OLD_FILES+=usr/include/netipx/ipx.h
 OLD_FILES+=usr/include/netipx/ipx_if.h
 OLD_FILES+=usr/include/netipx/ipx_pcb.h
 OLD_FILES+=usr/include/netipx/ipx_var.h
 OLD_FILES+=usr/include/netipx/spx.h
 OLD_FILES+=usr/include/netipx/spx_debug.h
 OLD_FILES+=usr/include/netipx/spx_timer.h
 OLD_FILES+=usr/include/netipx/spx_var.h
 OLD_DIRS+=usr/include/netipx
 OLD_FILES+=usr/lib/libipx.a
 OLD_FILES+=usr/lib/libipx.so
 OLD_FILES+=usr/lib/libipx_p.a
 OLD_FILES+=usr/sbin/IPXrouted
 OLD_FILES+=usr/share/man/man3/ipx.3.gz
 OLD_FILES+=usr/share/man/man3/ipx_addr.3.gz
 OLD_FILES+=usr/share/man/man3/ipx_ntoa.3.gz
 OLD_FILES+=usr/share/man/man4/ef.4.gz
 OLD_FILES+=usr/share/man/man4/if_ef.4.gz
 OLD_FILES+=usr/share/man/man8/IPXrouted.8.gz
 # 20140314: bsdconfig usermgmt rewrite
 OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/userinput
 # 20140307: bsdconfig groupmgmt rewrite
 OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/groupinput
 # 20140223: Remove libyaml
 OLD_FILES+=usr/lib/private/libyaml.a
 OLD_FILES+=usr/lib/private/libyaml.so
 OLD_LIBS+=usr/lib/private/libyaml.so.1
 OLD_FILES+=usr/lib/private/libyaml_p.a
 # 20140216: new clang import which bumps version from 3.3 to 3.4
 OLD_FILES+=usr/bin/llvm-prof
 OLD_FILES+=usr/include/clang/3.3/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.3/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.3/altivec.h
 OLD_FILES+=usr/include/clang/3.3/ammintrin.h
 OLD_FILES+=usr/include/clang/3.3/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.3/avxintrin.h
 OLD_FILES+=usr/include/clang/3.3/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.3/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.3/cpuid.h
 OLD_FILES+=usr/include/clang/3.3/emmintrin.h
 OLD_FILES+=usr/include/clang/3.3/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.3/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.3/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.3/immintrin.h
 OLD_FILES+=usr/include/clang/3.3/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.3/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.3/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.3/mmintrin.h
 OLD_FILES+=usr/include/clang/3.3/module.map
 OLD_FILES+=usr/include/clang/3.3/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.3/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.3/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.3/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.3/smmintrin.h
 OLD_FILES+=usr/include/clang/3.3/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/x86intrin.h
 OLD_FILES+=usr/include/clang/3.3/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/xopintrin.h
 OLD_FILES+=usr/share/man/man1/llvm-prof.1.gz
 OLD_DIRS+=usr/include/clang/3.3
 # 20140216: nve(4) removed
 OLD_FILES+=usr/share/man/man4/if_nve.4.gz
 OLD_FILES+=usr/share/man/man4/nve.4.gz
 # 20140205: Open Firmware device moved
 OLD_FILES+=usr/include/dev/ofw/ofw_nexus.h
 # 20140128: libelf and libdwarf import
 OLD_LIBS+=usr/lib/libelf.so.1
 OLD_LIBS+=usr/lib/libdwarf.so.3
 # 20140123: apicvar header moved to x86
 OLD_FILES+=usr/include/machine/apicvar.h
 # 20131215: libcam version bumped
 OLD_LIBS+=lib/libcam.so.6
 # 20131202: libcapsicum and libcasper moved to /lib/
 MOVED_LIBS+=usr/lib/libcapsicum.so.0
 MOVED_LIBS+=usr/lib/libcasper.so.0
 # 20131109: extattr(2) mlinks fixed
 OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz
 OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz
 # 20131107: example files removed
 OLD_FILES+=usr/share/examples/libusb20/aux.c
 OLD_FILES+=usr/share/examples/libusb20/aux.h
 # 20131103: WITH_LIBICONV_COMPAT removal
 OLD_FILES+=usr/include/_libiconv_compat.h
 OLD_FILES+=usr/lib/libiconv.a
 OLD_FILES+=usr/lib/libiconv.so
 OLD_LIBS+=usr/lib/libiconv.so.3
 OLD_FILES+=usr/lib/libiconv_p.a
 # 20131103: removal of utxrm(8), use 'utx rm' instead
 OLD_FILES+=usr/sbin/utxrm
 OLD_FILES+=usr/share/man/man8/utxrm.8.gz
 # 20131031: pkg_install has been removed
 OLD_FILES+=etc/periodic/daily/220.backup-pkgdb
 OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
 OLD_FILES+=etc/periodic/security/460.chkportsum
 OLD_FILES+=etc/periodic/weekly/400.status-pkg
 OLD_FILES+=usr/sbin/pkg_add
 OLD_FILES+=usr/sbin/pkg_create
 OLD_FILES+=usr/sbin/pkg_delete
 OLD_FILES+=usr/sbin/pkg_info
 OLD_FILES+=usr/sbin/pkg_updating
 OLD_FILES+=usr/sbin/pkg_version
 OLD_FILES+=usr/share/man/man1/pkg_add.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_create.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_delete.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_info.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_updating.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_version.1.gz
 # 20131030: /etc/keys moved to /usr/share/keys
 OLD_DIRS+=etc/keys
 OLD_DIRS+=etc/keys/pkg
 OLD_DIRS+=etc/keys/pkg/revoked
 OLD_DIRS+=etc/keys/pkg/trusted
 OLD_FILES+=etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
 # 20131028: ng_fec(4) removed
 OLD_FILES+=usr/include/netgraph/ng_fec.h
 OLD_FILES+=usr/share/man/man4/ng_fec.4.gz
 # 20131027: header moved
 OLD_FILES+=usr/include/net/pf_mtag.h
 # 20131023: remove never used iscsi directory
 OLD_DIRS+=usr/share/examples/iscsi
 # 20131021: isf(4) removed
 OLD_FILES+=usr/sbin/isfctl
 OLD_FILES+=usr/share/man/man4/isf.4.gz
 OLD_FILES+=usr/share/man/man8/isfctl.8.gz
 # 20131014: libbsdyml becomes private
 OLD_FILES+=usr/lib/libbsdyml.a
 OLD_FILES+=usr/lib/libbsdyml.so
 OLD_LIBS+=usr/lib/libbsdyml.so.0
 OLD_FILES+=usr/lib/libbsdyml_p.a
 OLD_FILES+=usr/share/man/man3/libbsdyml.3.gz
 OLD_FILES+=usr/include/bsdyml.h
 # 20131013: Removal of the ATF tools
 OLD_FILES+=etc/atf/FreeBSD.conf
 OLD_FILES+=etc/atf/atf-run.hooks
 OLD_FILES+=etc/atf/common.conf
 OLD_FILES+=usr/bin/atf-config
 OLD_FILES+=usr/bin/atf-report
 OLD_FILES+=usr/bin/atf-run
 OLD_FILES+=usr/bin/atf-version
 OLD_FILES+=usr/share/atf/atf-run.hooks
 OLD_FILES+=usr/share/examples/atf/atf-run.hooks
 OLD_FILES+=usr/share/examples/atf/tests-results.css
 OLD_FILES+=usr/share/man/man1/atf-config.1.gz
 OLD_FILES+=usr/share/man/man1/atf-report.1.gz
 OLD_FILES+=usr/share/man/man1/atf-run.1.gz
 OLD_FILES+=usr/share/man/man1/atf-version.1.gz
 OLD_FILES+=usr/share/man/man5/atf-formats.5.gz
 OLD_FILES+=usr/share/xml/atf/tests-results.dtd
 OLD_FILES+=usr/share/xsl/atf/tests-results.xsl
 OLD_DIRS+=etc/atf
 OLD_DIRS+=usr/share/examples/atf
 OLD_DIRS+=usr/share/xml/atf
 OLD_DIRS+=usr/share/xml
 OLD_DIRS+=usr/share/xsl/atf
 OLD_DIRS+=usr/share/xsl
 # 20131009: freebsd-version moved from /libexec to /bin
 OLD_FILES+=libexec/freebsd-version
 # 20131001: ar and ranlib from binutils not used
 OLD_FILES+=usr/bin/gnu-ar
 OLD_FILES+=usr/bin/gnu-ranlib
 OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz
 OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz
 # 20130930: BIND removed from base
 OLD_FILES+=etc/mtree/BIND.chroot.dist
 OLD_FILES+=etc/namedb
 OLD_FILES+=etc/periodic/daily/470.status-named
 OLD_FILES+=usr/bin/dig
 OLD_FILES+=usr/bin/nslookup
 OLD_FILES+=usr/bin/nsupdate
 OLD_DIRS+=usr/include/lwres
 OLD_FILES+=usr/include/lwres/context.h
 OLD_FILES+=usr/include/lwres/int.h
 OLD_FILES+=usr/include/lwres/ipv6.h
 OLD_FILES+=usr/include/lwres/lang.h
 OLD_FILES+=usr/include/lwres/list.h
 OLD_FILES+=usr/include/lwres/lwbuffer.h
 OLD_FILES+=usr/include/lwres/lwpacket.h
 OLD_FILES+=usr/include/lwres/lwres.h
 OLD_FILES+=usr/include/lwres/net.h
 OLD_FILES+=usr/include/lwres/netdb.h
 OLD_FILES+=usr/include/lwres/platform.h
 OLD_FILES+=usr/include/lwres/result.h
 OLD_FILES+=usr/include/lwres/string.h
 OLD_FILES+=usr/include/lwres/version.h
 OLD_FILES+=usr/lib/liblwres.a
 OLD_FILES+=usr/lib/liblwres.so
 OLD_LIBS+=usr/lib/liblwres.so.90
 OLD_FILES+=usr/lib/liblwres_p.a
 OLD_FILES+=usr/sbin/arpaname
 OLD_FILES+=usr/sbin/ddns-confgen
 OLD_FILES+=usr/sbin/dnssec-dsfromkey
 OLD_FILES+=usr/sbin/dnssec-keyfromlabel
 OLD_FILES+=usr/sbin/dnssec-keygen
 OLD_FILES+=usr/sbin/dnssec-revoke
 OLD_FILES+=usr/sbin/dnssec-settime
 OLD_FILES+=usr/sbin/dnssec-signzone
 OLD_FILES+=usr/sbin/dnssec-verify
 OLD_FILES+=usr/sbin/genrandom
 OLD_FILES+=usr/sbin/isc-hmac-fixup
 OLD_FILES+=usr/sbin/lwresd
 OLD_FILES+=usr/sbin/named
 OLD_FILES+=usr/sbin/named-checkconf
 OLD_FILES+=usr/sbin/named-checkzone
 OLD_FILES+=usr/sbin/named-compilezone
 OLD_FILES+=usr/sbin/named-journalprint
 OLD_FILES+=usr/sbin/named.reconfig
 OLD_FILES+=usr/sbin/named.reload
 OLD_FILES+=usr/sbin/nsec3hash
 OLD_FILES+=usr/sbin/rndc
 OLD_FILES+=usr/sbin/rndc-confgen
 OLD_DIRS+=usr/share/doc/bind9
 OLD_FILES+=usr/share/doc/bind9/CHANGES
 OLD_FILES+=usr/share/doc/bind9/COPYRIGHT
 OLD_FILES+=usr/share/doc/bind9/FAQ
 OLD_FILES+=usr/share/doc/bind9/HISTORY
 OLD_FILES+=usr/share/doc/bind9/README
 OLD_DIRS+=usr/share/doc/bind9/arm
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch01.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch02.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch03.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch04.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch05.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch06.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch07.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch08.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch09.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch10.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.pdf
 OLD_FILES+=usr/share/doc/bind9/arm/man.arpaname.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.ddns-confgen.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dig.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-dsfromkey.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keyfromlabel.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keygen.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-revoke.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-settime.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-signzone.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-verify.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.genrandom.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.host.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.isc-hmac-fixup.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkconf.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkzone.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named-journalprint.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.nsec3hash.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.nsupdate.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.rndc-confgen.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.conf.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.html
 OLD_DIRS+=usr/share/doc/bind9/misc
 OLD_FILES+=usr/share/doc/bind9/misc/dnssec
 OLD_FILES+=usr/share/doc/bind9/misc/format-options.pl
 OLD_FILES+=usr/share/doc/bind9/misc/ipv6
 OLD_FILES+=usr/share/doc/bind9/misc/migration
 OLD_FILES+=usr/share/doc/bind9/misc/migration-4to9
 OLD_FILES+=usr/share/doc/bind9/misc/options
 OLD_FILES+=usr/share/doc/bind9/misc/rfc-compliance
 OLD_FILES+=usr/share/doc/bind9/misc/roadmap
 OLD_FILES+=usr/share/doc/bind9/misc/sdb
 OLD_FILES+=usr/share/doc/bind9/misc/sort-options.pl
 OLD_FILES+=usr/share/man/man1/arpaname.1.gz
 OLD_FILES+=usr/share/man/man1/dig.1.gz
 OLD_FILES+=usr/share/man/man1/nslookup.1.gz
 OLD_FILES+=usr/share/man/man1/nsupdate.1.gz
 OLD_FILES+=usr/share/man/man3/lwres.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_addr_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_add.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_back.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_clear.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_first.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_forward.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getmem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint16.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint32.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint8.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_init.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_invalidate.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putmem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint16.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint32.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint8.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_subtract.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_clear.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_get.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_init.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_print.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_config.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_allocmem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_create.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_freemem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_initserial.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_nextserial.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_sendrecv.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_endhostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_endhostent_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_freeaddrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_freehostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabn.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gai_strerror.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getaddrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getaddrsbyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyname2.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyname_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostent_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getipnode.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getipnodebyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getipnodebyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getnamebyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getnameinfo.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getrrsetbyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnba.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_herror.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_hstrerror.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_inetntop.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_lwpacket_parseheader.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_lwpacket_renderheader.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_net_ntop.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noop.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_nooprequest_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_nooprequest_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_nooprequest_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noopresponse_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noopresponse_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noopresponse_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_packet.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_resutil.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_sethostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_sethostent_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_string_parse.3.gz
 OLD_FILES+=usr/share/man/man5/named.conf.5.gz
 OLD_FILES+=usr/share/man/man5/rndc.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ddns-confgen.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-dsfromkey.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-keyfromlabel.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-verify.8.gz
 OLD_FILES+=usr/share/man/man8/genrandom.8.gz
 OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz
 OLD_FILES+=usr/share/man/man8/lwresd.8.gz
 OLD_FILES+=usr/share/man/man8/named-checkconf.8.gz
 OLD_FILES+=usr/share/man/man8/named-checkzone.8.gz
 OLD_FILES+=usr/share/man/man8/named-compilezone.8.gz
 OLD_FILES+=usr/share/man/man8/named-journalprint.8.gz
 OLD_FILES+=usr/share/man/man8/named.8.gz
 OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz
 OLD_FILES+=usr/share/man/man8/named.reload.8.gz
 OLD_FILES+=usr/share/man/man8/nsec3hash.8.gz
 OLD_FILES+=usr/share/man/man8/rndc-confgen.8.gz
 OLD_FILES+=usr/share/man/man8/rndc.8.gz
 OLD_DIRS+=var/named/dev
 OLD_DIRS+=var/named/etc
 OLD_DIRS+=var/named/etc/namedb
 OLD_FILES+=var/named/etc/namedb/PROTO.localhost-v6.rev
 OLD_FILES+=var/named/etc/namedb/PROTO.localhost.rev
 OLD_DIRS+=var/named/etc/namedb/dynamic
 OLD_FILES+=var/named/etc/namedb/make-localhost
 OLD_DIRS+=var/named/etc/namedb/master
 OLD_FILES+=var/named/etc/namedb/master/empty.db
 OLD_FILES+=var/named/etc/namedb/master/localhost-forward.db
 OLD_FILES+=var/named/etc/namedb/master/localhost-reverse.db
 #OLD_FILES+=var/named/etc/namedb/named.conf	# intentionally left out
 OLD_FILES+=var/named/etc/namedb/named.root
 OLD_DIRS+=var/named/etc/namedb/working
 OLD_DIRS+=var/named/etc/namedb/slave
 OLD_DIRS+=var/named/var
 OLD_DIRS+=var/named/var/dump
 OLD_DIRS+=var/named/var/log
 OLD_DIRS+=var/named/var/run
 OLD_DIRS+=var/named/var/run/named
 OLD_DIRS+=var/named/var/stats
 OLD_DIRS+=var/run/named
 # 20130923: example moved
 OLD_FILES+=usr/share/examples/bsdconfig/browse_packages.sh
 # 20130908: libssh becomes private
 OLD_FILES+=usr/lib/libssh.a
 OLD_FILES+=usr/lib/libssh.so
 OLD_LIBS+=usr/lib/libssh.so.5
 OLD_FILES+=usr/lib/libssh_p.a
 # 20130903: gnupatch is no more
 OLD_FILES+=usr/bin/gnupatch
 OLD_FILES+=usr/share/man/man1/gnupatch.1.gz
 # 20130829: bsdpatch is patch unconditionally
 OLD_FILES+=usr/bin/bsdpatch
 OLD_FILES+=usr/share/man/man1/bsdpatch.1.gz
 # 20130822: bind 9.9.3-P2 import
 OLD_LIBS+=usr/lib/liblwres.so.80
 # 20130814: vm_page_busy(9)
 OLD_FILES+=usr/share/man/man9/vm_page_flash.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_io.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_io_finish.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_io_start.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_wakeup.9.gz
 # 20130710: libkvm version bump
 OLD_LIBS+=lib/libkvm.so.5
 # 20130623: dialog update from 1.1 to 1.2
 OLD_LIBS+=usr/lib/libdialog.so.7
 # 20130616: vfs_mount.9 removed
 OLD_FILES+=usr/share/man/man9/vfs_mount.9.gz
 # 20130614: remove CVS from base
 OLD_FILES+=usr/bin/cvs
 OLD_FILES+=usr/bin/cvsbug
 OLD_FILES+=usr/share/doc/psd/28.cvs/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/28.cvs/paper.ps.gz
 OLD_DIRS+=usr/share/doc/psd/28.cvs
 OLD_FILES+=usr/share/examples/cvs/contrib/README
 OLD_FILES+=usr/share/examples/cvs/contrib/clmerge
 OLD_FILES+=usr/share/examples/cvs/contrib/cln_hist
 OLD_FILES+=usr/share/examples/cvs/contrib/commit_prep
 OLD_FILES+=usr/share/examples/cvs/contrib/cvs2vendor
 OLD_FILES+=usr/share/examples/cvs/contrib/cvs_acls
 OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck
 OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck.man
 OLD_FILES+=usr/share/examples/cvs/contrib/cvshelp.man
 OLD_FILES+=usr/share/examples/cvs/contrib/descend.man
 OLD_FILES+=usr/share/examples/cvs/contrib/easy-import
 OLD_FILES+=usr/share/examples/cvs/contrib/intro.doc
 OLD_FILES+=usr/share/examples/cvs/contrib/log
 OLD_FILES+=usr/share/examples/cvs/contrib/log_accum
 OLD_FILES+=usr/share/examples/cvs/contrib/mfpipe
 OLD_FILES+=usr/share/examples/cvs/contrib/rcs-to-cvs
 OLD_FILES+=usr/share/examples/cvs/contrib/rcs2log
 OLD_FILES+=usr/share/examples/cvs/contrib/rcslock
 OLD_FILES+=usr/share/examples/cvs/contrib/sccs2rcs
 OLD_DIRS+=usr/share/examples/cvs/contrib
 OLD_DIRS+=usr/share/examples/cvs
 OLD_FILES+=usr/share/info/cvs.info.gz
 OLD_FILES+=usr/share/info/cvsclient.info.gz
 OLD_FILES+=usr/share/man/man1/cvs.1.gz
 OLD_FILES+=usr/share/man/man5/cvs.5.gz
 OLD_FILES+=usr/share/man/man8/cvsbug.8.gz
 # 20130607: WITH_DEBUG_FILES added
 OLD_FILES+=lib/libufs.so.6.symbols
 # 20130417: nfs fha moved from nfsserver to nfs
 OLD_FILES+=usr/include/nfsserver/nfs_fha.h
 # 20130411: new clang import which bumps version from 3.2 to 3.3
 OLD_FILES+=usr/include/clang/3.2/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.2/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.2/altivec.h
 OLD_FILES+=usr/include/clang/3.2/ammintrin.h
 OLD_FILES+=usr/include/clang/3.2/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.2/avxintrin.h
 OLD_FILES+=usr/include/clang/3.2/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.2/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.2/cpuid.h
 OLD_FILES+=usr/include/clang/3.2/emmintrin.h
 OLD_FILES+=usr/include/clang/3.2/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.2/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.2/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.2/immintrin.h
 OLD_FILES+=usr/include/clang/3.2/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.2/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.2/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.2/mmintrin.h
 OLD_FILES+=usr/include/clang/3.2/module.map
 OLD_FILES+=usr/include/clang/3.2/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.2/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.2/smmintrin.h
 OLD_FILES+=usr/include/clang/3.2/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/x86intrin.h
 OLD_FILES+=usr/include/clang/3.2/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.2
 # 20130404: legacy ATA stack removed
 OLD_FILES+=etc/periodic/daily/405.status-ata-raid
 OLD_FILES+=rescue/atacontrol
 OLD_FILES+=sbin/atacontrol
 OLD_FILES+=usr/share/man/man8/atacontrol.8.gz
 OLD_FILES+=usr/share/man/man4/atapicam.4.gz
 OLD_FILES+=usr/share/man/man4/ataraid.4.gz
 OLD_FILES+=usr/sbin/burncd
 OLD_FILES+=usr/share/man/man8/burncd.8.gz
 # 20130316: vinum.4 removed
 OLD_FILES+=usr/share/man/man4/vinum.4.gz
 # 20130312: fortunes-o removed
 OLD_FILES+=usr/share/games/fortune/fortunes-o
 OLD_FILES+=usr/share/games/fortune/fortunes-o.dat
 # 20130311: Ports are no more available via cvsup
 OLD_FILES+=usr/share/examples/cvsup/ports-supfile
 OLD_FILES+=usr/share/examples/cvsup/refuse
 OLD_FILES+=usr/share/examples/cvsup/refuse.README
 # 20130309: NWFS and NCP supports removed
 OLD_FILES+=usr/bin/ncplist
 OLD_FILES+=usr/bin/ncplogin
 OLD_FILES+=usr/bin/ncplogout
 OLD_FILES+=usr/include/fs/nwfs/nwfs.h
 OLD_FILES+=usr/include/fs/nwfs/nwfs_mount.h
 OLD_FILES+=usr/include/fs/nwfs/nwfs_node.h
 OLD_FILES+=usr/include/fs/nwfs/nwfs_subr.h
 OLD_DIRS+=usr/include/fs/nwfs
 OLD_FILES+=usr/include/netncp/ncp.h
 OLD_FILES+=usr/include/netncp/ncp_cfg.h
 OLD_FILES+=usr/include/netncp/ncp_conn.h
 OLD_FILES+=usr/include/netncp/ncp_file.h
 OLD_FILES+=usr/include/netncp/ncp_lib.h
 OLD_FILES+=usr/include/netncp/ncp_ncp.h
 OLD_FILES+=usr/include/netncp/ncp_nls.h
 OLD_FILES+=usr/include/netncp/ncp_rcfile.h
 OLD_FILES+=usr/include/netncp/ncp_rq.h
 OLD_FILES+=usr/include/netncp/ncp_sock.h
 OLD_FILES+=usr/include/netncp/ncp_subr.h
 OLD_FILES+=usr/include/netncp/ncp_user.h
 OLD_FILES+=usr/include/netncp/ncpio.h
 OLD_FILES+=usr/include/netncp/nwerror.h
 OLD_DIRS+=usr/include/netncp
 OLD_FILES+=usr/lib/libncp.a
 OLD_FILES+=usr/lib/libncp.so
 OLD_LIBS+=usr/lib/libncp.so.4
 OLD_FILES+=usr/lib/libncp_p.a
 OLD_FILES+=usr/sbin/mount_nwfs
 OLD_FILES+=usr/share/examples/nwclient/dot.nwfsrc
 OLD_FILES+=usr/share/examples/nwclient/nwfs.sh.sample
 OLD_DIRS+=usr/share/examples/nwclient
 OLD_FILES+=usr/share/man/man1/ncplist.1.gz
 OLD_FILES+=usr/share/man/man1/ncplogin.1.gz
 OLD_FILES+=usr/share/man/man1/ncplogout.1.gz
 OLD_FILES+=usr/share/man/man8/mount_nwfs.8.gz
 # 20130302: NTFS support removed
 OLD_FILES+=rescue/mount_ntfs
 OLD_FILES+=sbin/mount_ntfs
 OLD_FILES+=usr/include/fs/ntfs/ntfs.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_compr.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_ihash.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_inode.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_subr.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_vfsops.h
 OLD_FILES+=usr/include/fs/ntfs/ntfsmount.h
 OLD_DIRS+=usr/include/fs/ntfs
 OLD_FILES+=usr/share/man/man8/mount_ntfs.8.gz
 # 20130302: PORTALFS support removed
 OLD_FILES+=usr/include/fs/portalfs/portal.h
 OLD_DIRS+=usr/include/fs/portalfs
 OLD_FILES+=usr/sbin/mount_portalfs
 OLD_FILES+=usr/share/examples/portal/README
 OLD_FILES+=usr/share/examples/portal/portal.conf
 OLD_DIRS+=usr/share/examples/portal
 OLD_FILES+=usr/share/man/man8/mount_portalfs.8.gz
 # 20130302: CODAFS support removed
 OLD_FILES+=usr/share/man/man4/coda.4.gz
 # 20130302: XFS support removed
 OLD_FILES+=usr/share/man/man5/xfs.5.gz
 # 20130302: Capsicum overhaul
 OLD_FILES+=usr/share/man/man2/cap_getrights.2.gz
 OLD_FILES+=usr/share/man/man2/cap_new.2.gz
 # 20130213: OpenSSL 1.0.1e import
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_verifyrecover.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_verifyrecover_init.3.gz
 # 20130116: removed long unused directories for .1aout section manpages
 OLD_FILES+=usr/share/man/en.ISO8859-1/man1aout
 OLD_FILES+=usr/share/man/en.UTF-8/man1aout
 OLD_DIRS+=usr/share/man/man1aout
 OLD_DIRS+=usr/share/man/cat1aout
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat1aout
 OLD_DIRS+=usr/share/man/en.UTF-8/cat1aout
 # 20130103: gnats-supfile removed
 OLD_FILES+=usr/share/examples/cvsup/gnats-supfile
 # 20121230: libdisk removed
 OLD_FILES+=usr/share/man/man3/libdisk.3.gz usr/include/libdisk.h
 OLD_FILES+=usr/lib/libdisk.a
 # 20121230: remove wrongly created directories for auditdistd
 OLD_DIRS+=var/dist
 OLD_DIRS+=var/remote
 # 20121022: remove harp, hfa and idt man page
 OLD_FILES+=usr/share/man/man4/harp.4.gz
 OLD_FILES+=usr/share/man/man4/hfa.4.gz
 OLD_FILES+=usr/share/man/man4/idt.4.gz
 OLD_FILES+=usr/share/man/man4/if_idt.4.gz
 # 20121022: VFS_LOCK_GIANT elimination
 OLD_FILES+=usr/share/man/man9/VFS_LOCK_GIANT.9.gz
 OLD_FILES+=usr/share/man/man9/VFS_UNLOCK_GIANT.9.gz
 # 20121004: remove incomplete unwind.h
 OLD_FILES+=usr/include/clang/3.2/unwind.h
 # 20120910: NetBSD compat shims removed
 OLD_FILES+=usr/include/cam/scsi/scsi_low_pisa.h
 OLD_FILES+=usr/include/sys/device_port.h
 # 20120909: doc and www supfiles removed
 OLD_FILES+=usr/share/examples/cvsup/doc-supfile
 OLD_FILES+=usr/share/examples/cvsup/www-supfile
 # 20120908: pf cleanup
 OLD_FILES+=usr/include/net/if_pflow.h
 # 20120816: new clang import which bumps version from 3.1 to 3.2
 OLD_FILES+=usr/bin/llvm-ld
 OLD_FILES+=usr/bin/llvm-stub
 OLD_FILES+=usr/include/clang/3.1/altivec.h
 OLD_FILES+=usr/include/clang/3.1/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.1/avxintrin.h
 OLD_FILES+=usr/include/clang/3.1/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.1/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.1/cpuid.h
 OLD_FILES+=usr/include/clang/3.1/emmintrin.h
 OLD_FILES+=usr/include/clang/3.1/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.1/immintrin.h
 OLD_FILES+=usr/include/clang/3.1/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.1/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.1/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.1/mmintrin.h
 OLD_FILES+=usr/include/clang/3.1/module.map
 OLD_FILES+=usr/include/clang/3.1/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.1/smmintrin.h
 OLD_FILES+=usr/include/clang/3.1/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/unwind.h
 OLD_FILES+=usr/include/clang/3.1/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/x86intrin.h
 OLD_FILES+=usr/include/clang/3.1/xmmintrin.h
 OLD_DIRS+=usr/include/clang/3.1
 OLD_FILES+=usr/share/man/man1/llvm-ld.1.gz
 # 20120712: OpenSSL 1.0.1c import
 OLD_LIBS+=lib/libcrypto.so.6
 OLD_LIBS+=usr/lib/libssl.so.6
 OLD_FILES+=usr/include/openssl/aes_locl.h
 OLD_FILES+=usr/include/openssl/bio_lcl.h
 OLD_FILES+=usr/include/openssl/e_os.h
 OLD_FILES+=usr/include/openssl/fips.h
 OLD_FILES+=usr/include/openssl/fips_rand.h
 OLD_FILES+=usr/include/openssl/pq_compat.h
 OLD_FILES+=usr/include/openssl/tmdiff.h
 OLD_FILES+=usr/include/openssl/ui_locl.h
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_id_callback.3.gz
 # 20120621: remove old man page
 OLD_FILES+=usr/share/man/man8/vnconfig.8.gz
 # 20120619: TOE support updated
 OLD_FILES+=usr/include/netinet/toedev.h
 # 20120613: auth.conf removed
 OLD_FILES+=etc/auth.conf
 OLD_FILES+=usr/share/examples/etc/auth.conf
 OLD_FILES+=usr/share/man/man3/auth.3.gz
 OLD_FILES+=usr/share/man/man3/auth_getval.3.gz
 OLD_FILES+=usr/share/man/man5/auth.conf.5.gz
 # 20120530: kde pam lives now in ports
 OLD_FILES+=etc/pam.d/kde
 # 20120521: byacc import
 OLD_FILES+=usr/bin/yyfix
 OLD_FILES+=usr/share/man/man1/yyfix.1.gz
 # 20120505: new clang import installed a redundant internal header
 OLD_FILES+=usr/include/clang/3.1/stdalign.h
 # 20120428: MD2 removed from libmd
 OLD_LIBS+=lib/libmd.so.5
 OLD_FILES+=usr/include/md2.h
 OLD_FILES+=usr/share/man/man3/MD2Data.3.gz
 OLD_FILES+=usr/share/man/man3/MD2End.3.gz
 OLD_FILES+=usr/share/man/man3/MD2File.3.gz
 OLD_FILES+=usr/share/man/man3/MD2FileChunk.3.gz
 OLD_FILES+=usr/share/man/man3/MD2Final.3.gz
 OLD_FILES+=usr/share/man/man3/MD2Init.3.gz
 OLD_FILES+=usr/share/man/man3/MD2Update.3.gz
 OLD_FILES+=usr/share/man/man3/md2.3.gz
 # 20120425: libusb version bump (r234684)
 OLD_LIBS+=usr/lib/libusb.so.2
 OLD_FILES+=usr/share/man/man3/libsub_get_active_config_descriptor.3.gz
 # 20120415: new clang import which bumps version from 3.0 to 3.1
 OLD_FILES+=usr/include/clang/3.0/altivec.h
 OLD_FILES+=usr/include/clang/3.0/avxintrin.h
 OLD_FILES+=usr/include/clang/3.0/emmintrin.h
 OLD_FILES+=usr/include/clang/3.0/immintrin.h
 OLD_FILES+=usr/include/clang/3.0/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.0/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.0/mmintrin.h
 OLD_FILES+=usr/include/clang/3.0/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/smmintrin.h
 OLD_FILES+=usr/include/clang/3.0/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/x86intrin.h
 OLD_FILES+=usr/include/clang/3.0/xmmintrin.h
 OLD_DIRS+=usr/include/clang/3.0
 # 20120412: BIND 9.8.1 release notes removed
 OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.pdf
 OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.txt
 OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.html
 OLD_FILES+=usr/share/doc/bind9/release-notes.css
 # 20120330: legacy(4) moved to x86
 OLD_FILES+=usr/include/machine/legacyvar.h
 # 20120324: MPI headers updated
 OLD_FILES+=usr/include/dev/mpt/mpilib/mpi_inb.h
 # 20120322: hwpmc_mips24k.h removed
 OLD_FILES+=usr/include/dev/hwpmc/hwpmc_mips24k.h
 # 20120322: Update heimdal to 1.5.1
 OLD_FILES+=usr/include/krb5-v4compat.h \
 	usr/include/krb_err.h \
 	usr/include/hdb-private.h \
         usr/share/man/man3/krb5_addresses.3.gz \
         usr/share/man/man3/krb5_cc_cursor.3.gz \
         usr/share/man/man3/krb5_cc_ops.3.gz \
         usr/share/man/man3/krb5_config.3.gz \
         usr/share/man/man3/krb5_config_get_int_default.3.gz \
         usr/share/man/man3/krb5_context.3.gz \
         usr/share/man/man3/krb5_data.3.gz \
         usr/share/man/man3/krb5_err.3.gz \
         usr/share/man/man3/krb5_errx.3.gz \
         usr/share/man/man3/krb5_keyblock.3.gz \
         usr/share/man/man3/krb5_keytab_entry.3.gz \
         usr/share/man/man3/krb5_kt_cursor.3.gz \
         usr/share/man/man3/krb5_kt_ops.3.gz \
         usr/share/man/man3/krb5_set_warn_dest.3.gz \
         usr/share/man/man3/krb5_verr.3.gz \
         usr/share/man/man3/krb5_verrx.3.gz \
         usr/share/man/man3/krb5_vwarnx.3.gz \
         usr/share/man/man3/krb5_warn.3.gz \
         usr/share/man/man3/krb5_warnx.3.gz
 OLD_LIBS+=usr/lib/libasn1.so.10 \
 	usr/lib/libhdb.so.10 \
 	usr/lib/libheimntlm.so.10 \
 	usr/lib/libhx509.so.10 \
 	usr/lib/libkadm5clnt.so.10 \
 	usr/lib/libkadm5srv.so.10 \
 	usr/lib/libkafs5.so.10 \
 	usr/lib/libkrb5.so.10 \
 	usr/lib/libroken.so.10
 # 20120309: Remove fifofs header files
 OLD_FILES+=usr/include/fs/fifofs/fifo.h
 OLD_DIRS+=usr/include/fs/fifofs
 # 20120304: xlocale cleanup
 OLD_FILES+=usr/include/_xlocale_ctype.h
 # 20120225: libarchive 3.0.3
 OLD_FILES+=usr/share/man/man3/archive_read_data_into_buffer.3.gz \
 	usr/share/man/man3/archive_read_support_compression_all.3.gz \
 	usr/share/man/man3/archive_read_support_compression_bzip2.3.gz \
 	usr/share/man/man3/archive_read_support_compression_compress.3.gz \
 	usr/share/man/man3/archive_read_support_compression_gzip.3.gz \
 	usr/share/man/man3/archive_read_support_compression_lzma.3.gz \
 	usr/share/man/man3/archive_read_support_compression_none.3.gz \
 	usr/share/man/man3/archive_read_support_compression_program.3.gz \
 	usr/share/man/man3/archive_read_support_compression_program_signature.3.gz \
 	usr/share/man/man3/archive_read_support_compression_xz.3.gz \
 	usr/share/man/man3/archive_write_set_callbacks.3.gz \
 	usr/share/man/man3/archive_write_set_compression_bzip2.3.gz \
 	usr/share/man/man3/archive_write_set_compression_compress.3.gz \
 	usr/share/man/man3/archive_write_set_compression_gzip.3.gz \
 	usr/share/man/man3/archive_write_set_compression_none.3.gz \
 	usr/share/man/man3/archive_write_set_compression_program.3.gz
 OLD_LIBS+=usr/lib/libarchive.so.5
 # 20120113: removal of wtmpcvt(1)
 OLD_FILES+=usr/bin/wtmpcvt
 OLD_FILES+=usr/share/man/man1/wtmpcvt.1.gz
 # 20111214: eventtimers(7) moved to eventtimers(4)
 OLD_FILES+=usr/share/man/man7/eventtimers.7.gz
 # 20111125: amd(4) removed
 OLD_FILES+=usr/share/man/man4/amd.4.gz
 # 20111125: libodialog removed
 OLD_FILES+=usr/lib/libodialog.a
 OLD_FILES+=usr/lib/libodialog.so
 OLD_LIBS+=usr/lib/libodialog.so.7
 OLD_FILES+=usr/lib/libodialog_p.a
 # 20110930: sysinstall removed
 OLD_FILES+=usr/sbin/sysinstall
 OLD_FILES+=usr/share/man/man8/sysinstall.8.gz
 OLD_FILES+=usr/lib/libftpio.a
 OLD_FILES+=usr/lib/libftpio.so
 OLD_LIBS+=usr/lib/libftpio.so.8
 OLD_FILES+=usr/lib/libftpio_p.a
 OLD_FILES+=usr/include/ftpio.h
 OLD_FILES+=usr/share/man/man3/ftpio.3.gz
 # 20110915: rename congestion control manpages
 OLD_FILES+=usr/share/man/man9/cc.9.gz
 # 20110831: atomic page flags operations
 OLD_FILES+=usr/share/man/man9/vm_page_flag.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_flag_clear.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_flag_set.9.gz
 # 20110828: library version bump for 9.0
 OLD_LIBS+=lib/libcam.so.5
 OLD_LIBS+=lib/libpcap.so.7
 OLD_LIBS+=lib/libufs.so.5
 OLD_LIBS+=usr/lib/libbsnmp.so.5
 OLD_LIBS+=usr/lib/libdwarf.so.2
 OLD_LIBS+=usr/lib/libopie.so.6
 OLD_LIBS+=usr/lib/librtld_db.so.1
 OLD_LIBS+=usr/lib/libtacplus.so.4
 # 20110817: no more acd.4, ad.4, afd.4 and ast.4
 OLD_FILES+=usr/share/man/man4/acd.4.gz
 OLD_FILES+=usr/share/man/man4/ad.4.gz
 OLD_FILES+=usr/share/man/man4/afd.4.gz
 OLD_FILES+=usr/share/man/man4/ast.4.gz
 # 20110718: no longer useful in the age of rc.d
 OLD_FILES+=usr/sbin/named.reconfig
 OLD_FILES+=usr/sbin/named.reload
 OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz
 OLD_FILES+=usr/share/man/man8/named.reload.8.gz
 # 20110716: bind 9.8.0 import
 OLD_LIBS+=usr/lib/liblwres.so.50
 OLD_FILES+=usr/share/doc/bind9/KNOWN-DEFECTS
 OLD_FILES+=usr/share/doc/bind9/NSEC3-NOTES
 OLD_FILES+=usr/share/doc/bind9/README.idnkit
 OLD_FILES+=usr/share/doc/bind9/README.pkcs11
 # 20110709: vm_map_clean.9 -> vm_map_sync.9
 OLD_FILES+=usr/share/man/man9/vm_map_clean.9.gz
 # 20110709: Catch up with removal of these functions
 OLD_FILES+=usr/share/man/man9/vm_page_copy.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_protect.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_zero_fill.9.gz
 # 20110707: script no longer needed by /etc/rc.d/nfsd
 OLD_FILES+=etc/rc.d/nfsserver
 # 20110705: files moved so both NFS clients can share them
 OLD_FILES+=usr/include/nfsclient/krpc.h
 OLD_FILES+=usr/include/nfsclient/nfsdiskless.h
 # 20110705: the switch of default NFS client to the new one
 OLD_FILES+=sbin/mount_newnfs
 OLD_FILES+=usr/share/man/man8/mount_newnfs.8.gz
 OLD_FILES+=usr/include/nfsclient/nfs_kdtrace.h
 # 20110628: calendar.msk removed
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.msk
 # 20110517: libpkg removed
 OLD_FILES+=usr/include/pkg.h
 OLD_FILES+=usr/lib/libpkg.a
 OLD_FILES+=usr/lib/libpkg.so
 OLD_LIBS+=usr/lib/libpkg.so.0
 OLD_FILES+=usr/lib/libpkg_p.a
 # 20110517: libsbuf version bump
 OLD_LIBS+=lib/libsbuf.so.5
 # 20110502: new clang import which bumps version from 2.9 to 3.0
 OLD_FILES+=usr/include/clang/2.9/emmintrin.h
 OLD_FILES+=usr/include/clang/2.9/mm_malloc.h
 OLD_FILES+=usr/include/clang/2.9/mmintrin.h
 OLD_FILES+=usr/include/clang/2.9/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.9/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.9/xmmintrin.h
 OLD_DIRS+=usr/include/clang/2.9
 # 20110417: removal of Objective-C support
 OLD_FILES+=usr/include/objc/encoding.h
 OLD_FILES+=usr/include/objc/hash.h
 OLD_FILES+=usr/include/objc/NXConstStr.h
 OLD_FILES+=usr/include/objc/objc-api.h
 OLD_FILES+=usr/include/objc/objc-decls.h
 OLD_FILES+=usr/include/objc/objc-list.h
 OLD_FILES+=usr/include/objc/objc.h
 OLD_FILES+=usr/include/objc/Object.h
 OLD_FILES+=usr/include/objc/Protocol.h
 OLD_FILES+=usr/include/objc/runtime.h
 OLD_FILES+=usr/include/objc/sarray.h
 OLD_FILES+=usr/include/objc/thr.h
 OLD_FILES+=usr/include/objc/typedstream.h
 OLD_FILES+=usr/lib/libobjc.a
 OLD_FILES+=usr/lib/libobjc.so
 OLD_FILES+=usr/lib/libobjc_p.a
 OLD_FILES+=usr/libexec/cc1obj
 OLD_LIBS+=usr/lib/libobjc.so.4
 OLD_DIRS+=usr/include/objc
 # 20110331: firmware.img created at build time
 OLD_FILES+=usr/share/examples/kld/firmware/fwimage/firmware.img
 # 20110224: sticky.8 -> sticky.7
 OLD_FILES+=usr/share/man/man8/sticky.8.gz
 # 20110220: new clang import which bumps version from 2.8 to 2.9
 OLD_FILES+=usr/include/clang/2.8/emmintrin.h
 OLD_FILES+=usr/include/clang/2.8/mm_malloc.h
 OLD_FILES+=usr/include/clang/2.8/mmintrin.h
 OLD_FILES+=usr/include/clang/2.8/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.8/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.8/xmmintrin.h
 OLD_DIRS+=usr/include/clang/2.8
 # 20110119: netinet/sctp_cc_functions.h removed
 OLD_FILES+=usr/include/netinet/sctp_cc_functions.h
 # 20110119: Remove SYSCTL_*X* sysctl additions
 OLD_FILES+=usr/share/man/man9/SYSCTL_XINT.9.gz \
     usr/share/man/man9/SYSCTL_XLONG.9.gz
 
 # 20110112: Update dialog to new version, rename old libdialog to libodialog,
 #     removing associated man pages and header files.
 OLD_FILES+=usr/share/man/man3/draw_shadow.3.gz \
     usr/share/man/man3/draw_box.3.gz usr/share/man/man3/line_edit.3.gz \
     usr/share/man/man3/strheight.3.gz usr/share/man/man3/strwidth.3.gz \
     usr/share/man/man3/dialog_create_rc.3.gz \
     usr/share/man/man3/dialog_yesno.3.gz usr/share/man/man3/dialog_noyes.3.gz \
     usr/share/man/man3/dialog_prgbox.3.gz \
     usr/share/man/man3/dialog_textbox.3.gz usr/share/man/man3/dialog_menu.3.gz \
     usr/share/man/man3/dialog_checklist.3.gz \
     usr/share/man/man3/dialog_radiolist.3.gz \
     usr/share/man/man3/dialog_inputbox.3.gz \
     usr/share/man/man3/dialog_clear_norefresh.3.gz \
     usr/share/man/man3/dialog_clear.3.gz usr/share/man/man3/dialog_update.3.gz \
     usr/share/man/man3/dialog_fselect.3.gz \
     usr/share/man/man3/dialog_notify.3.gz \
     usr/share/man/man3/dialog_mesgbox.3.gz \
     usr/share/man/man3/dialog_gauge.3.gz usr/share/man/man3/init_dialog.3.gz \
     usr/share/man/man3/end_dialog.3.gz usr/share/man/man3/use_helpfile.3.gz \
     usr/share/man/man3/use_helpline.3.gz usr/share/man/man3/get_helpline.3.gz \
     usr/share/man/man3/restore_helpline.3.gz \
     usr/share/man/man3/dialog_msgbox.3.gz \
     usr/share/man/man3/dialog_ftree.3.gz usr/share/man/man3/dialog_tree.3.gz \
     usr/share/examples/dialog/README usr/share/examples/dialog/checklist \
     usr/share/examples/dialog/ftreebox usr/share/examples/dialog/infobox \
     usr/share/examples/dialog/inputbox usr/share/examples/dialog/menubox \
     usr/share/examples/dialog/msgbox usr/share/examples/dialog/prgbox \
     usr/share/examples/dialog/radiolist usr/share/examples/dialog/textbox \
     usr/share/examples/dialog/treebox usr/share/examples/dialog/yesno \
     usr/share/examples/libdialog/Makefile usr/share/examples/libdialog/check1.c\
     usr/share/examples/libdialog/check2.c usr/share/examples/libdialog/check3.c\
     usr/share/examples/libdialog/dselect.c \
     usr/share/examples/libdialog/fselect.c \
     usr/share/examples/libdialog/ftree1.c \
     usr/share/examples/libdialog/ftree1.test \
     usr/share/examples/libdialog/ftree2.c \
     usr/share/examples/libdialog/ftree2.test \
     usr/share/examples/libdialog/gauge.c usr/share/examples/libdialog/input1.c \
     usr/share/examples/libdialog/input2.c usr/share/examples/libdialog/menu1.c \
     usr/share/examples/libdialog/menu2.c usr/share/examples/libdialog/menu3.c \
     usr/share/examples/libdialog/msg.c usr/share/examples/libdialog/prgbox.c \
     usr/share/examples/libdialog/radio1.c usr/share/examples/libdialog/radio2.c\
     usr/share/examples/libdialog/radio3.c usr/share/examples/libdialog/text.c \
     usr/share/examples/libdialog/tree.c usr/share/examples/libdialog/yesno.c
 OLD_DIRS+=usr/share/examples/libdialog usr/share/examples/dialog
 # 20101114: Remove long-obsolete MAKEDEV.8
 OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz
 # 20101112: vgonel(9) has gone to private API a while ago
 OLD_FILES+=usr/share/man/man9/vgonel.9.gz
 # 20101112: removed gasp.info
 OLD_FILES+=usr/share/info/gasp.info.gz
 # 20101109: machine/mutex.h removed
 OLD_FILES+=usr/include/machine/mutex.h
 # 20101109: headers moved from machine/ to x86/
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/mptable.h
 .endif
 # 20101101: headers moved from machine/ to x86/
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/apicreg.h
 OLD_FILES+=usr/include/machine/mca.h
 .endif
 # 20101020: catch up with vm_page_sleep_if_busy rename
 OLD_FILES+=usr/share/man/man9/vm_page_sleep_busy.9.gz
 # 20101018: taskqueue(9) updates
 OLD_FILES+=usr/share/man/man9/taskqueue_find.9.gz
 # 20101011: removed subblock.h from liblzma
 OLD_FILES+=usr/include/lzma/subblock.h
 # 20101002: removed manpath.config
 OLD_FILES+=etc/manpath.config
 OLD_FILES+=usr/share/examples/etc/manpath.config
 # 20100910: renamed sbuf_overflowed to sbuf_error
 OLD_FILES+=usr/share/man/man9/sbuf_overflowed.9.gz
 # 20100815: retired last traces of chooseproc(9)
 OLD_FILES+=usr/share/man/man9/chooseproc.9.gz
 # 20100806: removal of unused libcompat routines
 OLD_FILES+=usr/share/man/man3/ascftime.3.gz
 OLD_FILES+=usr/share/man/man3/cfree.3.gz
 OLD_FILES+=usr/share/man/man3/cftime.3.gz
 OLD_FILES+=usr/share/man/man3/getpw.3.gz
 # 20100725: acpi_aiboost(4) removal
 OLD_FILES+=usr/share/man/man4/acpi_aiboost.4.gz
 # 20100724: nfsclient/nfs_lock.h moved to nfs/nfs_lock.h
 OLD_FILES+=usr/include/nfsclient/nfs_lock.h
 # 20100720: new clang import which bumps version from 2.0 to 2.8
 OLD_FILES+=usr/include/clang/2.0/emmintrin.h
 OLD_FILES+=usr/include/clang/2.0/mm_malloc.h
 OLD_FILES+=usr/include/clang/2.0/mmintrin.h
 OLD_FILES+=usr/include/clang/2.0/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.0/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.0/xmmintrin.h
 OLD_DIRS+=usr/include/clang/2.0
 # 20100706: removed pc-sysinstall's detect-vmware.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-vmware.sh
 # 20100701: [powerpc] removed <machine/intr.h>
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/intr.h
 .endif
 # 20100514: library version bump for versioned symbols for liblzma
 OLD_LIBS+=usr/lib/liblzma.so.0
 # 20100511: move GCC-specific headers to /usr/include/gcc
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/emmintrin.h
 OLD_FILES+=usr/include/mm_malloc.h
 OLD_FILES+=usr/include/pmmintrin.h
 OLD_FILES+=usr/include/xmmintrin.h
 .endif
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/mmintrin.h
 .endif
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/altivec.h
 OLD_FILES+=usr/include/ppc-asm.h
 OLD_FILES+=usr/include/spe.h
 .endif
 # 20100416: [mips] removed <machine/psl.h>
 .if ${TARGET_ARCH} == "mips"
 OLD_FILES+=usr/include/machine/psl.h
 .endif
 # 20100415: [mips] removed unused headers
 .if ${TARGET_ARCH} == "mips"
 OLD_FILES+=usr/include/machine/archtype.h
 OLD_FILES+=usr/include/machine/segments.h
 OLD_FILES+=usr/include/machine/rm7000.h
 OLD_FILES+=usr/include/machine/defs.h
 OLD_FILES+=usr/include/machine/queue.h
 .endif
 # 20100326: gcpio removal
 OLD_FILES+=usr/bin/gcpio
 OLD_FILES+=usr/share/info/cpio.info.gz
 OLD_FILES+=usr/share/man/man1/gcpio.1.gz
 # 20100322: libz update
 OLD_LIBS+=lib/libz.so.5
 # 20100314: removal of regexp.h
 OLD_FILES+=usr/include/regexp.h
 OLD_FILES+=usr/share/man/man3/regexp.3.gz
 OLD_FILES+=usr/share/man/man3/regsub.3.gz
 # 20100303: actual removal of utmp.h
 OLD_FILES+=usr/include/utmp.h
 # 20100208: man pages moved
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/alpm.4.gz
 OLD_FILES+=usr/share/man/man4/i386/amdpm.4.gz
 OLD_FILES+=usr/share/man/man4/i386/mcd.4.gz
 OLD_FILES+=usr/share/man/man4/i386/padlock.4.gz
 OLD_FILES+=usr/share/man/man4/i386/pcf.4.gz
 OLD_FILES+=usr/share/man/man4/i386/scd.4.gz
 OLD_FILES+=usr/share/man/man4/i386/viapm.4.gz
 .endif
 # 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd
 OLD_FILES+=usr/share/doc/papers/bc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/dc.ascii.gz
 # 20100120: replacing GNU bc/dc with BSDL versions
 OLD_FILES+=usr/share/examples/bc/ckbook.b
 OLD_FILES+=usr/share/examples/bc/pi.b
 OLD_FILES+=usr/share/examples/bc/primes.b
 OLD_FILES+=usr/share/examples/bc/twins.b
 OLD_FILES+=usr/share/info/dc.info.gz
 OLD_DIRS+=usr/share/examples/bc
 # 20100114: removal of ttyslot(3)
 OLD_FILES+=usr/share/man/man3/ttyslot.3.gz
 # 20100113: remove utmp.h, replace it by utmpx.h
 OLD_FILES+=usr/share/man/man3/login.3.gz
 OLD_FILES+=usr/share/man/man3/logout.3.gz
 OLD_FILES+=usr/share/man/man3/logwtmp.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_endutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxline.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxuser.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_pututxline.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_setutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_setutxfile.3.gz
 OLD_FILES+=usr/share/man/man5/lastlog.5.gz
 OLD_FILES+=usr/share/man/man5/utmp.5.gz
 OLD_FILES+=usr/share/man/man5/wtmp.5.gz
 OLD_LIBS+=lib/libutil.so.8
 # 20100105: new userland semaphore implementation
 OLD_FILES+=usr/include/sys/semaphore.h
 # 20100103: ntptrace(8) removed
 OLD_FILES+=usr/sbin/ntptrace
 OLD_FILES+=usr/share/man/man8/ntptrace.8.gz
 # 20091229: remove no longer relevant examples
 OLD_FILES+=usr/share/examples/pppd/auth-down.sample
 OLD_FILES+=usr/share/examples/pppd/auth-up.sample
 OLD_FILES+=usr/share/examples/pppd/chap-secrets.sample
 OLD_FILES+=usr/share/examples/pppd/chat.sh.sample
 OLD_FILES+=usr/share/examples/pppd/ip-down.sample
 OLD_FILES+=usr/share/examples/pppd/ip-up.sample
 OLD_FILES+=usr/share/examples/pppd/options.sample
 OLD_FILES+=usr/share/examples/pppd/pap-secrets.sample
 OLD_FILES+=usr/share/examples/pppd/ppp.deny.sample
 OLD_FILES+=usr/share/examples/pppd/ppp.shells.sample
 OLD_DIRS+=usr/share/examples/pppd
 OLD_FILES+=usr/share/examples/slattach/unit-command.sh
 OLD_DIRS+=usr/share/examples/slattach
 OLD_FILES+=usr/share/examples/sliplogin/slip.hosts
 OLD_FILES+=usr/share/examples/sliplogin/slip.login
 OLD_FILES+=usr/share/examples/sliplogin/slip.logout
 OLD_FILES+=usr/share/examples/sliplogin/slip.slparms
 OLD_DIRS+=usr/share/examples/sliplogin
 OLD_FILES+=usr/share/examples/startslip/sldown.sh
 OLD_FILES+=usr/share/examples/startslip/slip.sh
 OLD_FILES+=usr/share/examples/startslip/slup.sh
 OLD_DIRS+=usr/share/examples/startslip
 # 20091202: unify rc.firewall and rc.firewall6
 OLD_FILES+=etc/rc.d/ip6fw
 OLD_FILES+=etc/rc.firewall6
 OLD_FILES+=usr/share/examples/etc/rc.firewall6
 # 20091117: removal of rc.early(8) link
 OLD_FILES+=usr/share/man/man8/rc.early.8.gz
 # 20091027: pselect.3 implemented as syscall
 OLD_FILES+=usr/share/man/man3/pselect.3.gz
 # 20091005: fusword.9 and susword.9 removed
 OLD_FILES+=usr/share/man/man9/fusword.9.gz
 OLD_FILES+=usr/share/man/man9/susword.9.gz
 # 20090909: vesa and dpms promoted to be i386/amd64 common
 OLD_FILES+=usr/include/machine/pc/vesa.h
 OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz
 # 20090904: remove lukemftpd
 OLD_FILES+=usr/libexec/lukemftpd
 OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ftpusers.5.gz
 OLD_FILES+=usr/share/man/man8/lukemftpd.8.gz
 # 20090902: BSD.{x11,x11-4}.dist are dead and BSD.local.dist lives in ports/
 OLD_FILES+=etc/mtree/BSD.local.dist
 OLD_FILES+=etc/mtree/BSD.x11.dist
 OLD_FILES+=etc/mtree/BSD.x11-4.dist
 # 20090812: net80211 documentation overhaul
 OLD_FILES+=usr/share/man/man9/ieee80211_add_rates.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_add_xrates.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_alloc_node.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_begin_scan.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_cfgget.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_cfgset.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_chan2ieee.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_chan2mode.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_create_ibss.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_crypto_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_crypto_detach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_decap.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_dump_pkt.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_dup_bss.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_encap.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_end_scan.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_find_node.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_fix_rate.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_free_allnodes.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_ieee2mhz.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_ioctl.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_lookup_node.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media2rate.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media_change.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media_init.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media_status.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_mhz2ieee.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_next_scan.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_node_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_node_detach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_node_lateattach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_print_essid.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_proto_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_proto_detach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_rate2media.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_recv_mgmt.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_send_mgmt.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_setmode.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_timeout_nodes.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_watchdog.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_wep_crypt.9.gz
 # 20090801: vimage.h removed in favour of vnet.h
 OLD_FILES+=usr/include/sys/vimage.h
 # 20101208: libbsnmp was moved to usr/lib
 MOVED_LIBS+=lib/libbsnmp.so.5
 # 20090719: library version bump for 8.0
 OLD_LIBS+=lib/libalias.so.6
 OLD_LIBS+=lib/libavl.so.1
 OLD_LIBS+=lib/libbegemot.so.3
 OLD_LIBS+=lib/libbsdxml.so.3
 OLD_LIBS+=lib/libbsnmp.so.4
 OLD_LIBS+=lib/libcam.so.4
 OLD_LIBS+=lib/libcrypt.so.4
 OLD_LIBS+=lib/libcrypto.so.5
 OLD_LIBS+=lib/libctf.so.1
 OLD_LIBS+=lib/libdevstat.so.6
 OLD_LIBS+=lib/libdtrace.so.1
 OLD_LIBS+=lib/libedit.so.6
 OLD_LIBS+=lib/libgeom.so.4
 OLD_LIBS+=lib/libipsec.so.3
 OLD_LIBS+=lib/libipx.so.4
 OLD_LIBS+=lib/libkiconv.so.3
 OLD_LIBS+=lib/libkvm.so.4
 OLD_LIBS+=lib/libmd.so.4
 OLD_LIBS+=lib/libncurses.so.7
 OLD_LIBS+=lib/libncursesw.so.7
 OLD_LIBS+=lib/libnvpair.so.1
 OLD_LIBS+=lib/libpcap.so.6
 OLD_LIBS+=lib/libreadline.so.7
 OLD_LIBS+=lib/libsbuf.so.4
 OLD_LIBS+=lib/libufs.so.4
 OLD_LIBS+=lib/libumem.so.1
 OLD_LIBS+=lib/libutil.so.7
 OLD_LIBS+=lib/libuutil.so.1
 OLD_LIBS+=lib/libz.so.4
 OLD_LIBS+=lib/libzfs.so.1
 OLD_LIBS+=lib/libzpool.so.1
 OLD_LIBS+=usr/lib/libarchive.so.4
 OLD_LIBS+=usr/lib/libauditd.so.4
 OLD_LIBS+=usr/lib/libbluetooth.so.3
 OLD_LIBS+=usr/lib/libbsm.so.2
 OLD_LIBS+=usr/lib/libbz2.so.3
 OLD_LIBS+=usr/lib/libcalendar.so.4
 OLD_LIBS+=usr/lib/libcom_err.so.4
 OLD_LIBS+=usr/lib/libdevinfo.so.4
 OLD_LIBS+=usr/lib/libdialog.so.6
 OLD_LIBS+=usr/lib/libdwarf.so.1
 OLD_LIBS+=usr/lib/libfetch.so.5
 OLD_LIBS+=usr/lib/libform.so.4
 OLD_LIBS+=usr/lib/libformw.so.4
 OLD_LIBS+=usr/lib/libftpio.so.7
 OLD_LIBS+=usr/lib/libgnuregex.so.4
 OLD_LIBS+=usr/lib/libgpib.so.2
 OLD_LIBS+=usr/lib/libhistory.so.7
 OLD_LIBS+=usr/lib/libmagic.so.3
 OLD_LIBS+=usr/lib/libmemstat.so.2
 OLD_LIBS+=usr/lib/libmenu.so.4
 OLD_LIBS+=usr/lib/libmenuw.so.4
 OLD_LIBS+=usr/lib/libmilter.so.4
 OLD_LIBS+=usr/lib/libncp.so.3
 OLD_LIBS+=usr/lib/libnetgraph.so.3
 OLD_LIBS+=usr/lib/libngatm.so.3
 OLD_LIBS+=usr/lib/libobjc.so.3
 OLD_LIBS+=usr/lib/libopie.so.5
 OLD_LIBS+=usr/lib/libpam.so.4
 OLD_LIBS+=usr/lib/libpanel.so.4
 OLD_LIBS+=usr/lib/libpanelw.so.4
 OLD_LIBS+=usr/lib/libpmc.so.4
 OLD_LIBS+=usr/lib/libproc.so.1
 OLD_LIBS+=usr/lib/libradius.so.3
 OLD_LIBS+=usr/lib/librpcsvc.so.4
 OLD_LIBS+=usr/lib/libsdp.so.3
 OLD_LIBS+=usr/lib/libsmb.so.3
 OLD_LIBS+=usr/lib/libssh.so.4
 OLD_LIBS+=usr/lib/libssl.so.5
 OLD_LIBS+=usr/lib/libtacplus.so.3
 OLD_LIBS+=usr/lib/libugidfw.so.3
 OLD_LIBS+=usr/lib/libusb.so.1
 OLD_LIBS+=usr/lib/libusbhid.so.3
 OLD_LIBS+=usr/lib/libvgl.so.5
 OLD_LIBS+=usr/lib/libwrap.so.5
 OLD_LIBS+=usr/lib/libypclnt.so.3
 OLD_LIBS+=usr/lib/pam_chroot.so.4
 OLD_LIBS+=usr/lib/pam_deny.so.4
 OLD_LIBS+=usr/lib/pam_echo.so.4
 OLD_LIBS+=usr/lib/pam_exec.so.4
 OLD_LIBS+=usr/lib/pam_ftpusers.so.4
 OLD_LIBS+=usr/lib/pam_group.so.4
 OLD_LIBS+=usr/lib/pam_guest.so.4
 OLD_LIBS+=usr/lib/pam_krb5.so.4
 OLD_LIBS+=usr/lib/pam_ksu.so.4
 OLD_LIBS+=usr/lib/pam_lastlog.so.4
 OLD_LIBS+=usr/lib/pam_login_access.so.4
 OLD_LIBS+=usr/lib/pam_nologin.so.4
 OLD_LIBS+=usr/lib/pam_opie.so.4
 OLD_LIBS+=usr/lib/pam_opieaccess.so.4
 OLD_LIBS+=usr/lib/pam_passwdqc.so.4
 OLD_LIBS+=usr/lib/pam_permit.so.4
 OLD_LIBS+=usr/lib/pam_radius.so.4
 OLD_LIBS+=usr/lib/pam_rhosts.so.4
 OLD_LIBS+=usr/lib/pam_rootok.so.4
 OLD_LIBS+=usr/lib/pam_securetty.so.4
 OLD_LIBS+=usr/lib/pam_self.so.4
 OLD_LIBS+=usr/lib/pam_ssh.so.4
 OLD_LIBS+=usr/lib/pam_tacplus.so.4
 OLD_LIBS+=usr/lib/pam_unix.so.4
 OLD_LIBS+=usr/lib/snmp_atm.so.5
 OLD_LIBS+=usr/lib/snmp_bridge.so.5
 OLD_LIBS+=usr/lib/snmp_hostres.so.5
 OLD_LIBS+=usr/lib/snmp_mibII.so.5
 OLD_LIBS+=usr/lib/snmp_netgraph.so.5
 OLD_LIBS+=usr/lib/snmp_pf.so.5
 # 20090718: the gdm pam.d file is no longer required
 OLD_FILES+=etc/pam.d/gdm
 # 20090714: net_add_domain(9) renamed to domain_add(9)
 OLD_FILES+=usr/share/man/man9/net_add_domain.9.gz
 # 20090713: vimage container structs removed
 OLD_FILES+=usr/include/netinet/vinet.h
 OLD_FILES+=usr/include/netinet6/vinet6.h
 OLD_FILES+=usr/include/netipsec/vipsec.h
 # 20090712: ieee80211.4 -> net80211.4
 OLD_FILES+=usr/share/man/man4/ieee80211.4.gz
 # 20090711: typo fixed, kproc_resume,.9 -> kproc_resume.9
 OLD_FILES+=usr/share/man/man9/kproc_resume,.9.gz
 # 20090709: msgctl.3 msgget.3 msgrcv.3 msgsnd.3 manual pages moved
 OLD_FILES+=usr/share/man/man3/msgctl.3.gz
 OLD_FILES+=usr/share/man/man3/msgget.3.gz
 OLD_FILES+=usr/share/man/man3/msgrcv.3.gz
 OLD_FILES+=usr/share/man/man3/msgsnd.3.gz
 # 20090630: old kernel RPC implementation removal
 OLD_FILES+=usr/include/nfs/rpcv2.h
 # 20090624: update usbdi(9)
 OLD_FILES+=usr/share/man/man9/usbd_abort_default_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_abort_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_alloc_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_alloc_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall_async.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_toggle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_close_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_device2interface_handle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request_async.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request_flags_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_endpoint_count.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_find_edesc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_find_idesc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_free_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_free_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config_desc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config_desc_full.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_device_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_endpoint_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_interface_altindex.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_interface_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_no_alts.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_quirks.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_speed.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_string.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_string_desc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_xfer_status.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_interface2device_handle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_interface2endpoint_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_interface_count.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_open_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_open_pipe_intr.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_pipe2device_handle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_set_config_index.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_set_config_no.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_set_interface.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_setup_default_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_setup_isoc_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_setup_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_sync_transfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_find_desc.9.gz
 # 20090623: number of headers needed for a usb driver reduced
 OLD_FILES+=usr/include/dev/usb/usb_defs.h
 OLD_FILES+=usr/include/dev/usb/usb_error.h
 OLD_FILES+=usr/include/dev/usb/usb_handle_request.h
 OLD_FILES+=usr/include/dev/usb/usb_hid.h
 OLD_FILES+=usr/include/dev/usb/usb_lookup.h
 OLD_FILES+=usr/include/dev/usb/usb_mfunc.h
 OLD_FILES+=usr/include/dev/usb/usb_parse.h
 OLD_FILES+=usr/include/dev/usb/usb_revision.h
 # 20090609: devclass_add_driver is no longer public
 OLD_FILES+=usr/share/man/man9/devclass_add_driver.9.gz
 OLD_FILES+=usr/share/man/man9/devclass_delete_driver.9.gz
 OLD_FILES+=usr/share/man/man9/devclass_find_driver.9.gz
 # 20090605: removal of clists
 OLD_FILES+=usr/include/sys/clist.h
 # 20090602: removal of window(1)
 OLD_FILES+=usr/bin/window
 OLD_FILES+=usr/share/man/man1/window.1.gz
 # 20090531: bind 9.6.1rc1 import
 OLD_LIBS+=usr/lib/liblwres.so.30
 # 20090530: removal of early.sh
 OLD_FILES+=etc/rc.d/early.sh
 # 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER()
 OLD_FILES+=usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz
 OLD_FILES+=usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz
 # 20090527: removal of legacy USB stack
 OLD_FILES+=usr/include/legacy/dev/usb/dsbr100io.h
 OLD_FILES+=usr/include/legacy/dev/usb/ehcireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/ehcivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/hid.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_urtwreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_urtwvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/ohcireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/ohcivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/rio500_usb.h
 OLD_FILES+=usr/include/legacy/dev/usb/rt2573_ucode.h
 OLD_FILES+=usr/include/legacy/dev/usb/sl811hsreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/sl811hsvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/ubser.h
 OLD_FILES+=usr/include/legacy/dev/usb/ucomvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/udbp.h
 OLD_FILES+=usr/include/legacy/dev/usb/uftdireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/ugraphire_rdesc.h
 OLD_FILES+=usr/include/legacy/dev/usb/uhcireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/uhcivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_mem.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_port.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_quirks.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbcdc.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbdi.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbdi_util.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbdivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbhid.h
 OLD_FILES+=usr/include/legacy/dev/usb/uxb360gp_rdesc.h
 OLD_DIRS+=usr/include/legacy/dev/usb
 OLD_DIRS+=usr/include/legacy/dev
 OLD_DIRS+=usr/include/legacy
 # 20090526: removal of makekey(8)
 OLD_FILES+=usr/libexec/makekey
 OLD_FILES+=usr/share/man/man8/makekey.8.gz
 # 20090522: removal of University of Michigan NFSv4 client
 OLD_FILES+=etc/rc.d/idmapd
 OLD_FILES+=sbin/idmapd
 OLD_FILES+=sbin/mount_nfs4
 OLD_FILES+=usr/share/man/man8/idmapd.8.gz
 OLD_FILES+=usr/share/man/man8/mount_nfs4.8.gz
 # 20090513: removal of legacy versions of USB network interface drivers
 OLD_FILES+=usr/include/legacy/dev/usb/if_upgtvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_ethersubr.h
 # 20090417: removal of legacy versions of USB network interface drivers
 OLD_FILES+=usr/include/legacy/dev/usb/if_auereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_axereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_cdcereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_cuereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_kuereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_ruereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_rumreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_rumvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_udavreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_uralreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_uralvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_zydfw.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_zydreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/kue_fw.h
 # 20090416: removal of ar(4), ray(4), sr(4), raycontrol(8)
 OLD_FILES+=usr/sbin/raycontrol
 OLD_FILES+=usr/share/man/man4/i386/ar.4.gz
 OLD_FILES+=usr/share/man/man4/i386/ray.4.gz
 OLD_FILES+=usr/share/man/man4/i386/sr.4.gz
 OLD_FILES+=usr/share/man/man8/raycontrol.8.gz
 # 20090410: VOP_LEASE.9 removed
 OLD_FILES+=usr/share/man/man9/VOP_LEASE.9.gz
 # 20090406: usb_sw_transfer.h removed
 OLD_FILES+=usr/include/dev/usb/usb_sw_transfer.h
 # 20090405: removal of if_ppp(4) and if_sl(4)
 OLD_FILES+=sbin/slattach rescue/slattach
 OLD_FILES+=sbin/startslip rescue/startslip
 OLD_FILES+=usr/include/net/if_ppp.h
 OLD_FILES+=usr/include/net/if_pppvar.h
 OLD_FILES+=usr/include/net/if_slvar.h
 OLD_FILES+=usr/include/net/ppp_comp.h
 OLD_FILES+=usr/include/net/slip.h
 OLD_FILES+=usr/sbin/sliplogin
 OLD_FILES+=usr/sbin/slstat
 OLD_FILES+=usr/sbin/pppd
 OLD_FILES+=usr/sbin/pppstats
 OLD_FILES+=usr/share/man/man1/startslip.1.gz
 OLD_FILES+=usr/share/man/man4/if_ppp.4.gz
 OLD_FILES+=usr/share/man/man4/if_sl.4.gz
 OLD_FILES+=usr/share/man/man4/ppp.4.gz
 OLD_FILES+=usr/share/man/man4/sl.4.gz
 OLD_FILES+=usr/share/man/man8/pppd.8.gz
 OLD_FILES+=usr/share/man/man8/pppstats.8.gz
 OLD_FILES+=usr/share/man/man8/slattach.8.gz
 OLD_FILES+=usr/share/man/man8/slip.8.gz
 OLD_FILES+=usr/share/man/man8/sliplogin.8.gz
 OLD_FILES+=usr/share/man/man8/slstat.8.gz
 # 20090321: libpcap upgraded to 1.0.0
 OLD_LIBS+=lib/libpcap.so.5
 # 20090319: uscanner(4) has been removed
 OLD_FILES+=usr/share/man/man4/uscanner.4.gz
 # 20090313: k8temp(4) renamed to amdtemp(4)
 OLD_FILES+=usr/share/man/man4/k8temp.4.gz
 # 20090308: libusb.so.1 renamed
 OLD_LIBS+=usr/lib/libusb20.so.1
 OLD_FILES+=usr/lib/libusb20.a
 OLD_FILES+=usr/lib/libusb20.so
 OLD_FILES+=usr/lib/libusb20_p.a
 OLD_FILES+=usr/include/libusb20_compat01.h
 OLD_FILES+=usr/include/libusb20_compat10.h
 # 20090226: libmp(3) functions renamed
 OLD_LIBS+=usr/lib/libmp.so.6
 # 20090223: changeover of USB stacks
 OLD_FILES+=usr/include/dev/usb2/include/ufm2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/urio2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_cdc.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_defs.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_devid.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_devtable.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_endian.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_error.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_hid.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_mfunc.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_revision.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_standard.h
 OLD_DIRS+=usr/include/dev/usb2/include
 OLD_DIRS+=usr/include/dev/usb2
 OLD_FILES+=usr/include/dev/usb/dsbr100io.h
 OLD_FILES+=usr/include/dev/usb/ehcireg.h
 OLD_FILES+=usr/include/dev/usb/ehcivar.h
 OLD_FILES+=usr/include/dev/usb/hid.h
 OLD_FILES+=usr/include/dev/usb/if_auereg.h
 OLD_FILES+=usr/include/dev/usb/if_axereg.h
 OLD_FILES+=usr/include/dev/usb/if_cdcereg.h
 OLD_FILES+=usr/include/dev/usb/if_cuereg.h
 OLD_FILES+=usr/include/dev/usb/if_kuereg.h
 OLD_FILES+=usr/include/dev/usb/if_ruereg.h
 OLD_FILES+=usr/include/dev/usb/if_rumreg.h
 OLD_FILES+=usr/include/dev/usb/if_rumvar.h
 OLD_FILES+=usr/include/dev/usb/if_udavreg.h
 OLD_FILES+=usr/include/dev/usb/if_upgtvar.h
 OLD_FILES+=usr/include/dev/usb/if_uralreg.h
 OLD_FILES+=usr/include/dev/usb/if_uralvar.h
 OLD_FILES+=usr/include/dev/usb/if_urtwreg.h
 OLD_FILES+=usr/include/dev/usb/if_urtwvar.h
 OLD_FILES+=usr/include/dev/usb/if_zydfw.h
 OLD_FILES+=usr/include/dev/usb/if_zydreg.h
 OLD_FILES+=usr/include/dev/usb/kue_fw.h
 OLD_FILES+=usr/include/dev/usb/ohcireg.h
 OLD_FILES+=usr/include/dev/usb/ohcivar.h
 OLD_FILES+=usr/include/dev/usb/rio500_usb.h
 OLD_FILES+=usr/include/dev/usb/rt2573_ucode.h
 OLD_FILES+=usr/include/dev/usb/sl811hsreg.h
 OLD_FILES+=usr/include/dev/usb/sl811hsvar.h
 OLD_FILES+=usr/include/dev/usb/ubser.h
 OLD_FILES+=usr/include/dev/usb/ucomvar.h
 OLD_FILES+=usr/include/dev/usb/udbp.h
 OLD_FILES+=usr/include/dev/usb/uftdireg.h
 OLD_FILES+=usr/include/dev/usb/ugraphire_rdesc.h
 OLD_FILES+=usr/include/dev/usb/uhcireg.h
 OLD_FILES+=usr/include/dev/usb/uhcivar.h
 OLD_FILES+=usr/include/dev/usb/usb_ethersubr.h
 OLD_FILES+=usr/include/dev/usb/usb_mem.h
 OLD_FILES+=usr/include/dev/usb/usb_port.h
 OLD_FILES+=usr/include/dev/usb/usb_quirks.h
 OLD_FILES+=usr/include/dev/usb/usbcdc.h
 OLD_FILES+=usr/include/dev/usb/usbdivar.h
 OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h
 OLD_FILES+=usr/sbin/usbdevs
 OLD_FILES+=usr/share/man/man8/usbdevs.8.gz
 # 20090203: removal of pccard header files
 OLD_FILES+=usr/include/pccard/cardinfo.h
 OLD_FILES+=usr/include/pccard/cis.h
 OLD_DIRS+=usr/include/pccard
 # 20090203: adding_user.8 moved to adding_user.7
 OLD_FILES+=usr/share/man/man8/adding_user.8.gz
 # 20090102: file 4.26 import
 OLD_FILES+=usr/share/misc/magic.mime
 OLD_FILES+=usr/share/misc/magic.mime.mgc
 # 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1
 OLD_FILES+=usr/share/man/man8/nsupdate.8.gz
 # 20081223: ipprotosw.h removed
 OLD_FILES+=usr/include/netinet/ipprotosw.h
 # 20081123: vfs_mountedon.9 removed
 OLD_FILES+=usr/share/man/man9/vfs_mountedon.9.gz
 # 20081023: FREE.9 and MALLOC.9 removed
 OLD_FILES+=usr/share/man/man9/FREE.9.gz
 OLD_FILES+=usr/share/man/man9/MALLOC.9.gz
 # 20080928: removal of inaccurate device_ids(9) manual page
 OLD_FILES+=usr/share/man/man9/device_ids.9.gz
 OLD_FILES+=usr/share/man/man9/major.9.gz
 OLD_FILES+=usr/share/man/man9/minor.9.gz
 OLD_FILES+=usr/share/man/man9/umajor.9.gz
 OLD_FILES+=usr/share/man/man9/uminor.9.gz
 # 20080917: removal of manpage for axed kernel primitive suser(9)
 OLD_FILES+=usr/share/man/man9/suser.9.gz
 OLD_FILES+=usr/share/man/man9/suser_cred.9.gz
 # 20080913: pax removed from rescue
 OLD_FILES+=rescue/pax
 # 20080823: removal of unneeded pt_chown, to implement grantpt(3)
 OLD_FILES+=usr/libexec/pt_chown
 # 20080822: ntp 4.2.4p5 import
 OLD_FILES+=usr/share/doc/ntp/driver23.html
 OLD_FILES+=usr/share/doc/ntp/driver24.html
 # 20080821: several man pages moved from man4.i386 to man4
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/acpi_aiboost.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_asus.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_fujitsu.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_ibm.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_panasonic.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_sony.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_toshiba.4.gz
 OLD_FILES+=usr/share/man/man4/i386/ichwd.4.gz
 OLD_FILES+=usr/share/man/man4/i386/if_ndis.4.gz
 OLD_FILES+=usr/share/man/man4/i386/io.4.gz
 OLD_FILES+=usr/share/man/man4/i386/linux.4.gz
 OLD_FILES+=usr/share/man/man4/i386/ndis.4.gz
 .endif
 # 20080820: MPSAFE TTY layer integrated
 OLD_FILES+=usr/include/sys/linedisc.h
 OLD_FILES+=usr/share/man/man3/posix_openpt.3.gz
 # 20080725: sgtty.h removed
 OLD_FILES+=usr/include/sgtty.h
 # 20080706: bsdlabel(8) removed on powerpc
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=sbin/bsdlabel
 OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz
 .endif
 # 20080704: sbsh(4) removed
 OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz
 OLD_FILES+=usr/share/man/man4/sbsh.4.gz
 # 20080704: cnw(4) removed
 OLD_FILES+=usr/share/man/man4/if_cnw.4.gz
 OLD_FILES+=usr/share/man/man4/cnw.4.gz
 # 20080704: oltr(4) removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/if_oltr.4.gz
 OLD_FILES+=usr/share/man/man4/i386/oltr.4.gz
 .endif
 # 20080704: arl(4) removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/sbin/arlcontrol
 OLD_FILES+=usr/share/man/man4/i386/arl.4.gz
 OLD_FILES+=usr/share/man/man8/arlcontrol.8.gz
 .endif
 # 20080703: sunlabel only for sparc64
 .if ${TARGET_ARCH} != "sparc64"
 OLD_FILES+=sbin/sunlabel
 OLD_FILES+=usr/share/man/man8/sunlabel.8.gz
 .endif
 # 20080701: wpa_supplicant.conf moved to share/examples/etc/
 OLD_FILES+=usr/share/examples/wpa_supplicant/wpa_supplicant.conf
 OLD_DIRS+=usr/share/examples/wpa_supplicant
 # 20080614: pecoff image activator removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/pecoff_machdep.h
 .endif
 # 20080614: sgtty removed
 OLD_FILES+=usr/include/sys/ttychars.h
 OLD_FILES+=usr/include/sys/ttydev.h
 OLD_FILES+=usr/share/man/man3/gtty.3.gz
 OLD_FILES+=usr/share/man/man3/stty.3.gz
 # 20080609: gpt(8) removed
 OLD_FILES+=sbin/gpt
 OLD_FILES+=usr/share/man/man8/gpt.8.gz
 # 20080525: I4B removed
 OLD_FILES+=etc/isdn/answer
 OLD_FILES+=etc/isdn/isdntel
 OLD_FILES+=etc/isdn/record
 OLD_FILES+=etc/isdn/tell
 OLD_FILES+=etc/isdn/tell-record
 OLD_FILES+=etc/isdn/unknown_incoming
 OLD_FILES+=etc/isdn/holidays.D
 OLD_FILES+=etc/isdn/isdnd.rates.A
 OLD_FILES+=etc/isdn/isdnd.rates.D
 OLD_FILES+=etc/isdn/isdnd.rates.F
 OLD_FILES+=etc/isdn/isdnd.rates.L
 OLD_FILES+=etc/isdn/isdnd.rates.UK.BT
 OLD_FILES+=etc/isdn/isdnd.rc.sample
 OLD_FILES+=etc/isdn/isdntel.alias.sample
 OLD_DIRS+=etc/isdn
 OLD_FILES+=etc/rc.d/isdnd
 OLD_FILES+=usr/include/i4b/i4b_cause.h
 OLD_FILES+=usr/include/i4b/i4b_debug.h
 OLD_FILES+=usr/include/i4b/i4b_ioctl.h
 OLD_FILES+=usr/include/i4b/i4b_rbch_ioctl.h
 OLD_FILES+=usr/include/i4b/i4b_tel_ioctl.h
 OLD_FILES+=usr/include/i4b/i4b_trace.h
 OLD_DIRS+=usr/include/i4b
 OLD_FILES+=usr/sbin/dtmfdecode
 OLD_FILES+=usr/sbin/g711conv
 OLD_FILES+=usr/sbin/isdnd
 OLD_FILES+=usr/sbin/isdndebug
 OLD_FILES+=usr/sbin/isdndecode
 OLD_FILES+=usr/sbin/isdnmonitor
 OLD_FILES+=usr/sbin/isdnphone
 OLD_FILES+=usr/sbin/isdntel
 OLD_FILES+=usr/sbin/isdntelctl
 OLD_FILES+=usr/sbin/isdntrace
 OLD_FILES+=usr/share/isdn/0.al
 OLD_FILES+=usr/share/isdn/1.al
 OLD_FILES+=usr/share/isdn/2.al
 OLD_FILES+=usr/share/isdn/3.al
 OLD_FILES+=usr/share/isdn/4.al
 OLD_FILES+=usr/share/isdn/5.al
 OLD_FILES+=usr/share/isdn/6.al
 OLD_FILES+=usr/share/isdn/7.al
 OLD_FILES+=usr/share/isdn/8.al
 OLD_FILES+=usr/share/isdn/9.al
 OLD_FILES+=usr/share/isdn/beep.al
 OLD_FILES+=usr/share/isdn/msg.al
 OLD_DIRS+=usr/share/isdn
 OLD_FILES+=usr/share/man/man1/dtmfdecode.1.gz
 OLD_FILES+=usr/share/man/man1/g711conv.1.gz
 OLD_FILES+=usr/share/man/man4/i4b.4.gz
 OLD_FILES+=usr/share/man/man4/i4bcapi.4.gz
 OLD_FILES+=usr/share/man/man4/i4bctl.4.gz
 OLD_FILES+=usr/share/man/man4/i4bing.4.gz
 OLD_FILES+=usr/share/man/man4/i4bipr.4.gz
 OLD_FILES+=usr/share/man/man4/i4bisppp.4.gz
 OLD_FILES+=usr/share/man/man4/i4bq921.4.gz
 OLD_FILES+=usr/share/man/man4/i4bq931.4.gz
 OLD_FILES+=usr/share/man/man4/i4brbch.4.gz
 OLD_FILES+=usr/share/man/man4/i4btel.4.gz
 OLD_FILES+=usr/share/man/man4/i4btrc.4.gz
 OLD_FILES+=usr/share/man/man4/iavc.4.gz
 OLD_FILES+=usr/share/man/man4/isic.4.gz
 OLD_FILES+=usr/share/man/man4/ifpi.4.gz
 OLD_FILES+=usr/share/man/man4/ifpi2.4.gz
 OLD_FILES+=usr/share/man/man4/ifpnp.4.gz
 OLD_FILES+=usr/share/man/man4/ihfc.4.gz
 OLD_FILES+=usr/share/man/man4/itjc.4.gz
 OLD_FILES+=usr/share/man/man4/iwic.4.gz
 OLD_FILES+=usr/share/man/man5/isdnd.rc.5.gz
 OLD_FILES+=usr/share/man/man5/isdnd.rates.5.gz
 OLD_FILES+=usr/share/man/man5/isdnd.acct.5.gz
 OLD_FILES+=usr/share/man/man8/isdnd.8.gz
 OLD_FILES+=usr/share/man/man8/isdndebug.8.gz
 OLD_FILES+=usr/share/man/man8/isdndecode.8.gz
 OLD_FILES+=usr/share/man/man8/isdnmonitor.8.gz
 OLD_FILES+=usr/share/man/man8/isdnphone.8.gz
 OLD_FILES+=usr/share/man/man8/isdntel.8.gz
 OLD_FILES+=usr/share/man/man8/isdntelctl.8.gz
 OLD_FILES+=usr/share/man/man8/isdntrace.8.gz
 OLD_FILES+=usr/share/examples/isdn/contrib/README
 OLD_FILES+=usr/share/examples/isdn/contrib/anleitung.ppp
 OLD_FILES+=usr/share/examples/isdn/contrib/answer.c
 OLD_FILES+=usr/share/examples/isdn/contrib/answer.sh
 OLD_FILES+=usr/share/examples/isdn/contrib/convert.sh
 OLD_FILES+=usr/share/examples/isdn/contrib/hplay.c
 OLD_FILES+=usr/share/examples/isdn/contrib/i4b-ppp-newbie.txt
 OLD_FILES+=usr/share/examples/isdn/contrib/isdnctl
 OLD_FILES+=usr/share/examples/isdn/contrib/isdnd_acct
 OLD_FILES+=usr/share/examples/isdn/contrib/isdnd_acct.pl
 OLD_FILES+=usr/share/examples/isdn/contrib/isdntelmux.c
 OLD_FILES+=usr/share/examples/isdn/contrib/mrtg-isp0.sh
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/Makefile
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/README
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/i4brunppp.8
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/i4brunppp.c
 OLD_FILES+=usr/share/examples/isdn/v21/Makefile
 OLD_FILES+=usr/share/examples/isdn/v21/README
 OLD_FILES+=usr/share/examples/isdn/v21/v21modem.c
 OLD_FILES+=usr/share/examples/isdn/FAQ
 OLD_FILES+=usr/share/examples/isdn/KERNEL
 OLD_FILES+=usr/share/examples/isdn/Overview
 OLD_FILES+=usr/share/examples/isdn/README
 OLD_FILES+=usr/share/examples/isdn/ROADMAP
 OLD_FILES+=usr/share/examples/isdn/ReleaseNotes
 OLD_FILES+=usr/share/examples/isdn/Resources
 OLD_FILES+=usr/share/examples/isdn/SupportedCards
 OLD_FILES+=usr/share/examples/isdn/ThankYou
 OLD_DIRS+=usr/share/examples/isdn/contrib
 OLD_DIRS+=usr/share/examples/isdn/i4brunppp
 OLD_DIRS+=usr/share/examples/isdn/v21
 OLD_DIRS+=usr/share/examples/isdn
 OLD_FILES+=usr/share/examples/ppp/isdnd.rc
 OLD_FILES+=usr/share/examples/ppp/ppp.conf.isdn
 # 20080525: ng_atmpif removed
 OLD_FILES+=usr/include/netgraph/atm/ng_atmpif.h
 OLD_FILES+=usr/share/man/man4/ng_atmpif.4.gz
 # 20080522: pmap_addr_hint removed
 OLD_FILES+=usr/share/man/man9/pmap_addr_hint.9.gz
 # 20080517: ipsec_osdep.h removed
 OLD_FILES+=usr/include/netipsec/ipsec_osdep.h
 # 20080507: heimdal 1.1 import
 OLD_LIBS+=usr/lib/libasn1.so.9
 OLD_LIBS+=usr/lib/libgssapi.so.9
 OLD_LIBS+=usr/lib/libgssapi_krb5.so.9
 OLD_LIBS+=usr/lib/libhdb.so.9
 OLD_LIBS+=usr/lib/libkadm5clnt.so.9
 OLD_LIBS+=usr/lib/libkadm5srv.so.9
 OLD_LIBS+=usr/lib/libkafs5.so.9
 OLD_LIBS+=usr/lib/libkrb5.so.9
 OLD_LIBS+=usr/lib/libroken.so.9
 # 20080420: Symbol card support dropped
 OLD_FILES+=usr/include/dev/wi/spectrum24t_cf.h
 # 20080420: awi removal
 OLD_FILES+=usr/share/man/man4/awi.4.gz
 OLD_FILES+=usr/share/man/man4/if_awi.4.gz
 # 20080331: pkg_sign has been removed
 OLD_FILES+=usr/sbin/pkg_check
 OLD_FILES+=usr/sbin/pkg_sign
 OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
 # 20080314: stack_print(9) mlink fixed
 OLD_FILES+=usr/share/man/man9/stack_printf.9.gz
 # 20080312: libkse removal
 OLD_FILES+=usr/include/sys/kse.h
 OLD_FILES+=usr/lib/libkse.so
 OLD_LIBS+=usr/lib/libkse.so.3
 OLD_FILES+=usr/share/man/man2/kse.2.gz
 OLD_FILES+=usr/share/man/man2/kse_create.2.gz
 OLD_FILES+=usr/share/man/man2/kse_exit.2.gz
 OLD_FILES+=usr/share/man/man2/kse_release.2.gz
 OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz
 OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz
 OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
 # 20080225: bsdar/bsdranlib rename to ar/ranlib
 OLD_FILES+=usr/bin/bsdar
 OLD_FILES+=usr/bin/bsdranlib
 OLD_FILES+=usr/share/man/man1/bsdar.1.gz
 OLD_FILES+=usr/share/man/man1/bsdranlib.1.gz
 # 20080220: geom_lvm rename to geom_linux_lvm
 OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
 # 20080126: oldcard.4 removal
 OLD_FILES+=usr/share/man/man4/card.4.gz
 OLD_FILES+=usr/share/man/man4/oldcard.4.gz
 # 20080122: Removed from the tree
 OLD_FILES+=usr/share/man/man9/BUF_REFCNT.9.gz
 # 20080108: Moved to section 2
 OLD_FILES+=usr/share/man/man3/shm_open.3.gz
 OLD_FILES+=usr/share/man/man3/shm_unlink.3.gz
 # 20071207: Merged with fortunes-o.real
 OLD_FILES+=usr/share/games/fortune/fortunes2-o
 OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat
 # 20071201: Removal of XRPU driver
 OLD_FILES+=usr/include/sys/xrpuio.h
 # 20071129: Disabled static versions of libkse by default
 OLD_FILES+=usr/lib/libkse.a
 OLD_FILES+=usr/lib/libkse_p.a
 OLD_FILES+=usr/lib/libkse_pic.a
 # 20071129: Removed a Solaris compatibility header
 OLD_FILES+=usr/include/sys/_elf_solaris.h
 # 20071125: Renamed to pmc_get_msr()
 OLD_FILES+=usr/share/man/man3/pmc_x86_get_msr.3.gz
 # 20071108: Removed very crunch OLDCARD support file
 OLD_FILES+=etc/defaults/pccard.conf
 # 20071025: rc.d/nfslocking superseded by rc.d/lockd and rc.d/statd
 OLD_FILES+=etc/rc.d/nfslocking
 # 20070930: rename of cached to nscd
 OLD_FILES+=etc/cached.conf
 OLD_FILES+=etc/rc.d/cached
 OLD_FILES+=usr/sbin/cached
 OLD_FILES+=usr/share/man/man5/cached.conf.5.gz
 OLD_FILES+=usr/share/man/man8/cached.8.gz
 # 20070807: removal of PowerPC specific header file
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/interruptvar.h
 .endif
 # 20070801: fast_ipsec.4 gone
 OLD_FILES+=usr/share/man/man4/fast_ipsec.4.gz
 # 20070715: netatm temporarily disconnected (removed 20080525)
 OLD_FILES+=rescue/atm
 OLD_FILES+=rescue/fore_dnld
 OLD_FILES+=rescue/ilmid
 OLD_FILES+=sbin/atm
 OLD_FILES+=sbin/fore_dnld
 OLD_FILES+=sbin/ilmid
 OLD_FILES+=usr/include/libatm.h
 OLD_FILES+=usr/include/netatm/atm.h
 OLD_FILES+=usr/include/netatm/atm_cm.h
 OLD_FILES+=usr/include/netatm/atm_if.h
 OLD_FILES+=usr/include/netatm/atm_ioctl.h
 OLD_FILES+=usr/include/netatm/atm_pcb.h
 OLD_FILES+=usr/include/netatm/atm_sap.h
 OLD_FILES+=usr/include/netatm/atm_sigmgr.h
 OLD_FILES+=usr/include/netatm/atm_stack.h
 OLD_FILES+=usr/include/netatm/atm_sys.h
 OLD_FILES+=usr/include/netatm/atm_var.h
 OLD_FILES+=usr/include/netatm/atm_vc.h
 OLD_FILES+=usr/include/netatm/ipatm/ipatm.h
 OLD_FILES+=usr/include/netatm/ipatm/ipatm_serv.h
 OLD_FILES+=usr/include/netatm/ipatm/ipatm_var.h
 OLD_FILES+=usr/include/netatm/port.h
 OLD_FILES+=usr/include/netatm/queue.h
 OLD_FILES+=usr/include/netatm/sigpvc/sigpvc_var.h
 OLD_FILES+=usr/include/netatm/spans/spans_cls.h
 OLD_FILES+=usr/include/netatm/spans/spans_kxdr.h
 OLD_FILES+=usr/include/netatm/spans/spans_var.h
 OLD_FILES+=usr/include/netatm/uni/sscf_uni.h
 OLD_FILES+=usr/include/netatm/uni/sscf_uni_var.h
 OLD_FILES+=usr/include/netatm/uni/sscop.h
 OLD_FILES+=usr/include/netatm/uni/sscop_misc.h
 OLD_FILES+=usr/include/netatm/uni/sscop_pdu.h
 OLD_FILES+=usr/include/netatm/uni/sscop_var.h
 OLD_FILES+=usr/include/netatm/uni/uni.h
 OLD_FILES+=usr/include/netatm/uni/uniip_var.h
 OLD_FILES+=usr/include/netatm/uni/unisig.h
 OLD_FILES+=usr/include/netatm/uni/unisig_decode.h
 OLD_FILES+=usr/include/netatm/uni/unisig_mbuf.h
 OLD_FILES+=usr/include/netatm/uni/unisig_msg.h
 OLD_FILES+=usr/include/netatm/uni/unisig_print.h
 OLD_FILES+=usr/include/netatm/uni/unisig_var.h
 OLD_FILES+=usr/lib/libatm.a
 OLD_FILES+=usr/lib/libatm_p.a
 OLD_FILES+=usr/sbin/atmarpd
 OLD_FILES+=usr/sbin/scspd
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atm.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atmarpd.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/fore_dnld.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/ilmid.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/scspd.8.gz
 OLD_FILES+=usr/share/man/man8/atm.8.gz
 OLD_FILES+=usr/share/man/man8/atmarpd.8.gz
 OLD_FILES+=usr/share/man/man8/fore_dnld.8.gz
 OLD_FILES+=usr/share/man/man8/ilmid.8.gz
 OLD_FILES+=usr/share/man/man8/scspd.8.gz
 OLD_FILES+=usr/share/examples/atm/NOTES
 OLD_FILES+=usr/share/examples/atm/README
 OLD_FILES+=usr/share/examples/atm/Startup
 OLD_FILES+=usr/share/examples/atm/atm-config.sh
 OLD_FILES+=usr/share/examples/atm/atm-sockets.txt
 OLD_FILES+=usr/share/examples/atm/cpcs-design.txt
 OLD_FILES+=usr/share/examples/atm/fore-microcode.txt
 OLD_FILES+=usr/share/examples/atm/sscf-design.txt
 OLD_FILES+=usr/share/examples/atm/sscop-design.txt
 OLD_LIBS+=lib/libatm.so.5
 OLD_FILES+=usr/lib/libatm.so
 OLD_DIRS+=usr/include/netatm/sigpvc
 OLD_DIRS+=usr/include/netatm/spans
 OLD_DIRS+=usr/include/netatm/ipatm
 OLD_DIRS+=usr/include/netatm/uni
 OLD_DIRS+=usr/include/netatm
 OLD_DIRS+=usr/share/examples/atm
 # 20070705: I4B headers repo-copied to include/i4b/
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/i4b_cause.h
 OLD_FILES+=usr/include/machine/i4b_debug.h
 OLD_FILES+=usr/include/machine/i4b_ioctl.h
 OLD_FILES+=usr/include/machine/i4b_rbch_ioctl.h
 OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h
 OLD_FILES+=usr/include/machine/i4b_trace.h
 .endif
 # 20070703: pf 4.1 import
 OLD_FILES+=usr/libexec/ftp-proxy
 # 20070701: KAME IPSec removal
 OLD_FILES+=usr/include/netinet6/ah.h
 OLD_FILES+=usr/include/netinet6/ah6.h
 OLD_FILES+=usr/include/netinet6/ah_aesxcbcmac.h
 OLD_FILES+=usr/include/netinet6/esp.h
 OLD_FILES+=usr/include/netinet6/esp6.h
 OLD_FILES+=usr/include/netinet6/esp_aesctr.h
 OLD_FILES+=usr/include/netinet6/esp_camellia.h
 OLD_FILES+=usr/include/netinet6/esp_rijndael.h
 OLD_FILES+=usr/include/netinet6/ipsec.h
 OLD_FILES+=usr/include/netinet6/ipsec6.h
 OLD_FILES+=usr/include/netinet6/ipcomp.h
 OLD_FILES+=usr/include/netinet6/ipcomp6.h
 OLD_FILES+=usr/include/netkey/key.h
 OLD_FILES+=usr/include/netkey/key_debug.h
 OLD_FILES+=usr/include/netkey/key_var.h
 OLD_FILES+=usr/include/netkey/keydb.h
 OLD_FILES+=usr/include/netkey/keysock.h
 OLD_DIRS+=usr/include/netkey
 # 20070701: remove wicontrol
 OLD_FILES+=usr/sbin/wicontrol
 OLD_FILES+=usr/share/man/man8/wicontrol.8.gz
 # 20070625: umapfs removal
 OLD_FILES+=rescue/mount_umapfs
 OLD_FILES+=sbin/mount_umapfs
 OLD_FILES+=usr/include/fs/umapfs/umap.h
 OLD_FILES+=usr/share/man/man8/mount_umapfs.8.gz
 OLD_DIRS+=usr/include/fs/umapfs
 # 20070618: Removal of the PROTO.localhost* files
 OLD_FILES+=etc/namedb/PROTO.localhost-v6.rev
 OLD_FILES+=etc/namedb/PROTO.localhost.rev
 OLD_FILES+=etc/namedb/make-localhost
 # 20070618: shared library version bump
 OLD_LIBS+=lib/libalias.so.5
 OLD_LIBS+=lib/libbsnmp.so.3
 OLD_LIBS+=lib/libncurses.so.6
 OLD_LIBS+=lib/libncursesw.so.6
 OLD_LIBS+=lib/libreadline.so.6
 OLD_LIBS+=usr/lib/libdialog.so.5
 OLD_LIBS+=usr/lib/libgnuregex.so.3
 OLD_LIBS+=usr/lib/libhistory.so.6
 OLD_LIBS+=usr/lib/libpam.so.3
 OLD_LIBS+=usr/lib/libssh.so.3
 OLD_LIBS+=usr/lib/pam_chroot.so.3
 OLD_LIBS+=usr/lib/pam_deny.so.3
 OLD_LIBS+=usr/lib/pam_echo.so.3
 OLD_LIBS+=usr/lib/pam_exec.so.3
 OLD_LIBS+=usr/lib/pam_ftpusers.so.3
 OLD_LIBS+=usr/lib/pam_group.so.3
 OLD_LIBS+=usr/lib/pam_guest.so.3
 OLD_LIBS+=usr/lib/pam_krb5.so.3
 OLD_LIBS+=usr/lib/pam_ksu.so.3
 OLD_LIBS+=usr/lib/pam_lastlog.so.3
 OLD_LIBS+=usr/lib/pam_login_access.so.3
 OLD_LIBS+=usr/lib/pam_nologin.so.3
 OLD_LIBS+=usr/lib/pam_opie.so.3
 OLD_LIBS+=usr/lib/pam_opieaccess.so.3
 OLD_LIBS+=usr/lib/pam_passwdqc.so.3
 OLD_LIBS+=usr/lib/pam_permit.so.3
 OLD_LIBS+=usr/lib/pam_radius.so.3
 OLD_LIBS+=usr/lib/pam_rhosts.so.3
 OLD_LIBS+=usr/lib/pam_rootok.so.3
 OLD_LIBS+=usr/lib/pam_securetty.so.3
 OLD_LIBS+=usr/lib/pam_self.so.3
 OLD_LIBS+=usr/lib/pam_ssh.so.3
 OLD_LIBS+=usr/lib/pam_tacplus.so.3
 OLD_LIBS+=usr/lib/pam_unix.so.3
 OLD_LIBS+=usr/lib/snmp_atm.so.4
 OLD_LIBS+=usr/lib/snmp_bridge.so.4
 OLD_LIBS+=usr/lib/snmp_hostres.so.4
 OLD_LIBS+=usr/lib/snmp_mibII.so.4
 OLD_LIBS+=usr/lib/snmp_netgraph.so.4
 OLD_LIBS+=usr/lib/snmp_pf.so.4
 # 20070613: IPX over IP tunnel removal
 OLD_FILES+=usr/include/netipx/ipx_ip.h
 # 20070605: sched_core removal
 OLD_FILES+=usr/share/man/man4/sched_core.4.gz
 # 20070603: BIND 9.4.1 import
 OLD_LIBS+=usr/lib/liblwres.so.10
 # 20070521: shared library version bump
 OLD_LIBS+=lib/libatm.so.4
 OLD_LIBS+=lib/libbegemot.so.2
 OLD_LIBS+=lib/libbsdxml.so.2
 OLD_LIBS+=lib/libcam.so.3
 OLD_LIBS+=lib/libcrypt.so.3
 OLD_LIBS+=lib/libdevstat.so.5
 OLD_LIBS+=lib/libedit.so.5
 OLD_LIBS+=lib/libgeom.so.3
 OLD_LIBS+=lib/libipsec.so.2
 OLD_LIBS+=lib/libipx.so.3
 OLD_LIBS+=lib/libkiconv.so.2
 OLD_LIBS+=lib/libkse.so.2
 OLD_LIBS+=lib/libkvm.so.3
 OLD_LIBS+=lib/libm.so.4
 OLD_LIBS+=lib/libmd.so.3
 OLD_LIBS+=lib/libpcap.so.4
 OLD_LIBS+=lib/libpthread.so.2
 OLD_LIBS+=lib/libsbuf.so.3
 OLD_LIBS+=lib/libthr.so.2
 OLD_LIBS+=lib/libufs.so.3
 OLD_LIBS+=lib/libutil.so.6
 OLD_LIBS+=lib/libz.so.3
 OLD_LIBS+=usr/lib/libbluetooth.so.2
 OLD_LIBS+=usr/lib/libbsm.so.1
 OLD_LIBS+=usr/lib/libbz2.so.2
 OLD_LIBS+=usr/lib/libcalendar.so.3
 OLD_LIBS+=usr/lib/libcom_err.so.3
 OLD_LIBS+=usr/lib/libdevinfo.so.3
 OLD_LIBS+=usr/lib/libfetch.so.4
 OLD_LIBS+=usr/lib/libform.so.3
 OLD_LIBS+=usr/lib/libformw.so.3
 OLD_LIBS+=usr/lib/libftpio.so.6
 OLD_LIBS+=usr/lib/libgpib.so.1
 OLD_LIBS+=usr/lib/libkse.so.2
 OLD_LIBS+=usr/lib/libmagic.so.2
 OLD_LIBS+=usr/lib/libmemstat.so.1
 OLD_LIBS+=usr/lib/libmenu.so.3
 OLD_LIBS+=usr/lib/libmenuw.so.3
 OLD_LIBS+=usr/lib/libmilter.so.3
 OLD_LIBS+=usr/lib/libmp.so.5
 OLD_LIBS+=usr/lib/libncp.so.2
 OLD_LIBS+=usr/lib/libnetgraph.so.2
 OLD_LIBS+=usr/lib/libngatm.so.2
 OLD_LIBS+=usr/lib/libopie.so.4
 OLD_LIBS+=usr/lib/libpanel.so.3
 OLD_LIBS+=usr/lib/libpanelw.so.3
 OLD_LIBS+=usr/lib/libpmc.so.3
 OLD_LIBS+=usr/lib/libradius.so.2
 OLD_LIBS+=usr/lib/librpcsvc.so.3
 OLD_LIBS+=usr/lib/libsdp.so.2
 OLD_LIBS+=usr/lib/libsmb.so.2
 OLD_LIBS+=usr/lib/libstdc++.so.5
 OLD_LIBS+=usr/lib/libtacplus.so.2
 OLD_LIBS+=usr/lib/libthr.so.2
 OLD_LIBS+=usr/lib/libthread_db.so.2
 OLD_LIBS+=usr/lib/libugidfw.so.2
 OLD_LIBS+=usr/lib/libusbhid.so.2
 OLD_LIBS+=usr/lib/libvgl.so.4
 OLD_LIBS+=usr/lib/libwrap.so.4
 OLD_LIBS+=usr/lib/libypclnt.so.2
 OLD_LIBS+=usr/lib/snmp_bridge.so.3
 OLD_LIBS+=usr/lib/snmp_hostres.so.3
 # 20070519: GCC 4.2
 OLD_FILES+=usr/bin/f77
 OLD_FILES+=usr/bin/protoize
 OLD_FILES+=usr/include/g2c.h
 OLD_FILES+=usr/libexec/f771
 OLD_FILES+=usr/share/info/g77.info.gz
 OLD_FILES+=usr/share/man/man1/f77.1.gz
 OLD_FILES+=usr/include/c++/3.4/algorithm
 OLD_FILES+=usr/include/c++/3.4/backward/algo.h
 OLD_FILES+=usr/include/c++/3.4/backward/algobase.h
 OLD_FILES+=usr/include/c++/3.4/backward/alloc.h
 OLD_FILES+=usr/include/c++/3.4/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/3.4/backward/bvector.h
 OLD_FILES+=usr/include/c++/3.4/backward/complex.h
 OLD_FILES+=usr/include/c++/3.4/backward/defalloc.h
 OLD_FILES+=usr/include/c++/3.4/backward/deque.h
 OLD_FILES+=usr/include/c++/3.4/backward/fstream.h
 OLD_FILES+=usr/include/c++/3.4/backward/function.h
 OLD_FILES+=usr/include/c++/3.4/backward/hash_map.h
 OLD_FILES+=usr/include/c++/3.4/backward/hash_set.h
 OLD_FILES+=usr/include/c++/3.4/backward/hashtable.h
 OLD_FILES+=usr/include/c++/3.4/backward/heap.h
 OLD_FILES+=usr/include/c++/3.4/backward/iomanip.h
 OLD_FILES+=usr/include/c++/3.4/backward/iostream.h
 OLD_FILES+=usr/include/c++/3.4/backward/istream.h
 OLD_FILES+=usr/include/c++/3.4/backward/iterator.h
 OLD_FILES+=usr/include/c++/3.4/backward/list.h
 OLD_FILES+=usr/include/c++/3.4/backward/map.h
 OLD_FILES+=usr/include/c++/3.4/backward/multimap.h
 OLD_FILES+=usr/include/c++/3.4/backward/multiset.h
 OLD_FILES+=usr/include/c++/3.4/backward/new.h
 OLD_FILES+=usr/include/c++/3.4/backward/ostream.h
 OLD_FILES+=usr/include/c++/3.4/backward/pair.h
 OLD_FILES+=usr/include/c++/3.4/backward/queue.h
 OLD_FILES+=usr/include/c++/3.4/backward/rope.h
 OLD_FILES+=usr/include/c++/3.4/backward/set.h
 OLD_FILES+=usr/include/c++/3.4/backward/slist.h
 OLD_FILES+=usr/include/c++/3.4/backward/stack.h
 OLD_FILES+=usr/include/c++/3.4/backward/stream.h
 OLD_FILES+=usr/include/c++/3.4/backward/streambuf.h
 OLD_FILES+=usr/include/c++/3.4/backward/strstream
 OLD_FILES+=usr/include/c++/3.4/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/3.4/backward/tree.h
 OLD_FILES+=usr/include/c++/3.4/backward/vector.h
 OLD_FILES+=usr/include/c++/3.4/bits/allocator.h
 OLD_FILES+=usr/include/c++/3.4/bits/atomic_word.h
 OLD_FILES+=usr/include/c++/3.4/bits/atomicity.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_file.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/basic_string.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++allocator.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++config.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++io.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++locale.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/3.4/bits/char_traits.h
 OLD_FILES+=usr/include/c++/3.4/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/codecvt.h
 OLD_FILES+=usr/include/c++/3.4/bits/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/3.4/bits/concept_check.h
 OLD_FILES+=usr/include/c++/3.4/bits/concurrence.h
 OLD_FILES+=usr/include/c++/3.4/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/3.4/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/3.4/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/3.4/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/3.4/bits/deque.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/functexcept.h
 OLD_FILES+=usr/include/c++/3.4/bits/gslice.h
 OLD_FILES+=usr/include/c++/3.4/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr.h
 OLD_FILES+=usr/include/c++/3.4/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/ios_base.h
 OLD_FILES+=usr/include/c++/3.4/bits/istream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/list.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/localefwd.h
 OLD_FILES+=usr/include/c++/3.4/bits/mask_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/messages_members.h
 OLD_FILES+=usr/include/c++/3.4/bits/os_defines.h
 OLD_FILES+=usr/include/c++/3.4/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/postypes.h
 OLD_FILES+=usr/include/c++/3.4/bits/slice_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_function.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_list.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_map.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_set.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_threads.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/3.4/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/3.4/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/3.4/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/3.4/bits/time_members.h
 OLD_FILES+=usr/include/c++/3.4/bits/type_traits.h
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_after.h
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_before.h
 OLD_FILES+=usr/include/c++/3.4/bits/vector.tcc
 OLD_FILES+=usr/include/c++/3.4/bitset
 OLD_FILES+=usr/include/c++/3.4/cassert
 OLD_FILES+=usr/include/c++/3.4/cctype
 OLD_FILES+=usr/include/c++/3.4/cerrno
 OLD_FILES+=usr/include/c++/3.4/cfloat
 OLD_FILES+=usr/include/c++/3.4/ciso646
 OLD_FILES+=usr/include/c++/3.4/climits
 OLD_FILES+=usr/include/c++/3.4/clocale
 OLD_FILES+=usr/include/c++/3.4/cmath
 OLD_FILES+=usr/include/c++/3.4/complex
 OLD_FILES+=usr/include/c++/3.4/csetjmp
 OLD_FILES+=usr/include/c++/3.4/csignal
 OLD_FILES+=usr/include/c++/3.4/cstdarg
 OLD_FILES+=usr/include/c++/3.4/cstddef
 OLD_FILES+=usr/include/c++/3.4/cstdio
 OLD_FILES+=usr/include/c++/3.4/cstdlib
 OLD_FILES+=usr/include/c++/3.4/cstring
 OLD_FILES+=usr/include/c++/3.4/ctime
 OLD_FILES+=usr/include/c++/3.4/cwchar
 OLD_FILES+=usr/include/c++/3.4/cwctype
 OLD_FILES+=usr/include/c++/3.4/cxxabi.h
 OLD_FILES+=usr/include/c++/3.4/debug/bitset
 OLD_FILES+=usr/include/c++/3.4/debug/debug.h
 OLD_FILES+=usr/include/c++/3.4/debug/deque
 OLD_FILES+=usr/include/c++/3.4/debug/formatter.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_map
 OLD_FILES+=usr/include/c++/3.4/debug/hash_map.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_multimap.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_multiset.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_set
 OLD_FILES+=usr/include/c++/3.4/debug/hash_set.h
 OLD_FILES+=usr/include/c++/3.4/debug/list
 OLD_FILES+=usr/include/c++/3.4/debug/map
 OLD_FILES+=usr/include/c++/3.4/debug/map.h
 OLD_FILES+=usr/include/c++/3.4/debug/multimap.h
 OLD_FILES+=usr/include/c++/3.4/debug/multiset.h
 OLD_FILES+=usr/include/c++/3.4/debug/safe_base.h
 OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.h
 OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.tcc
 OLD_FILES+=usr/include/c++/3.4/debug/safe_sequence.h
 OLD_FILES+=usr/include/c++/3.4/debug/set
 OLD_FILES+=usr/include/c++/3.4/debug/set.h
 OLD_FILES+=usr/include/c++/3.4/debug/string
 OLD_FILES+=usr/include/c++/3.4/debug/vector
 OLD_FILES+=usr/include/c++/3.4/deque
 OLD_FILES+=usr/include/c++/3.4/exception
 OLD_FILES+=usr/include/c++/3.4/exception_defines.h
 OLD_FILES+=usr/include/c++/3.4/ext/algorithm
 OLD_FILES+=usr/include/c++/3.4/ext/bitmap_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/debug_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/enc_filebuf.h
 OLD_FILES+=usr/include/c++/3.4/ext/functional
 OLD_FILES+=usr/include/c++/3.4/ext/hash_fun.h
 OLD_FILES+=usr/include/c++/3.4/ext/hash_map
 OLD_FILES+=usr/include/c++/3.4/ext/hash_set
 OLD_FILES+=usr/include/c++/3.4/ext/hashtable.h
 OLD_FILES+=usr/include/c++/3.4/ext/iterator
 OLD_FILES+=usr/include/c++/3.4/ext/malloc_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/memory
 OLD_FILES+=usr/include/c++/3.4/ext/mt_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/new_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/numeric
 OLD_FILES+=usr/include/c++/3.4/ext/pod_char_traits.h
 OLD_FILES+=usr/include/c++/3.4/ext/pool_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/rb_tree
 OLD_FILES+=usr/include/c++/3.4/ext/rope
 OLD_FILES+=usr/include/c++/3.4/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/3.4/ext/slist
 OLD_FILES+=usr/include/c++/3.4/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/3.4/ext/stdio_sync_filebuf.h
 OLD_FILES+=usr/include/c++/3.4/fstream
 OLD_FILES+=usr/include/c++/3.4/functional
 OLD_FILES+=usr/include/c++/3.4/iomanip
 OLD_FILES+=usr/include/c++/3.4/ios
 OLD_FILES+=usr/include/c++/3.4/iosfwd
 OLD_FILES+=usr/include/c++/3.4/iostream
 OLD_FILES+=usr/include/c++/3.4/istream
 OLD_FILES+=usr/include/c++/3.4/iterator
 OLD_FILES+=usr/include/c++/3.4/limits
 OLD_FILES+=usr/include/c++/3.4/list
 OLD_FILES+=usr/include/c++/3.4/locale
 OLD_FILES+=usr/include/c++/3.4/map
 OLD_FILES+=usr/include/c++/3.4/memory
 OLD_FILES+=usr/include/c++/3.4/new
 OLD_FILES+=usr/include/c++/3.4/numeric
 OLD_FILES+=usr/include/c++/3.4/ostream
 OLD_FILES+=usr/include/c++/3.4/queue
 OLD_FILES+=usr/include/c++/3.4/set
 OLD_FILES+=usr/include/c++/3.4/sstream
 OLD_FILES+=usr/include/c++/3.4/stack
 OLD_FILES+=usr/include/c++/3.4/stdexcept
 OLD_FILES+=usr/include/c++/3.4/streambuf
 OLD_FILES+=usr/include/c++/3.4/string
 OLD_FILES+=usr/include/c++/3.4/typeinfo
 OLD_FILES+=usr/include/c++/3.4/utility
 OLD_FILES+=usr/include/c++/3.4/valarray
 OLD_FILES+=usr/include/c++/3.4/vector
 OLD_DIRS+=usr/include/c++/3.4/backward
 OLD_DIRS+=usr/include/c++/3.4/bits
 OLD_DIRS+=usr/include/c++/3.4/debug
 OLD_DIRS+=usr/include/c++/3.4/ext
 OLD_DIRS+=usr/include/c++/3.4
 # 20070510: zpool/zfs moved to /sbin
 OLD_FILES+=usr/sbin/zfs
 OLD_FILES+=usr/sbin/zpool
 # 20070423: rc.bluetooth (examples) removed
 OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth
 OLD_DIRS+=usr/share/examples/netgraph/bluetooth
 # 20070421: worm.4 removed
 OLD_FILES+=usr/share/man/man4/worm.4.gz
 # 20070417: trunk(4) renamed to lagg(4)
 OLD_FILES+=usr/include/net/if_trunk.h
 # 20070409: uuidgen moved to /bin/
 OLD_FILES+=usr/bin/uuidgen
 # 20070328: bzip2 1.0.4
 OLD_FILES+=usr/share/info/bzip2.info.gz
 # 20070303: libarchive 2.0
 OLD_LIBS+=usr/lib/libarchive.so.3
 # 20070301: remove addr2ascii and ascii2addr
 OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz
 OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz
 # 20070225: vm_page_unmanage() removed
 OLD_FILES+=usr/share/man/man9/vm_page_unmanage.9.gz
 # 20070216: VFS_VPTOFH(9) -> VOP_VPTOFH(9)
 OLD_FILES+=usr/share/man/man9/VFS_VPTOFH.9.gz
 # 20070212: kame.4 removed
 OLD_FILES+=usr/share/man/man4/kame.4.gz
 # 20070201: remove libmytinfo link
 OLD_FILES+=usr/lib/libmytinfo.a
 OLD_FILES+=usr/lib/libmytinfo.so
 OLD_FILES+=usr/lib/libmytinfo_p.a
 OLD_FILES+=usr/lib/libmytinfow.a
 OLD_FILES+=usr/lib/libmytinfow.so
 OLD_FILES+=usr/lib/libmytinfow_p.a
 # 20070128: remove vnconfig
 OLD_FILES+=usr/sbin/vnconfig
 # 20070127: remove bpf_compat.h
 OLD_FILES+=usr/include/net/bpf_compat.h
 # 20070125: objformat bites the dust
 OLD_FILES+=usr/bin/objformat
 OLD_FILES+=usr/share/man/man1/objformat.1.gz
 OLD_FILES+=usr/include/objformat.h
 OLD_FILES+=usr/share/man/man3/getobjformat.3.gz
 # 20061008: rename *.so.4 libalias modules to *.so and move to /lib
 # This uses MOVED_LIBS because the new files are libraries even though
 # the old files to remove are symlinks
 MOVED_LIBS+=usr/lib/libalias_cuseeme.so
 MOVED_LIBS+=usr/lib/libalias_dummy.so
 MOVED_LIBS+=usr/lib/libalias_ftp.so
 MOVED_LIBS+=usr/lib/libalias_irc.so
 MOVED_LIBS+=usr/lib/libalias_nbt.so
 MOVED_LIBS+=usr/lib/libalias_pptp.so
 MOVED_LIBS+=usr/lib/libalias_skinny.so
 MOVED_LIBS+=usr/lib/libalias_smedia.so
 OLD_LIBS+=lib/libalias_cuseeme.so.4
 OLD_LIBS+=lib/libalias_dummy.so.4
 OLD_LIBS+=lib/libalias_ftp.so.4
 OLD_LIBS+=lib/libalias_irc.so.4
 OLD_LIBS+=lib/libalias_nbt.so.4
 OLD_LIBS+=lib/libalias_pptp.so.4
 OLD_LIBS+=lib/libalias_skinny.so.4
 OLD_LIBS+=lib/libalias_smedia.so.4
 # 20061126: remove old man page
 OLD_FILES+=usr/share/man/man3/archive_read_set_bytes_per_block.3.gz
 # 20061125: remove old man page
 OLD_FILES+=usr/share/man/man9/devsw.9.gz
 # 20061122: remove obsolete mount programs
 OLD_FILES+=sbin/mount_devfs
 OLD_FILES+=sbin/mount_ext2fs
 OLD_FILES+=sbin/mount_fdescfs
 OLD_FILES+=sbin/mount_linprocfs
 OLD_FILES+=sbin/mount_procfs
 OLD_FILES+=sbin/mount_std
 OLD_FILES+=rescue/mount_devfs
 OLD_FILES+=rescue/mount_ext2fs
 OLD_FILES+=rescue/mount_fdescfs
 OLD_FILES+=rescue/mount_linprocfs
 OLD_FILES+=rescue/mount_procfs
 OLD_FILES+=rescue/mount_std
 OLD_FILES+=usr/share/man/man8/mount_devfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_ext2fs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_fdescfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_linprocfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_procfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_std.8.gz
 # 20061116: uhidev.4 removed
 OLD_FILES+=usr/share/man/man4/uhidev.4.gz
 # 20061106: archive_write_prepare.3 removed
 OLD_FILES+=usr/share/man/man3/archive_write_prepare.3.gz
 # 20061018: pccardc removed
 OLD_FILES+=usr/sbin/pccardc usr/share/man/man8/pccardc.8.gz
 # 20060930: demangle.h from contrib/libstdc++/include/ext/
 OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
 # 20060929: mrouted removed
 OLD_FILES+=usr/sbin/map-mbone
 OLD_FILES+=usr/sbin/mrinfo
 OLD_FILES+=usr/sbin/mrouted
 OLD_FILES+=usr/sbin/mtrace
 OLD_FILES+=usr/share/man/man8/map-mbone.8.gz
 OLD_FILES+=usr/share/man/man8/mrinfo.8.gz
 OLD_FILES+=usr/share/man/man8/mrouted.8.gz
 OLD_FILES+=usr/share/man/man8/mtrace.8.gz
 # 20060924: tcpslice removed
 OLD_FILES+=usr/sbin/tcpslice
 OLD_FILES+=usr/share/man/man1/tcpslice.1.gz
 # 20060829: kvmdb cleanup script removed
 OLD_FILES+=etc/periodic/weekly/120.clean-kvmdb
 # 20060822: ramdisk{,-own} have been replaced by mdconfig{,2}
 OLD_FILES+=etc/rc.d/ramdisk
 OLD_FILES+=etc/rc.d/ramdisk-own
 # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade
 OLD_FILES+=usr/include/openssl/eng_int.h
 OLD_FILES+=usr/include/openssl/hw_4758_cca_err.h
 OLD_FILES+=usr/include/openssl/hw_aep_err.h
 OLD_FILES+=usr/include/openssl/hw_atalla_err.h
 OLD_FILES+=usr/include/openssl/hw_cswift_err.h
 OLD_FILES+=usr/include/openssl/hw_ncipher_err.h
 OLD_FILES+=usr/include/openssl/hw_nuron_err.h
 OLD_FILES+=usr/include/openssl/hw_sureware_err.h
 OLD_FILES+=usr/include/openssl/hw_ubsec_err.h
 # 20060713: mount_linsysfs(8) never existed in 7.x
 OLD_FILES+=sbin/mount_linsysfs
 OLD_FILES+=usr/share/man/man8/mount_linsysfs.8.gz
 # 20060704: KAME compat file net_osdep.h removed
 OLD_FILES+=usr/include/net/net_osdep.h
 # 20060605: man page links removed by OpenBSM 1.0 alpha 6 import
 OLD_FILES+=usr/share/man/man3/au_to_socket.3.gz
 OLD_FILES+=usr/share/man/man3/au_to_socket_ex_128.3.gz
 OLD_FILES+=usr/share/man/man3/au_to_socket_ex_32.3.gz
 # 20060517: pcvt removed
 OLD_FILES+=usr/share/pcvt/README.FIRST
 OLD_FILES+=usr/share/pcvt/Etc/xmodmap-german
 OLD_FILES+=usr/share/pcvt/Etc/pcvt.sh
 OLD_FILES+=usr/share/pcvt/Etc/pcvt.el
 OLD_FILES+=usr/share/pcvt/Etc/Terminfo
 OLD_FILES+=usr/share/pcvt/Etc/Termcap
 OLD_DIRS+=usr/share/pcvt/Etc
 OLD_FILES+=usr/share/pcvt/Doc/NotesAndHints
 OLD_FILES+=usr/share/pcvt/Doc/Keyboard.VT
 OLD_FILES+=usr/share/pcvt/Doc/Keyboard.HP
 OLD_FILES+=usr/share/pcvt/Doc/EscapeSequences
 OLD_FILES+=usr/share/pcvt/Doc/Charsets
 OLD_FILES+=usr/share/pcvt/Doc/CharGen
 OLD_FILES+=usr/share/pcvt/Doc/Bibliography
 OLD_FILES+=usr/share/pcvt/Doc/Acknowledgements
 OLD_DIRS+=usr/share/pcvt/Doc
 OLD_DIRS+=usr/share/pcvt
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.816
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.814
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.810
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.808
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.816
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.814
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.810
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.808
 OLD_DIRS+=usr/share/misc/pcvtfonts
 OLD_FILES+=usr/share/misc/keycap.pcvt
 OLD_FILES+=usr/share/man/man8/ispcvt.8.gz
 OLD_FILES+=usr/share/man/man5/keycap.5.gz
 OLD_FILES+=usr/share/man/man4/pcvt.4.gz
 OLD_FILES+=usr/share/man/man3/kgetstr.3.gz
 OLD_FILES+=usr/share/man/man3/kgetnum.3.gz
 OLD_FILES+=usr/share/man/man3/kgetflag.3.gz
 OLD_FILES+=usr/share/man/man3/kgetent.3.gz
 OLD_FILES+=usr/share/man/man3/keycap.3.gz
 OLD_FILES+=usr/share/man/man1/vt220keys.1.gz
 OLD_FILES+=usr/share/man/man1/scon.1.gz
 OLD_FILES+=usr/share/man/man1/loadfont.1.gz
 OLD_FILES+=usr/share/man/man1/kcon.1.gz
 OLD_FILES+=usr/share/man/man1/fontedit.1.gz
 OLD_FILES+=usr/share/man/man1/cursor.1.gz
 OLD_FILES+=usr/sbin/vt220keys
 OLD_FILES+=usr/sbin/scon
 OLD_FILES+=usr/sbin/loadfont
 OLD_FILES+=usr/sbin/kcon
 OLD_FILES+=usr/sbin/ispcvt
 OLD_FILES+=usr/sbin/fontedit
 OLD_FILES+=usr/sbin/cursor
 OLD_FILES+=usr/lib/libkeycap_p.a
 OLD_FILES+=usr/lib/libkeycap.a
 OLD_FILES+=usr/include/machine/pcvt_ioctl.h
 # 20060514: lnc(4) replaced by le(4)
 OLD_FILES+=usr/share/man/man4/i386/lnc.4.gz
 # 20060512: remove ip6fw
 OLD_FILES+=etc/periodic/security/600.ip6fwdenied
 OLD_FILES+=etc/periodic/security/650.ip6fwlimit
 OLD_FILES+=sbin/ip6fw
 OLD_FILES+=usr/include/netinet6/ip6_fw.h
 OLD_FILES+=usr/share/man/man8/ip6fw.8.gz
 # 20060424: sab(4) removed
 OLD_FILES+=usr/share/man/man4/sab.4.gz
 # 20060328: remove redundant rc.d script
 OLD_FILES+=etc/rc.d/ike
 # 20060127: revert libdisk to static-only
 OLD_FILES+=usr/lib/libdisk.so
 # 20060115: sys/pccard includes cleanup
 OLD_FILES+=usr/include/pccard/driver.h
 OLD_FILES+=usr/include/pccard/i82365.h
 OLD_FILES+=usr/include/pccard/meciareg.h
 OLD_FILES+=usr/include/pccard/pccard_nbk.h
 OLD_FILES+=usr/include/pccard/pcic_pci.h
 OLD_FILES+=usr/include/pccard/pcicvar.h
 OLD_FILES+=usr/include/pccard/slot.h
 # 20051215: rescue/nextboot.sh renamed to rescue/nextboot
 OLD_FILES+=rescue/nextboot.sh
 # 20051214: usbd(8) removed
 OLD_FILES+=etc/rc.d/usbd
 OLD_FILES+=etc/usbd.conf
 OLD_FILES+=usr/sbin/usbd
 OLD_FILES+=usr/share/man/man8/usbd.8.gz
 # 20051029: rc.d/ppp-user renamed to rc.d/ppp for convenience
 OLD_FILES+=etc/rc.d/ppp-user
 # 20051012: setkey(8) moved to /sbin/
 OLD_FILES+=usr/sbin/setkey
 # 20050930: pccardd(8) removed
 OLD_FILES+=usr/sbin/pccardd
 OLD_FILES+=usr/share/man/man5/pccard.conf.5.gz
 OLD_FILES+=usr/share/man/man8/pccardd.8.gz
 # 20050927: bridge(4) replaced by if_bridge(4)
 OLD_FILES+=usr/include/net/bridge.h
 # 20050831: not implemented
 OLD_FILES+=usr/share/man/man3/getino.3.gz
 OLD_FILES+=usr/share/man/man3/putino.3.gz
 # 20050825: T/TCP retired several months ago
 OLD_FILES+=usr/share/man/man4/ttcp.4.gz
 # 20050805 tn3270 retired long ago
 OLD_FILES+=usr/share/misc/map3270
 # 20050801: too old to be interesting here
 OLD_FILES+=usr/share/doc/papers/px.ps.gz
 # 20050721: moved to ports
 OLD_FILES+=usr/sbin/vttest
 OLD_FILES+=usr/share/man/man1/vttest.1.gz
 # 20050617: wpa man pages moved to section 8
 OLD_FILES+=usr/share/man/man1/hostapd.1.gz
 OLD_FILES+=usr/share/man/man1/hostapd_cli.1.gz
 OLD_FILES+=usr/share/man/man1/wpa_cli.1.gz
 OLD_FILES+=usr/share/man/man1/wpa_supplicant.1.gz
 # 20050610: rexecd (insecure by design)
 OLD_FILES+=etc/pam.d/rexecd
 OLD_FILES+=usr/share/man/man8/rexecd.8.gz
 OLD_FILES+=usr/libexec/rexecd
 # 20050606: OpenBSD dhclient replaces ISC one
 OLD_FILES+=bin/omshell
 OLD_FILES+=sbin/omshell
 OLD_FILES+=usr/share/man/man1/omshell.1.gz
 OLD_FILES+=usr/share/man/man5/dhcp-eval.5.gz
 # 200504XX: ipf tools moved from /usr to /
 OLD_FILES+=rescue/ipfs
 OLD_FILES+=rescue/ipfstat
 OLD_FILES+=rescue/ipmon
 OLD_FILES+=rescue/ipnat
 OLD_FILES+=usr/sbin/ipftest
 OLD_FILES+=usr/sbin/ipresend
 OLD_FILES+=usr/sbin/ipsend
 OLD_FILES+=usr/sbin/iptest
 OLD_FILES+=usr/share/man/man1/ipnat.1.gz
 OLD_FILES+=usr/share/man/man1/ipsend.1.gz
 OLD_FILES+=usr/share/man/man1/iptest.1.gz
 OLD_FILES+=usr/share/man/man5/ipsend.5.gz
 # 200503XX: bsdtar takes over gtar
 OLD_FILES+=usr/bin/gtar
 OLD_FILES+=usr/share/man/man1/gtar.1.gz
 # 200503XX
 OLD_FILES+=usr/share/man/man3/exp10.3.gz
 OLD_FILES+=usr/share/man/man3/exp10f.3.gz
 OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
 # 20050324: updated release infrastructure
 OLD_FILES+=usr/share/man/man5/drivers.conf.5.gz
 # 20050317: removed from BIND 9 distribution
 OLD_FILES+=usr/share/doc/bind9/KNOWN_DEFECTS
 # 2005XXXX:
 OLD_FILES+=sbin/mount_autofs
 OLD_FILES+=usr/lib/libautofs.a
 OLD_FILES+=usr/lib/libautofs.so
 OLD_FILES+=usr/share/man/man8/mount_autofs.8.gz
 # 20050203: Merged with fortunes
 OLD_FILES+=usr/share/games/fortune/fortunes2
 OLD_FILES+=usr/share/games/fortune/fortunes2.dat
 # 200501XX:
 OLD_FILES+=usr/libexec/getNAME
 # 200411XX: gvinum replaces vinum
 OLD_FILES+=bin/vinum
 OLD_FILES+=rescue/vinum
 OLD_FILES+=sbin/vinum
 OLD_FILES+=usr/share/man/man8/vinum.8.gz
 # 200411XX: libxpg4 removal
 OLD_FILES+=usr/lib/libxpg4.a
 OLD_FILES+=usr/lib/libxpg4.so
 OLD_FILES+=usr/lib/libxpg4_p.a
 # 20041109: replaced by em(4)
 OLD_FILES+=usr/share/man/man4/gx.4.gz
 OLD_FILES+=usr/share/man/man4/if_gx.4.gz
 # 20041017: rune interface removed
 OLD_FILES+=usr/include/rune.h
 OLD_FILES+=usr/share/man/man3/fgetrune.3.gz
 OLD_FILES+=usr/share/man/man3/fputrune.3.gz
 OLD_FILES+=usr/share/man/man3/fungetrune.3.gz
 OLD_FILES+=usr/share/man/man3/mbrrune.3.gz
 OLD_FILES+=usr/share/man/man3/mbrune.3.gz
 OLD_FILES+=usr/share/man/man3/rune.3.gz
 OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz
 OLD_FILES+=usr/share/man/man3/sgetrune.3.gz
 OLD_FILES+=usr/share/man/man3/sputrune.3.gz
 # 20040925: bind9 import
 OLD_FILES+=usr/bin/dnskeygen
 OLD_FILES+=usr/bin/dnsquery
 OLD_FILES+=usr/lib/libisc.a
 OLD_FILES+=usr/lib/libisc.so
 OLD_FILES+=usr/lib/libisc_p.a
 OLD_FILES+=usr/libexec/named-xfer
 OLD_FILES+=usr/sbin/named.restart
 OLD_FILES+=usr/sbin/ndc
 OLD_FILES+=usr/sbin/nslookup
 OLD_FILES+=usr/sbin/nsupdate
 OLD_FILES+=usr/share/doc/bind/html/acl.html
 OLD_FILES+=usr/share/doc/bind/html/address_list.html
 OLD_FILES+=usr/share/doc/bind/html/comments.html
 OLD_FILES+=usr/share/doc/bind/html/config.html
 OLD_FILES+=usr/share/doc/bind/html/controls.html
 OLD_FILES+=usr/share/doc/bind/html/docdef.html
 OLD_FILES+=usr/share/doc/bind/html/example.html
 OLD_FILES+=usr/share/doc/bind/html/include.html
 OLD_FILES+=usr/share/doc/bind/html/index.html
 OLD_FILES+=usr/share/doc/bind/html/key.html
 OLD_FILES+=usr/share/doc/bind/html/logging.html
 OLD_FILES+=usr/share/doc/bind/html/master.html
 OLD_FILES+=usr/share/doc/bind/html/options.html
 OLD_FILES+=usr/share/doc/bind/html/server.html
 OLD_FILES+=usr/share/doc/bind/html/trusted-keys.html
 OLD_FILES+=usr/share/doc/bind/html/zone.html
 OLD_FILES+=usr/share/doc/bind/misc/DynamicUpdate
 OLD_FILES+=usr/share/doc/bind/misc/FAQ.1of2
 OLD_FILES+=usr/share/doc/bind/misc/FAQ.2of2
 OLD_FILES+=usr/share/doc/bind/misc/rfc2317-notes.txt
 OLD_FILES+=usr/share/doc/bind/misc/style.txt
 OLD_FILES+=usr/share/man/man1/dnskeygen.1.gz
 OLD_FILES+=usr/share/man/man1/dnsquery.1.gz
 OLD_FILES+=usr/share/man/man8/named-bootconf.8.gz
 OLD_FILES+=usr/share/man/man8/named-xfer.8.gz
 OLD_FILES+=usr/share/man/man8/named.restart.8.gz
 OLD_FILES+=usr/share/man/man8/ndc.8.gz
 OLD_FILES+=usr/share/man/man8/nslookup.8.gz
 # 200409XX
 OLD_FILES+=usr/share/man/man3/ENSURE.3.gz
 OLD_FILES+=usr/share/man/man3/ENSURE_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/INSIST.3.gz
 OLD_FILES+=usr/share/man/man3/INSIST_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/INVARIANT.3.gz
 OLD_FILES+=usr/share/man/man3/INVARIANT_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/REQUIRE.3.gz
 OLD_FILES+=usr/share/man/man3/REQUIRE_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/assertion_type_to_text.3.gz
 OLD_FILES+=usr/share/man/man3/assertions.3.gz
 OLD_FILES+=usr/share/man/man3/bitncmp.3.gz
 OLD_FILES+=usr/share/man/man3/evAddTime.3.gz
 OLD_FILES+=usr/share/man/man3/evCancelConn.3.gz
 OLD_FILES+=usr/share/man/man3/evCancelRW.3.gz
 OLD_FILES+=usr/share/man/man3/evClearIdleTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evClearTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evCmpTime.3.gz
 OLD_FILES+=usr/share/man/man3/evConnFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evConnect.3.gz
 OLD_FILES+=usr/share/man/man3/evConsIovec.3.gz
 OLD_FILES+=usr/share/man/man3/evConsTime.3.gz
 OLD_FILES+=usr/share/man/man3/evCreate.3.gz
 OLD_FILES+=usr/share/man/man3/evDefer.3.gz
 OLD_FILES+=usr/share/man/man3/evDeselectFD.3.gz
 OLD_FILES+=usr/share/man/man3/evDestroy.3.gz
 OLD_FILES+=usr/share/man/man3/evDispatch.3.gz
 OLD_FILES+=usr/share/man/man3/evDo.3.gz
 OLD_FILES+=usr/share/man/man3/evDrop.3.gz
 OLD_FILES+=usr/share/man/man3/evFileFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evGetNext.3.gz
 OLD_FILES+=usr/share/man/man3/evHold.3.gz
 OLD_FILES+=usr/share/man/man3/evInitID.3.gz
 OLD_FILES+=usr/share/man/man3/evLastEventTime.3.gz
 OLD_FILES+=usr/share/man/man3/evListen.3.gz
 OLD_FILES+=usr/share/man/man3/evMainLoop.3.gz
 OLD_FILES+=usr/share/man/man3/evNowTime.3.gz
 OLD_FILES+=usr/share/man/man3/evPrintf.3.gz
 OLD_FILES+=usr/share/man/man3/evRead.3.gz
 OLD_FILES+=usr/share/man/man3/evResetTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evSelectFD.3.gz
 OLD_FILES+=usr/share/man/man3/evSetDebug.3.gz
 OLD_FILES+=usr/share/man/man3/evSetIdleTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evSetTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evStreamFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evSubTime.3.gz
 OLD_FILES+=usr/share/man/man3/evTestID.3.gz
 OLD_FILES+=usr/share/man/man3/evTimeRW.3.gz
 OLD_FILES+=usr/share/man/man3/evTimeSpec.3.gz
 OLD_FILES+=usr/share/man/man3/evTimeVal.3.gz
 OLD_FILES+=usr/share/man/man3/evTimerFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evTouchIdleTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evTryAccept.3.gz
 OLD_FILES+=usr/share/man/man3/evUnhold.3.gz
 OLD_FILES+=usr/share/man/man3/evUntimeRW.3.gz
 OLD_FILES+=usr/share/man/man3/evUnwait.3.gz
 OLD_FILES+=usr/share/man/man3/evWaitFor.3.gz
 OLD_FILES+=usr/share/man/man3/evWaitFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evWrite.3.gz
 OLD_FILES+=usr/share/man/man3/eventlib.3.gz
 OLD_FILES+=usr/share/man/man3/heap.3.gz
 OLD_FILES+=usr/share/man/man3/heap_decreased.3.gz
 OLD_FILES+=usr/share/man/man3/heap_delete.3.gz
 OLD_FILES+=usr/share/man/man3/heap_element.3.gz
 OLD_FILES+=usr/share/man/man3/heap_for_each.3.gz
 OLD_FILES+=usr/share/man/man3/heap_free.3.gz
 OLD_FILES+=usr/share/man/man3/heap_increased.3.gz
 OLD_FILES+=usr/share/man/man3/heap_insert.3.gz
 OLD_FILES+=usr/share/man/man3/heap_new.3.gz
 OLD_FILES+=usr/share/man/man3/log_add_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_category_is_active.3.gz
 OLD_FILES+=usr/share/man/man3/log_close_stream.3.gz
 OLD_FILES+=usr/share/man/man3/log_dec_references.3.gz
 OLD_FILES+=usr/share/man/man3/log_free_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_free_context.3.gz
 OLD_FILES+=usr/share/man/man3/log_get_filename.3.gz
 OLD_FILES+=usr/share/man/man3/log_get_stream.3.gz
 OLD_FILES+=usr/share/man/man3/log_inc_references.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_context.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_file_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_null_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_syslog_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_open_stream.3.gz
 OLD_FILES+=usr/share/man/man3/log_option.3.gz
 OLD_FILES+=usr/share/man/man3/log_remove_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_set_file_owner.3.gz
 OLD_FILES+=usr/share/man/man3/log_vwrite.3.gz
 OLD_FILES+=usr/share/man/man3/log_write.3.gz
 OLD_FILES+=usr/share/man/man3/logging.3.gz
 OLD_FILES+=usr/share/man/man3/memcluster.3.gz
 OLD_FILES+=usr/share/man/man3/memget.3.gz
 OLD_FILES+=usr/share/man/man3/memput.3.gz
 OLD_FILES+=usr/share/man/man3/memstats.3.gz
 OLD_FILES+=usr/share/man/man3/set_assertion_failure_callback.3.
 OLD_FILES+=usr/share/man/man3/sigwait.3.gz
 OLD_FILES+=usr/share/man/man3/tree_add.3.gz
 OLD_FILES+=usr/share/man/man3/tree_delete.3.gz
 OLD_FILES+=usr/share/man/man3/tree_init.3.gz
 OLD_FILES+=usr/share/man/man3/tree_mung.3.gz
 OLD_FILES+=usr/share/man/man3/tree_srch.3.gz
 OLD_FILES+=usr/share/man/man3/tree_trav.3.gz
 # 2004XXYY: OS internal libs, no ports use them, no need to use OLD_LIBS
 OLD_LIBS+=lib/geom/geom_concat.so.1
 OLD_LIBS+=lib/geom/geom_label.so.1
 OLD_LIBS+=lib/geom/geom_nop.so.1
 OLD_LIBS+=lib/geom/geom_stripe.so.1
 # 20040728: GCC 3.4.2
 OLD_DIRS+=usr/include/c++/3.3
 OLD_FILES+=usr/include/c++/3.3/FlexLexer.h
 OLD_FILES+=usr/include/c++/3.3/algorithm
 OLD_FILES+=usr/include/c++/3.3/backward/algo.h
 OLD_FILES+=usr/include/c++/3.3/backward/algobase.h
 OLD_FILES+=usr/include/c++/3.3/backward/alloc.h
 OLD_FILES+=usr/include/c++/3.3/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/3.3/backward/bvector.h
 OLD_FILES+=usr/include/c++/3.3/backward/complex.h
 OLD_FILES+=usr/include/c++/3.3/backward/defalloc.h
 OLD_FILES+=usr/include/c++/3.3/backward/deque.h
 OLD_FILES+=usr/include/c++/3.3/backward/fstream.h
 OLD_FILES+=usr/include/c++/3.3/backward/function.h
 OLD_FILES+=usr/include/c++/3.3/backward/hash_map.h
 OLD_FILES+=usr/include/c++/3.3/backward/hash_set.h
 OLD_FILES+=usr/include/c++/3.3/backward/hashtable.h
 OLD_FILES+=usr/include/c++/3.3/backward/heap.h
 OLD_FILES+=usr/include/c++/3.3/backward/iomanip.h
 OLD_FILES+=usr/include/c++/3.3/backward/iostream.h
 OLD_FILES+=usr/include/c++/3.3/backward/istream.h
 OLD_FILES+=usr/include/c++/3.3/backward/iterator.h
 OLD_FILES+=usr/include/c++/3.3/backward/list.h
 OLD_FILES+=usr/include/c++/3.3/backward/map.h
 OLD_FILES+=usr/include/c++/3.3/backward/multimap.h
 OLD_FILES+=usr/include/c++/3.3/backward/multiset.h
 OLD_FILES+=usr/include/c++/3.3/backward/new.h
 OLD_FILES+=usr/include/c++/3.3/backward/ostream.h
 OLD_FILES+=usr/include/c++/3.3/backward/pair.h
 OLD_FILES+=usr/include/c++/3.3/backward/queue.h
 OLD_FILES+=usr/include/c++/3.3/backward/rope.h
 OLD_FILES+=usr/include/c++/3.3/backward/set.h
 OLD_FILES+=usr/include/c++/3.3/backward/slist.h
 OLD_FILES+=usr/include/c++/3.3/backward/stack.h
 OLD_FILES+=usr/include/c++/3.3/backward/stream.h
 OLD_FILES+=usr/include/c++/3.3/backward/streambuf.h
 OLD_FILES+=usr/include/c++/3.3/backward/strstream
 OLD_FILES+=usr/include/c++/3.3/backward/strstream.h
 OLD_FILES+=usr/include/c++/3.3/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/3.3/backward/tree.h
 OLD_FILES+=usr/include/c++/3.3/backward/vector.h
 OLD_DIRS+=usr/include/c++/3.3/backward
 OLD_FILES+=usr/include/c++/3.3/bits/atomicity.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_file.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/basic_string.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++config.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++io.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++locale.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/3.3/bits/char_traits.h
 OLD_FILES+=usr/include/c++/3.3/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/codecvt.h
 OLD_FILES+=usr/include/c++/3.3/bits/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/3.3/bits/concept_check.h
 OLD_FILES+=usr/include/c++/3.3/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/3.3/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/3.3/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/3.3/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/3.3/bits/deque.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/fpos.h
 OLD_FILES+=usr/include/c++/3.3/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/functexcept.h
 OLD_FILES+=usr/include/c++/3.3/bits/generic_shadow.h
 OLD_FILES+=usr/include/c++/3.3/bits/gslice.h
 OLD_FILES+=usr/include/c++/3.3/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr.h
 OLD_FILES+=usr/include/c++/3.3/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/ios_base.h
 OLD_FILES+=usr/include/c++/3.3/bits/istream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/list.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/localefwd.h
 OLD_FILES+=usr/include/c++/3.3/bits/mask_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/messages_members.h
 OLD_FILES+=usr/include/c++/3.3/bits/os_defines.h
 OLD_FILES+=usr/include/c++/3.3/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/pthread_allocimpl.h
 OLD_FILES+=usr/include/c++/3.3/bits/slice.h
 OLD_FILES+=usr/include/c++/3.3/bits/slice_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_alloc.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_function.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_list.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_map.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_pthread_alloc.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_set.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_threads.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/3.3/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/3.3/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/3.3/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/3.3/bits/time_members.h
 OLD_FILES+=usr/include/c++/3.3/bits/type_traits.h
 OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/valarray_meta.h
 OLD_FILES+=usr/include/c++/3.3/bits/vector.tcc
 OLD_DIRS+=usr/include/c++/3.3/bits
 OLD_FILES+=usr/include/c++/3.3/bitset
 OLD_FILES+=usr/include/c++/3.3/cassert
 OLD_FILES+=usr/include/c++/3.3/cctype
 OLD_FILES+=usr/include/c++/3.3/cerrno
 OLD_FILES+=usr/include/c++/3.3/cfloat
 OLD_FILES+=usr/include/c++/3.3/ciso646
 OLD_FILES+=usr/include/c++/3.3/climits
 OLD_FILES+=usr/include/c++/3.3/clocale
 OLD_FILES+=usr/include/c++/3.3/cmath
 OLD_FILES+=usr/include/c++/3.3/complex
 OLD_FILES+=usr/include/c++/3.3/csetjmp
 OLD_FILES+=usr/include/c++/3.3/csignal
 OLD_FILES+=usr/include/c++/3.3/cstdarg
 OLD_FILES+=usr/include/c++/3.3/cstddef
 OLD_FILES+=usr/include/c++/3.3/cstdio
 OLD_FILES+=usr/include/c++/3.3/cstdlib
 OLD_FILES+=usr/include/c++/3.3/cstring
 OLD_FILES+=usr/include/c++/3.3/ctime
 OLD_FILES+=usr/include/c++/3.3/cwchar
 OLD_FILES+=usr/include/c++/3.3/cwctype
 OLD_FILES+=usr/include/c++/3.3/cxxabi.h
 OLD_FILES+=usr/include/c++/3.3/deque
 OLD_FILES+=usr/include/c++/3.3/exception
 OLD_FILES+=usr/include/c++/3.3/exception_defines.h
 OLD_FILES+=usr/include/c++/3.3/ext/algorithm
 OLD_FILES+=usr/include/c++/3.3/ext/enc_filebuf.h
 OLD_FILES+=usr/include/c++/3.3/ext/functional
 OLD_FILES+=usr/include/c++/3.3/ext/hash_map
 OLD_FILES+=usr/include/c++/3.3/ext/hash_set
 OLD_FILES+=usr/include/c++/3.3/ext/iterator
 OLD_FILES+=usr/include/c++/3.3/ext/memory
 OLD_FILES+=usr/include/c++/3.3/ext/numeric
 OLD_FILES+=usr/include/c++/3.3/ext/rb_tree
 OLD_FILES+=usr/include/c++/3.3/ext/rope
 OLD_FILES+=usr/include/c++/3.3/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/3.3/ext/slist
 OLD_FILES+=usr/include/c++/3.3/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/3.3/ext/stl_hash_fun.h
 OLD_FILES+=usr/include/c++/3.3/ext/stl_hashtable.h
 OLD_FILES+=usr/include/c++/3.3/ext/stl_rope.h
 OLD_DIRS+=usr/include/c++/3.3/ext
 OLD_FILES+=usr/include/c++/3.3/fstream
 OLD_FILES+=usr/include/c++/3.3/functional
 OLD_FILES+=usr/include/c++/3.3/iomanip
 OLD_FILES+=usr/include/c++/3.3/ios
 OLD_FILES+=usr/include/c++/3.3/iosfwd
 OLD_FILES+=usr/include/c++/3.3/iostream
 OLD_FILES+=usr/include/c++/3.3/istream
 OLD_FILES+=usr/include/c++/3.3/iterator
 OLD_FILES+=usr/include/c++/3.3/limits
 OLD_FILES+=usr/include/c++/3.3/list
 OLD_FILES+=usr/include/c++/3.3/locale
 OLD_FILES+=usr/include/c++/3.3/map
 OLD_FILES+=usr/include/c++/3.3/memory
 OLD_FILES+=usr/include/c++/3.3/new
 OLD_FILES+=usr/include/c++/3.3/numeric
 OLD_FILES+=usr/include/c++/3.3/ostream
 OLD_FILES+=usr/include/c++/3.3/queue
 OLD_FILES+=usr/include/c++/3.3/set
 OLD_FILES+=usr/include/c++/3.3/sstream
 OLD_FILES+=usr/include/c++/3.3/stack
 OLD_FILES+=usr/include/c++/3.3/stdexcept
 OLD_FILES+=usr/include/c++/3.3/streambuf
 OLD_FILES+=usr/include/c++/3.3/string
 OLD_FILES+=usr/include/c++/3.3/typeinfo
 OLD_FILES+=usr/include/c++/3.3/utility
 OLD_FILES+=usr/include/c++/3.3/valarray
 OLD_FILES+=usr/include/c++/3.3/vector
 # 20040713: fla(4) removed
 OLD_FILES+=usr/share/man/man4/fla.4.gz
 # 200407XX
 OLD_FILES+=usr/sbin/kernbb
 OLD_FILES+=usr/sbin/ntp-genkeys
 OLD_FILES+=usr/sbin/ntptimeset
 OLD_FILES+=usr/share/man/man8/kernbb.8.gz
 OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz
 # 20040627: usbdevs.h and usbdevs_data.h removal
 OLD_FILES+=usr/include/dev/usb/usbdevs.h
 OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 # 200406XX
 OLD_FILES+=usr/bin/gasp
 OLD_FILES+=usr/bin/gdbreplay
 OLD_FILES+=usr/share/man/man1/gasp.1.gz
 OLD_FILES+=sbin/mountd
 OLD_FILES+=sbin/mount_fdesc
 OLD_FILES+=sbin/mount_umap
 OLD_FILES+=sbin/mount_union
 OLD_FILES+=sbin/mount_msdos
 OLD_FILES+=sbin/mount_null
 OLD_FILES+=sbin/mount_kernfs
 # 200405XX: arl
 OLD_FILES+=usr/sbin/arlconfig
 OLD_FILES+=usr/share/man/man8/arlconfig.8.gz
 # 200403XX
 OLD_FILES+=bin/raidctl
 OLD_FILES+=sbin/raidctl
 OLD_FILES+=usr/bin/sasc
 OLD_FILES+=usr/sbin/sgsc
 OLD_FILES+=usr/sbin/stlload
 OLD_FILES+=usr/sbin/stlstats
 OLD_FILES+=usr/share/man/man1/sasc.1.gz
 OLD_FILES+=usr/share/man/man1/sgsc.1.gz
 OLD_FILES+=usr/share/man/man4/i386/stl.4.gz
 OLD_FILES+=usr/share/man/man8/raidctl.8.gz
 # 20040229: clean_environment() was removed after 3 days
 OLD_FILES+=usr/share/man/man3/clean_environment.3.gz
 # 20040119: installed as `isdntel' in newer systems
 OLD_FILES+=etc/isdn/isdntel.sh
 # 200XYYZZ: /lib transition clitches
 OLD_FILES+=lib/libalias.so
 OLD_FILES+=lib/libatm.so
 OLD_FILES+=lib/libbsdxml.so
 OLD_FILES+=lib/libc.so
 OLD_FILES+=lib/libcam.so
 OLD_FILES+=lib/libcrypt.so
 OLD_FILES+=lib/libcrypto.so
 OLD_FILES+=lib/libdevstat.so
 OLD_FILES+=lib/libedit.so
 OLD_FILES+=lib/libgeom.so
 OLD_FILES+=lib/libipsec.so
 OLD_FILES+=lib/libipx.so
 OLD_FILES+=lib/libkvm.so
 OLD_FILES+=lib/libm.so
 OLD_FILES+=lib/libmd.so
 OLD_FILES+=lib/libncurses.so
 OLD_FILES+=lib/libreadline.so
 OLD_FILES+=lib/libsbuf.so
 OLD_FILES+=lib/libufs.so
 OLD_FILES+=lib/libz.so
 # 200312XX
 OLD_FILES+=bin/cxconfig
 OLD_FILES+=sbin/cxconfig
 OLD_FILES+=usr/share/man/man8/cxconfig.8.gz
 # 20031016: MULTI_DRIVER_MODULE macro removed
 OLD_FILES+=usr/share/man/man9/MULTI_DRIVER_MODULE.9.gz
 # 200309XX
 OLD_FILES+=usr/bin/symorder
 OLD_FILES+=usr/share/man/man1/symorder.1.gz
 # 200308XX
 OLD_FILES+=usr/sbin/amldb
 OLD_FILES+=usr/share/man/man8/amldb.8.gz
 # 200307XX
 OLD_FILES+=sbin/mount_nwfs
 OLD_FILES+=sbin/mount_portalfs
 OLD_FILES+=sbin/mount_smbfs
 # 200306XX
 OLD_FILES+=usr/sbin/dev_mkdb
 OLD_FILES+=usr/share/man/man8/dev_mkdb.8.gz
 # 200304XX
 OLD_FILES+=usr/lib/libcipher.a
 OLD_FILES+=usr/lib/libcipher.so
 OLD_FILES+=usr/lib/libcipher_p.a
 OLD_FILES+=usr/lib/libgmp.a
 OLD_FILES+=usr/lib/libgmp.so
 OLD_FILES+=usr/lib/libgmp_p.a
 OLD_FILES+=usr/lib/libperl.a
 OLD_FILES+=usr/lib/libperl.so
 OLD_FILES+=usr/lib/libperl_p.a
 OLD_FILES+=usr/lib/libposix1e.a
 OLD_FILES+=usr/lib/libposix1e.so
 OLD_FILES+=usr/lib/libposix1e_p.a
 OLD_FILES+=usr/lib/libskey.a
 OLD_FILES+=usr/lib/libskey.so
 OLD_FILES+=usr/lib/libskey_p.a
 OLD_FILES+=usr/libexec/tradcpp0
 OLD_FILES+=usr/libexec/cpp0
 # 200304XX: removal of xten
 OLD_FILES+=usr/libexec/xtend
 OLD_FILES+=usr/sbin/xten
 OLD_FILES+=usr/share/man/man1/xten.1.gz
 OLD_FILES+=usr/share/man/man8/xtend.8.gz
 # 200303XX
 OLD_FILES+=usr/lib/libacl.so
 OLD_FILES+=usr/lib/libdescrypt.so
 OLD_FILES+=usr/lib/libf2c.so
 OLD_FILES+=usr/lib/libg++.so
 OLD_FILES+=usr/lib/libkdb.so
 OLD_FILES+=usr/lib/librsaINTL.so
 OLD_FILES+=usr/lib/libscrypt.so
 OLD_FILES+=usr/lib/libss.so
 # 200302XX
 OLD_FILES+=usr/lib/libacl.a
 OLD_FILES+=usr/lib/libacl_p.a
 OLD_FILES+=usr/lib/libkadm.a
 OLD_FILES+=usr/lib/libkadm.so
 OLD_FILES+=usr/lib/libkadm_p.a
 OLD_FILES+=usr/lib/libkafs.a
 OLD_FILES+=usr/lib/libkafs.so
 OLD_FILES+=usr/lib/libkafs_p.a
 OLD_FILES+=usr/lib/libkdb.a
 OLD_FILES+=usr/lib/libkdb_p.a
 OLD_FILES+=usr/lib/libkrb.a
 OLD_FILES+=usr/lib/libkrb.so
 OLD_FILES+=usr/lib/libkrb_p.a
 OLD_FILES+=usr/share/man/man3/SSL_CIPHER_get_name.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_COMP_add_compression_method.3
 OLD_FILES+=usr/share/man/man3/SSL_CTX_add_extra_chain_cert.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_add_session.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_ctrl.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_flush_sessions.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_free.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_get_verify_mode.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_load_verify_locations.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_new.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_number.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_set_cache_size.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_set_get_cb.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sessions.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cert_store.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cert_verify_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cipher_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_client_CA_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_client_cert_cb.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_default_passwd_cb.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_generate_session_id.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_info_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_max_cert_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_mode.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_msg_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_options.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_quiet_shutdown.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_session_cache_mode.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_session_id_context.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_ssl_version.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_tmp_dh_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_tmp_rsa_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_verify.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_use_certificate.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_SESSION_free.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_SESSION_get_ex_new_index.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_SESSION_get_time.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_accept.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_alert_type_string.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_clear.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_connect.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_do_handshake.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_free.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_SSL_CTX.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_ciphers.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_client_CA_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_current_cipher.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_default_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_ex_data_X509_STORE_CTX_idx.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_fd.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_peer_cert_chain.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_peer_certificate.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_rbio.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_session.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_verify_result.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_version.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_library_init.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_load_client_CA_file.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_new.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_pending.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_read.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_rstate_string.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_session_reused.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_bio.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_connect_state.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_fd.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_session.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_shutdown.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_set_verify_result.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_shutdown.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_state_string.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_want.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_write.3.gz
 OLD_FILES+=usr/share/man/man3/d2i_SSL_SESSION.3.gz
 # 200301XX
 OLD_FILES+=usr/share/man/man3/des_3cbc_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_3ecb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_cbc_cksum.3.gz
 OLD_FILES+=usr/share/man/man3/des_cbc_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_cfb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_ecb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_enc_read.3.gz
 OLD_FILES+=usr/share/man/man3/des_enc_write.3.gz
 OLD_FILES+=usr/share/man/man3/des_is_weak_key.3.gz
 OLD_FILES+=usr/share/man/man3/des_key_sched.3.gz
 OLD_FILES+=usr/share/man/man3/des_ofb_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_pcbc_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/des_quad_cksum.3.gz
 OLD_FILES+=usr/share/man/man3/des_random_key.3.gz
 OLD_FILES+=usr/share/man/man3/des_read_2password.3.gz
 OLD_FILES+=usr/share/man/man3/des_read_password.3.gz
 OLD_FILES+=usr/share/man/man3/des_read_pw_string.3.gz
 OLD_FILES+=usr/share/man/man3/des_set_key.3.gz
 OLD_FILES+=usr/share/man/man3/des_set_odd_parity.3.gz
 OLD_FILES+=usr/share/man/man3/des_string_to_2key.3.gz
 OLD_FILES+=usr/share/man/man3/des_string_to_key.3.gz
 # 200212XX
 OLD_FILES+=usr/sbin/kenv
 OLD_FILES+=usr/bin/kenv
 OLD_FILES+=usr/sbin/elf2aout
 # 200210XX
 OLD_FILES+=usr/include/libusbhid.h
 OLD_FILES+=usr/share/man/man3/All_FreeBSD.3.gz
 OLD_FILES+=usr/share/man/man3/CheckRules.3.gz
 OLD_FILES+=usr/share/man/man3/ChunkCanBeRoot.3.gz
 OLD_FILES+=usr/share/man/man3/Clone_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Collapse_Chunk.3.gz
 OLD_FILES+=usr/share/man/man3/Collapse_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Create_Chunk.3.gz
 OLD_FILES+=usr/share/man/man3/Create_Chunk_DWIM.3.gz
 OLD_FILES+=usr/share/man/man3/Cyl_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Debug_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Delete_Chunk.3.gz
 OLD_FILES+=usr/share/man/man3/Disk_Names.3.gz
 OLD_FILES+=usr/share/man/man3/Free_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/MakeDev.3.gz
 OLD_FILES+=usr/share/man/man3/MakeDevDisk.3.gz
 OLD_FILES+=usr/share/man/man3/Next_Cyl_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Next_Track_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Open_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/Prev_Cyl_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Prev_Track_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Set_Bios_Geom.3.gz
 OLD_FILES+=usr/share/man/man3/Set_Boot_Blocks.3.gz
 OLD_FILES+=usr/share/man/man3/Set_Boot_Mgr.3.gz
 OLD_FILES+=usr/share/man/man3/ShowChunkFlags.3.gz
 OLD_FILES+=usr/share/man/man3/Track_Aligned.3.gz
 OLD_FILES+=usr/share/man/man3/Write_Disk.3.gz
 OLD_FILES+=usr/share/man/man3/slice_type_name.3.gz
 # 200210XX: most games moved to ports
 OLD_FILES+=usr/share/man/man6/adventure.6.gz
 OLD_FILES+=usr/share/man/man6/arithmetic.6.gz
 OLD_FILES+=usr/share/man/man6/atc.6.gz
 OLD_FILES+=usr/share/man/man6/backgammon.6.gz
 OLD_FILES+=usr/share/man/man6/battlestar.6.gz
 OLD_FILES+=usr/share/man/man6/bs.6.gz
 OLD_FILES+=usr/share/man/man6/canfield.6.gz
 OLD_FILES+=usr/share/man/man6/cfscores.6.gz
 OLD_FILES+=usr/share/man/man6/cribbage.6.gz
 OLD_FILES+=usr/share/man/man6/fish.6.gz
 OLD_FILES+=usr/share/man/man6/hack.6.gz
 OLD_FILES+=usr/share/man/man6/hangman.6.gz
 OLD_FILES+=usr/share/man/man6/larn.6.gz
 OLD_FILES+=usr/share/man/man6/mille.6.gz
 OLD_FILES+=usr/share/man/man6/phantasia.6.gz
 OLD_FILES+=usr/share/man/man6/piano.6.gz
 OLD_FILES+=usr/share/man/man6/pig.6.gz
 OLD_FILES+=usr/share/man/man6/quiz.6.gz
 OLD_FILES+=usr/share/man/man6/rain.6.gz
 OLD_FILES+=usr/share/man/man6/robots.6.gz
 OLD_FILES+=usr/share/man/man6/rogue.6.gz
 OLD_FILES+=usr/share/man/man6/sail.6.gz
 OLD_FILES+=usr/share/man/man6/snake.6.gz
 OLD_FILES+=usr/share/man/man6/snscore.6.gz
 OLD_FILES+=usr/share/man/man6/trek.6.gz
 OLD_FILES+=usr/share/man/man6/wargames.6.gz
 OLD_FILES+=usr/share/man/man6/worm.6.gz
 OLD_FILES+=usr/share/man/man6/worms.6.gz
 OLD_FILES+=usr/share/man/man6/wump.6.gz
 # 200207XX
 OLD_FILES+=usr/share/man/man1aout/ar.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/as.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/ld.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/nm.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/ranlib.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/size.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/strings.1aout.gz
 OLD_FILES+=usr/share/man/man1aout/strip.1aout.gz
 OLD_FILES+=bin/mountd
 OLD_FILES+=bin/nfsd
 # 20020707 sbin/nfsd -> usr.sbin/nfsd
 OLD_FILES+=sbin/nfsd
 # 200206XX
 OLD_FILES+=usr/lib/libpam_ssh.a
 OLD_FILES+=usr/lib/libpam_ssh_p.a
 OLD_FILES+=usr/bin/help
 OLD_FILES+=usr/bin/sccs
 .if ${TARGET_ARCH} != "amd64" && ${TARGET} != "arm" && ${TARGET_ARCH} != "i386" && ${TARGET} != "powerpc"
 OLD_FILES+=usr/bin/gdbserver
 .endif
 OLD_FILES+=usr/bin/ssh-keysign
 OLD_FILES+=usr/sbin/gifconfig
 OLD_FILES+=usr/sbin/prefix
 # 200205XX
 OLD_FILES+=usr/bin/doscmd
 # 200204XX
 OLD_FILES+=usr/bin/a2p
 OLD_FILES+=usr/bin/ptx
 OLD_FILES+=usr/bin/pod2text
 OLD_FILES+=usr/bin/pod2man
 OLD_FILES+=usr/bin/pod2latex
 OLD_FILES+=usr/bin/pod2html
 OLD_FILES+=usr/bin/h2ph
 OLD_FILES+=usr/bin/dprofpp
 OLD_FILES+=usr/bin/c2ph
 OLD_FILES+=usr/bin/h2xs
 OLD_FILES+=usr/bin/pl2pm
 OLD_FILES+=usr/bin/splain
 OLD_FILES+=usr/bin/s2p
 OLD_FILES+=usr/bin/find2perl
 OLD_FILES+=usr/sbin/pkg_update
 OLD_FILES+=usr/sbin/scriptdump
 # 20020409 GC kget(1), userconfig is long dead.
 OLD_FILES+=sbin/kget
 OLD_FILES+=usr/share/man/man8/kget.8.gz
 # 200203XX
 OLD_FILES+=usr/lib/libss.a
 OLD_FILES+=usr/lib/libss_p.a
 OLD_FILES+=usr/lib/libtelnet.a
 OLD_FILES+=usr/lib/libtelnet_p.a
 OLD_FILES+=usr/sbin/diskpart
 # 200202XX
 OLD_FILES+=usr/bin/gprof4
 # 200201XX
 OLD_FILES+=usr/sbin/linux
 # 2001XXXX
 OLD_FILES+=usr/bin/joy
 OLD_FILES+=usr/sbin/ibcs2
 OLD_FILES+=usr/sbin/svr4
 OLD_FILES+=usr/bin/chflags
 OLD_FILES+=usr/sbin/uuconv
 OLD_FILES+=usr/sbin/uuchk
 OLD_FILES+=usr/sbin/portmap
 OLD_FILES+=usr/sbin/pmap_set
 OLD_FILES+=usr/sbin/pmap_dump
 OLD_FILES+=usr/sbin/mcon
 OLD_FILES+=usr/sbin/stlstty
 OLD_FILES+=usr/sbin/ispppcontrol
 OLD_FILES+=usr/sbin/rndcontrol
 # 20011001: UUCP migration to ports
 OLD_FILES+=usr/bin/uucp
 OLD_FILES+=usr/bin/uulog
 OLD_FILES+=usr/bin/uuname
 OLD_FILES+=usr/bin/uupick
 OLD_FILES+=usr/bin/uusched
 OLD_FILES+=usr/bin/uustat
 OLD_FILES+=usr/bin/uuto
 OLD_FILES+=usr/bin/uux
 OLD_FILES+=usr/libexec/uucp/uucico
 OLD_FILES+=usr/libexec/uucp/uuxqt
 OLD_FILES+=usr/libexec/uucpd
 OLD_FILES+=usr/share/man/man1/uuconv.1.gz
 OLD_FILES+=usr/share/man/man1/uucp.1.gz
 OLD_FILES+=usr/share/man/man1/uulog.1.gz
 OLD_FILES+=usr/share/man/man1/uuname.1.gz
 OLD_FILES+=usr/share/man/man1/uupick.1.gz
 OLD_FILES+=usr/share/man/man1/uustat.1.gz
 OLD_FILES+=usr/share/man/man1/uuto.1.gz
 OLD_FILES+=usr/share/man/man1/uux.1.gz
 OLD_FILES+=usr/share/man/man8/uuchk.8.gz
 OLD_FILES+=usr/share/man/man8/uucico.8.gz
 OLD_FILES+=usr/share/man/man8/uucpd.8.gz
 OLD_FILES+=usr/share/man/man8/uusched.8.gz
 OLD_FILES+=usr/share/man/man8/uuxqt.8.gz
 # 20010523 mount_portal -> mount_portalfs
 OLD_FILES+=sbin/mount_portal
 OLD_FILES+=usr/share/man/man8/mount_portal.8.gz
 # 200104XX
 OLD_FILES+=usr/lib/libdescrypt.a
 OLD_FILES+=usr/lib/libscrypt.a
 OLD_FILES+=usr/lib/libscrypt_p.a
 OLD_FILES+=usr/sbin/pim6stat
 OLD_FILES+=usr/sbin/pim6sd
 OLD_FILES+=usr/sbin/pim6dd
 # 20010217
 OLD_FILES+=usr/share/doc/bind/misc/dns-setup
 # 20001200
 OLD_FILES+=usr/lib/libgcc_r_pic.a
 # 200009XX
 OLD_FILES+=usr/lib/libRSAglue.a
 OLD_FILES+=usr/lib/libRSAglue.so
 OLD_FILES+=usr/lib/librsaINTL.a
 OLD_FILES+=usr/lib/librsaUSA.a
 OLD_FILES+=usr/lib/librsaUSA.so
 # 200002XX ?
 OLD_FILES+=usr/lib/libf2c.a
 OLD_FILES+=usr/lib/libf2c_p.a
 OLD_FILES+=usr/lib/libg++.a
 OLD_FILES+=usr/lib/libg++_p.a
 # 20001006
 OLD_FILES+=usr/bin/miniperl
 # 20000810
 OLD_FILES+=usr/bin/sperl
 # 200001XX
 OLD_FILES+=usr/sbin/apmconf
 ## unsorted
 # do we still support aout builds?
 #OLD_FILES+=usr/lib/aout/c++rt0.o
 #OLD_FILES+=usr/lib/aout/crt0.o
 #OLD_FILES+=usr/lib/aout/gcrt0.o
 #OLD_FILES+=usr/lib/aout/scrt0.o
 #OLD_FILES+=usr/lib/aout/sgcrt0.o
 OLD_FILES+=usr/lib/pam_ftp.so
 OLD_FILES+=usr/share/man/man1/CA.pl.1.gz
 OLD_FILES+=usr/share/man/man1/asn1parse.1.gz
 OLD_FILES+=usr/share/man/man1/ca.1.gz
 OLD_FILES+=usr/share/man/man1/ciphers.1.gz
 OLD_FILES+=usr/share/man/man1/config.1.gz
 OLD_FILES+=usr/share/man/man1/crl.1.gz
 OLD_FILES+=usr/share/man/man1/crl2pkcs7.1.gz
 OLD_FILES+=usr/share/man/man1/dgst.1.gz
 OLD_FILES+=usr/share/man/man1/dhparam.1.gz
 OLD_FILES+=usr/share/man/man1/doscmd.1.gz
 OLD_FILES+=usr/share/man/man1/dsa.1.gz
 OLD_FILES+=usr/share/man/man1/dsaparam.1.gz
 OLD_FILES+=usr/share/man/man1/enc.1.gz
 OLD_FILES+=usr/share/man/man1/gendsa.1.gz
 OLD_FILES+=usr/share/man/man1/genrsa.1.gz
 OLD_FILES+=usr/share/man/man1/getNAME.1.gz
 OLD_FILES+=usr/share/man/man1/nseq.1.gz
 OLD_FILES+=usr/share/man/man1/ocsp.1.gz
 OLD_FILES+=usr/share/man/man1/openssl.1.gz
 OLD_FILES+=usr/share/man/man1/pkcs12.1.gz
 OLD_FILES+=usr/share/man/man1/pkcs7.1.gz
 OLD_FILES+=usr/share/man/man1/pkcs8.1.gz
 OLD_FILES+=usr/share/man/man1/rand.1.gz
 OLD_FILES+=usr/share/man/man1/req.1.gz
 OLD_FILES+=usr/share/man/man1/rsa.1.gz
 OLD_FILES+=usr/share/man/man1/rsautl.1.gz
 OLD_FILES+=usr/share/man/man1/s_client.1.gz
 OLD_FILES+=usr/share/man/man1/s_server.1.gz
 OLD_FILES+=usr/share/man/man1/sess_id.1.gz
 OLD_FILES+=usr/share/man/man1/smime.1.gz
 OLD_FILES+=usr/share/man/man1/speed.1.gz
 OLD_FILES+=usr/share/man/man1/spkac.1.gz
 OLD_FILES+=usr/share/man/man1/verify.1.gz
 OLD_FILES+=usr/share/man/man1/version.1.gz
 OLD_FILES+=usr/share/man/man1/x509.1.gz
 OLD_FILES+=usr/share/man/man3/SSL_COMP_add_compression_method.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_get_ex_new_index.3.gz
 OLD_FILES+=usr/share/man/man3/archive_entry_dup.3.gz
 OLD_FILES+=usr/share/man/man3/archive_entry_set_tartype.3.gz
 OLD_FILES+=usr/share/man/man3/archive_entry_tartype.3.gz
 OLD_FILES+=usr/share/man/man3/archive_read_data_into_file.3.gz
 OLD_FILES+=usr/share/man/man3/archive_read_open_tar.3.gz
 OLD_FILES+=usr/share/man/man3/archive_read_support_format_gnutar.3.gz
 OLD_FILES+=usr/share/man/man3/cipher.3.gz
 OLD_FILES+=usr/share/man/man3/des_cipher.3.gz
 OLD_FILES+=usr/share/man/man3/des_setkey.3.gz
 OLD_FILES+=usr/share/man/man3/encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/endvfsent.3.gz
 OLD_FILES+=usr/share/man/man3/getvfsbytype.3.gz
 OLD_FILES+=usr/share/man/man3/getvfsent.3.gz
 OLD_FILES+=usr/share/man/man3/isnanf.3.gz
 OLD_FILES+=usr/share/man/man3/libautofs.3.gz
 OLD_FILES+=usr/share/man/man3/pthread_attr_setsstack.3.gz
 OLD_FILES+=usr/share/man/man3/pthread_getcancelstate.3.gz
 OLD_FILES+=usr/share/man/man3/set_assertion_failure_callback.3.gz
 OLD_FILES+=usr/share/man/man3/setkey.3.gz
 OLD_FILES+=usr/share/man/man3/setvfsent.3.gz
 OLD_FILES+=usr/share/man/man3/ssl.3.gz
 OLD_FILES+=usr/share/man/man3/vfsisloadable.3.gz
 OLD_FILES+=usr/share/man/man3/vfsload.3.gz
 OLD_FILES+=usr/share/man/man4/als4000.4.gz
 OLD_FILES+=usr/share/man/man4/csa.4.gz
 OLD_FILES+=usr/share/man/man4/emu10k1.4.gz
 OLD_FILES+=usr/share/man/man4/euc.4.gz
 OLD_FILES+=usr/share/man/man4/gusc.4.gz
 OLD_FILES+=usr/share/man/man4/if_fwp.4.gz
 OLD_FILES+=usr/share/man/man4/lomac.4.gz
 OLD_FILES+=usr/share/man/man4/maestro3.4.gz
 OLD_FILES+=usr/share/man/man4/raid.4.gz
 OLD_FILES+=usr/share/man/man4/sbc.4.gz
 OLD_FILES+=usr/share/man/man4/sd.4.gz
 OLD_FILES+=usr/share/man/man4/snc.4.gz
 OLD_FILES+=usr/share/man/man4/st.4.gz
 OLD_FILES+=usr/share/man/man4/uaudio.4.gz
 OLD_FILES+=usr/share/man/man4/utf2.4.gz
 OLD_FILES+=usr/share/man/man4/vinumdebug.4.gz
 OLD_FILES+=usr/share/man/man5/disklabel.5.gz
 OLD_FILES+=usr/share/man/man5/dm.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ranlib.5.gz
 OLD_FILES+=usr/share/man/man5/utf2.5.gz
 OLD_FILES+=usr/share/man/man7/groff_mwww.7.gz
 OLD_FILES+=usr/share/man/man7/mmroff.7.gz
 OLD_FILES+=usr/share/man/man7/mwww.7.gz
 OLD_FILES+=usr/share/man/man8/dm.8.gz
 OLD_FILES+=usr/share/man/man8/pam_ftp.8.gz
 OLD_FILES+=usr/share/man/man8/pam_wheel.8.gz
 OLD_FILES+=usr/share/man/man8/ssl.8.gz
 OLD_FILES+=usr/share/man/man8/wlconfig.8.gz
 OLD_FILES+=usr/share/man/man9/CURSIG.9.gz
 OLD_FILES+=usr/share/man/man9/VFS_INIT.9.gz
 OLD_FILES+=usr/share/man/man9/at_exit.9.gz
 OLD_FILES+=usr/share/man/man9/at_fork.9.gz
 OLD_FILES+=usr/share/man/man9/cdevsw_add.9.gz
 OLD_FILES+=usr/share/man/man9/cdevsw_remove.9.gz
 OLD_FILES+=usr/share/man/man9/cv_waitq_empty.9.gz
 OLD_FILES+=usr/share/man/man9/cv_waitq_remove.9.gz
 OLD_FILES+=usr/share/man/man9/endtsleep.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_freem.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_pg_alloc.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_pg_free.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_pg_steal.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_phys_to_kva.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_vm_init.9.gz
 OLD_FILES+=usr/share/man/man9/mac_biba.9.gz
 OLD_FILES+=usr/share/man/man9/mac_bsdextended.9.gz
 OLD_FILES+=usr/share/man/man9/mono_time.9.gz
 OLD_FILES+=usr/share/man/man9/p1003_1b.9.gz
 OLD_FILES+=usr/share/man/man9/pmap_prefault.9.gz
 OLD_FILES+=usr/share/man/man9/posix4.9.gz
 OLD_FILES+=usr/share/man/man9/resource_query_name.9.gz
 OLD_FILES+=usr/share/man/man9/resource_query_string.9.gz
 OLD_FILES+=usr/share/man/man9/resource_query_unit.9.gz
 OLD_FILES+=usr/share/man/man9/rm_at_exit.9.gz
 OLD_FILES+=usr/share/man/man9/rm_at_fork.9.gz
 OLD_FILES+=usr/share/man/man9/runtime.9.gz
 OLD_FILES+=usr/share/man/man9/sleepinit.9.gz
 OLD_FILES+=usr/share/man/man9/unsleep.9.gz
 OLD_FILES+=usr/share/games/atc/Game_List
 OLD_FILES+=usr/share/games/atc/Killer
 OLD_FILES+=usr/share/games/atc/crossover
 OLD_FILES+=usr/share/games/atc/default
 OLD_FILES+=usr/share/games/atc/easy
 OLD_FILES+=usr/share/games/atc/game_2
 OLD_FILES+=usr/share/games/larn/larnmaze
 OLD_FILES+=usr/share/games/larn/larnopts
 OLD_FILES+=usr/share/games/larn/larn.help
 OLD_FILES+=usr/share/games/quiz.db/africa
 OLD_FILES+=usr/share/games/quiz.db/america
 OLD_FILES+=usr/share/games/quiz.db/areas
 OLD_FILES+=usr/share/games/quiz.db/arith
 OLD_FILES+=usr/share/games/quiz.db/asia
 OLD_FILES+=usr/share/games/quiz.db/babies
 OLD_FILES+=usr/share/games/quiz.db/bard
 OLD_FILES+=usr/share/games/quiz.db/chinese
 OLD_FILES+=usr/share/games/quiz.db/collectives
 OLD_FILES+=usr/share/games/quiz.db/ed
 OLD_FILES+=usr/share/games/quiz.db/elements
 OLD_FILES+=usr/share/games/quiz.db/europe
 OLD_FILES+=usr/share/games/quiz.db/flowers
 OLD_FILES+=usr/share/games/quiz.db/greek
 OLD_FILES+=usr/share/games/quiz.db/inca
 OLD_FILES+=usr/share/games/quiz.db/index
 OLD_FILES+=usr/share/games/quiz.db/latin
 OLD_FILES+=usr/share/games/quiz.db/locomotive
 OLD_FILES+=usr/share/games/quiz.db/midearth
 OLD_FILES+=usr/share/games/quiz.db/morse
 OLD_FILES+=usr/share/games/quiz.db/murders
 OLD_FILES+=usr/share/games/quiz.db/poetry
 OLD_FILES+=usr/share/games/quiz.db/posneg
 OLD_FILES+=usr/share/games/quiz.db/pres
 OLD_FILES+=usr/share/games/quiz.db/province
 OLD_FILES+=usr/share/games/quiz.db/seq-easy
 OLD_FILES+=usr/share/games/quiz.db/seq-hard
 OLD_FILES+=usr/share/games/quiz.db/sexes
 OLD_FILES+=usr/share/games/quiz.db/sov
 OLD_FILES+=usr/share/games/quiz.db/spell
 OLD_FILES+=usr/share/games/quiz.db/state
 OLD_FILES+=usr/share/games/quiz.db/trek
 OLD_FILES+=usr/share/games/quiz.db/ucc
 OLD_FILES+=usr/share/games/cribbage.instr
 OLD_FILES+=usr/share/games/fish.instr
 OLD_FILES+=usr/share/games/wump.info
 OLD_FILES+=usr/games/hide/adventure
 OLD_FILES+=usr/games/hide/arithmetic
 OLD_FILES+=usr/games/hide/atc
 OLD_FILES+=usr/games/hide/backgammon
 OLD_FILES+=usr/games/hide/teachgammon
 OLD_FILES+=usr/games/hide/battlestar
 OLD_FILES+=usr/games/hide/bs
 OLD_FILES+=usr/games/hide/canfield
 OLD_FILES+=usr/games/hide/cribbage
 OLD_FILES+=usr/games/hide/fish
 OLD_FILES+=usr/games/hide/hack
 OLD_FILES+=usr/games/hide/hangman
 OLD_FILES+=usr/games/hide/larn
 OLD_FILES+=usr/games/hide/mille
 OLD_FILES+=usr/games/hide/phantasia
 OLD_FILES+=usr/games/hide/quiz
 OLD_FILES+=usr/games/hide/robots
 OLD_FILES+=usr/games/hide/rogue
 OLD_FILES+=usr/games/hide/sail
 OLD_FILES+=usr/games/hide/snake
 OLD_FILES+=usr/games/hide/trek
 OLD_FILES+=usr/games/hide/worm
 OLD_FILES+=usr/games/hide/wump
 OLD_FILES+=usr/games/adventure
 OLD_FILES+=usr/games/arithmetic
 OLD_FILES+=usr/games/atc
 OLD_FILES+=usr/games/backgammon
 OLD_FILES+=usr/games/teachgammon
 OLD_FILES+=usr/games/battlestar
 OLD_FILES+=usr/games/bs
 OLD_FILES+=usr/games/canfield
 OLD_FILES+=usr/games/cfscores
 OLD_FILES+=usr/games/cribbage
 OLD_FILES+=usr/games/dm
 OLD_FILES+=usr/games/fish
 OLD_FILES+=usr/games/hack
 OLD_FILES+=usr/games/hangman
 OLD_FILES+=usr/games/larn
 OLD_FILES+=usr/games/mille
 OLD_FILES+=usr/games/phantasia
 OLD_FILES+=usr/games/piano
 OLD_FILES+=usr/games/pig
 OLD_FILES+=usr/games/quiz
 OLD_FILES+=usr/games/rain
 OLD_FILES+=usr/games/robots
 OLD_FILES+=usr/games/rogue
 OLD_FILES+=usr/games/sail
 OLD_FILES+=usr/games/snake
 OLD_FILES+=usr/games/snscore
 OLD_FILES+=usr/games/trek
 OLD_FILES+=usr/games/wargames
 OLD_FILES+=usr/games/worm
 OLD_FILES+=usr/games/worms
 OLD_FILES+=usr/games/wump
 OLD_FILES+=sbin/mount_reiserfs
 OLD_FILES+=usr/include/cam/cam_extend.h
 OLD_FILES+=usr/include/dev/wi/wi_hostap.h
 OLD_FILES+=usr/include/disktab.h
 OLD_FILES+=usr/include/g++/FlexLexer.h
 OLD_FILES+=usr/include/g++/PlotFile.h
 OLD_FILES+=usr/include/g++/SFile.h
 OLD_FILES+=usr/include/g++/_G_config.h
 OLD_FILES+=usr/include/g++/algo.h
 OLD_FILES+=usr/include/g++/algobase.h
 OLD_FILES+=usr/include/g++/algorithm
 OLD_FILES+=usr/include/g++/alloc.h
 OLD_FILES+=usr/include/g++/bitset
 OLD_FILES+=usr/include/g++/builtinbuf.h
 OLD_FILES+=usr/include/g++/bvector.h
 OLD_FILES+=usr/include/g++/cassert
 OLD_FILES+=usr/include/g++/cctype
 OLD_FILES+=usr/include/g++/cerrno
 OLD_FILES+=usr/include/g++/cfloat
 OLD_FILES+=usr/include/g++/ciso646
 OLD_FILES+=usr/include/g++/climits
 OLD_FILES+=usr/include/g++/clocale
 OLD_FILES+=usr/include/g++/cmath
 OLD_FILES+=usr/include/g++/complex
 OLD_FILES+=usr/include/g++/complex.h
 OLD_FILES+=usr/include/g++/csetjmp
 OLD_FILES+=usr/include/g++/csignal
 OLD_FILES+=usr/include/g++/cstdarg
 OLD_FILES+=usr/include/g++/cstddef
 OLD_FILES+=usr/include/g++/cstdio
 OLD_FILES+=usr/include/g++/cstdlib
 OLD_FILES+=usr/include/g++/cstring
 OLD_FILES+=usr/include/g++/ctime
 OLD_FILES+=usr/include/g++/cwchar
 OLD_FILES+=usr/include/g++/cwctype
 OLD_FILES+=usr/include/g++/defalloc.h
 OLD_FILES+=usr/include/g++/deque
 OLD_FILES+=usr/include/g++/deque.h
 OLD_FILES+=usr/include/g++/editbuf.h
 OLD_FILES+=usr/include/g++/exception
 OLD_FILES+=usr/include/g++/floatio.h
 OLD_FILES+=usr/include/g++/fstream
 OLD_FILES+=usr/include/g++/fstream.h
 OLD_FILES+=usr/include/g++/function.h
 OLD_FILES+=usr/include/g++/functional
 OLD_FILES+=usr/include/g++/hash_map
 OLD_FILES+=usr/include/g++/hash_map.h
 OLD_FILES+=usr/include/g++/hash_set
 OLD_FILES+=usr/include/g++/hash_set.h
 OLD_FILES+=usr/include/g++/hashtable.h
 OLD_FILES+=usr/include/g++/heap.h
 OLD_FILES+=usr/include/g++/indstream.h
 OLD_FILES+=usr/include/g++/iolibio.h
 OLD_FILES+=usr/include/g++/iomanip
 OLD_FILES+=usr/include/g++/iomanip.h
 OLD_FILES+=usr/include/g++/iosfwd
 OLD_FILES+=usr/include/g++/iostdio.h
 OLD_FILES+=usr/include/g++/iostream
 OLD_FILES+=usr/include/g++/iostream.h
 OLD_FILES+=usr/include/g++/iostreamP.h
 OLD_FILES+=usr/include/g++/istream.h
 OLD_FILES+=usr/include/g++/iterator
 OLD_FILES+=usr/include/g++/iterator.h
 OLD_FILES+=usr/include/g++/libio.h
 OLD_FILES+=usr/include/g++/libioP.h
 OLD_FILES+=usr/include/g++/list
 OLD_FILES+=usr/include/g++/list.h
 OLD_FILES+=usr/include/g++/map
 OLD_FILES+=usr/include/g++/map.h
 OLD_FILES+=usr/include/g++/memory
 OLD_FILES+=usr/include/g++/multimap.h
 OLD_FILES+=usr/include/g++/multiset.h
 OLD_FILES+=usr/include/g++/new
 OLD_FILES+=usr/include/g++/new.h
 OLD_FILES+=usr/include/g++/numeric
 OLD_FILES+=usr/include/g++/ostream.h
 OLD_FILES+=usr/include/g++/pair.h
 OLD_FILES+=usr/include/g++/parsestream.h
 OLD_FILES+=usr/include/g++/pfstream.h
 OLD_FILES+=usr/include/g++/procbuf.h
 OLD_FILES+=usr/include/g++/pthread_alloc
 OLD_FILES+=usr/include/g++/pthread_alloc.h
 OLD_FILES+=usr/include/g++/queue
 OLD_FILES+=usr/include/g++/rope
 OLD_FILES+=usr/include/g++/rope.h
 OLD_FILES+=usr/include/g++/ropeimpl.h
 OLD_FILES+=usr/include/g++/set
 OLD_FILES+=usr/include/g++/set.h
 OLD_FILES+=usr/include/g++/slist
 OLD_FILES+=usr/include/g++/slist.h
 OLD_FILES+=usr/include/g++/sstream
 OLD_FILES+=usr/include/g++/stack
 OLD_FILES+=usr/include/g++/stack.h
 OLD_FILES+=usr/include/g++/std/bastring.cc
 OLD_FILES+=usr/include/g++/std/bastring.h
 OLD_FILES+=usr/include/g++/std/complext.cc
 OLD_FILES+=usr/include/g++/std/complext.h
 OLD_FILES+=usr/include/g++/std/dcomplex.h
 OLD_FILES+=usr/include/g++/std/fcomplex.h
 OLD_FILES+=usr/include/g++/std/gslice.h
 OLD_FILES+=usr/include/g++/std/gslice_array.h
 OLD_FILES+=usr/include/g++/std/indirect_array.h
 OLD_FILES+=usr/include/g++/std/ldcomplex.h
 OLD_FILES+=usr/include/g++/std/mask_array.h
 OLD_FILES+=usr/include/g++/std/slice.h
 OLD_FILES+=usr/include/g++/std/slice_array.h
 OLD_FILES+=usr/include/g++/std/std_valarray.h
 OLD_FILES+=usr/include/g++/std/straits.h
 OLD_FILES+=usr/include/g++/std/valarray_array.h
 OLD_FILES+=usr/include/g++/std/valarray_array.tcc
 OLD_FILES+=usr/include/g++/std/valarray_meta.h
 OLD_FILES+=usr/include/g++/stdexcept
 OLD_FILES+=usr/include/g++/stdiostream.h
 OLD_FILES+=usr/include/g++/stl.h
 OLD_FILES+=usr/include/g++/stl_algo.h
 OLD_FILES+=usr/include/g++/stl_algobase.h
 OLD_FILES+=usr/include/g++/stl_alloc.h
 OLD_FILES+=usr/include/g++/stl_bvector.h
 OLD_FILES+=usr/include/g++/stl_config.h
 OLD_FILES+=usr/include/g++/stl_construct.h
 OLD_FILES+=usr/include/g++/stl_deque.h
 OLD_FILES+=usr/include/g++/stl_function.h
 OLD_FILES+=usr/include/g++/stl_hash_fun.h
 OLD_FILES+=usr/include/g++/stl_hash_map.h
 OLD_FILES+=usr/include/g++/stl_hash_set.h
 OLD_FILES+=usr/include/g++/stl_hashtable.h
 OLD_FILES+=usr/include/g++/stl_heap.h
 OLD_FILES+=usr/include/g++/stl_iterator.h
 OLD_FILES+=usr/include/g++/stl_list.h
 OLD_FILES+=usr/include/g++/stl_map.h
 OLD_FILES+=usr/include/g++/stl_multimap.h
 OLD_FILES+=usr/include/g++/stl_multiset.h
 OLD_FILES+=usr/include/g++/stl_numeric.h
 OLD_FILES+=usr/include/g++/stl_pair.h
 OLD_FILES+=usr/include/g++/stl_queue.h
 OLD_FILES+=usr/include/g++/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/g++/stl_relops.h
 OLD_FILES+=usr/include/g++/stl_rope.h
 OLD_FILES+=usr/include/g++/stl_set.h
 OLD_FILES+=usr/include/g++/stl_slist.h
 OLD_FILES+=usr/include/g++/stl_stack.h
 OLD_FILES+=usr/include/g++/stl_tempbuf.h
 OLD_FILES+=usr/include/g++/stl_tree.h
 OLD_FILES+=usr/include/g++/stl_uninitialized.h
 OLD_FILES+=usr/include/g++/stl_vector.h
 OLD_FILES+=usr/include/g++/stream.h
 OLD_FILES+=usr/include/g++/streambuf.h
 OLD_FILES+=usr/include/g++/strfile.h
 OLD_FILES+=usr/include/g++/string
 OLD_FILES+=usr/include/g++/strstream
 OLD_FILES+=usr/include/g++/strstream.h
 OLD_FILES+=usr/include/g++/tempbuf.h
 OLD_FILES+=usr/include/g++/tree.h
 OLD_FILES+=usr/include/g++/type_traits.h
 OLD_FILES+=usr/include/g++/typeinfo
 OLD_FILES+=usr/include/g++/utility
 OLD_FILES+=usr/include/g++/valarray
 OLD_FILES+=usr/include/g++/vector
 OLD_FILES+=usr/include/g++/vector.h
 OLD_FILES+=usr/include/gmp.h
 OLD_FILES+=usr/include/isc/assertions.h
 OLD_FILES+=usr/include/isc/ctl.h
 OLD_FILES+=usr/include/isc/dst.h
 OLD_FILES+=usr/include/isc/eventlib.h
 OLD_FILES+=usr/include/isc/heap.h
 OLD_FILES+=usr/include/isc/irpmarshall.h
 OLD_FILES+=usr/include/isc/list.h
 OLD_FILES+=usr/include/isc/logging.h
 OLD_FILES+=usr/include/isc/memcluster.h
 OLD_FILES+=usr/include/isc/misc.h
 OLD_FILES+=usr/include/isc/tree.h
 OLD_FILES+=usr/include/machine/ansi.h
 OLD_FILES+=usr/include/machine/apic.h
 OLD_FILES+=usr/include/machine/asc_ioctl.h
 OLD_FILES+=usr/include/machine/asnames.h
 OLD_FILES+=usr/include/machine/bus_at386.h
 OLD_FILES+=usr/include/machine/bus_memio.h
 OLD_FILES+=usr/include/machine/bus_pc98.h
 OLD_FILES+=usr/include/machine/bus_pio.h
 OLD_FILES+=usr/include/machine/cdk.h
 OLD_FILES+=usr/include/machine/comstats.h
 OLD_FILES+=usr/include/machine/console.h
 OLD_FILES+=usr/include/machine/critical.h
 OLD_FILES+=usr/include/machine/cronyx.h
 OLD_FILES+=usr/include/machine/dvcfg.h
 OLD_FILES+=usr/include/machine/globaldata.h
 OLD_FILES+=usr/include/machine/globals.h
 OLD_FILES+=usr/include/machine/gsc.h
 OLD_FILES+=usr/include/machine/i4b_isppp.h
 OLD_FILES+=usr/include/machine/if_wavelan_ieee.h
 OLD_FILES+=usr/include/machine/iic.h
 OLD_FILES+=usr/include/machine/ioctl_ctx.h
 OLD_FILES+=usr/include/machine/ioctl_fd.h
 OLD_FILES+=usr/include/machine/ipl.h
 OLD_FILES+=usr/include/machine/lock.h
 OLD_FILES+=usr/include/machine/mouse.h
 OLD_FILES+=usr/include/machine/mpapic.h
 OLD_FILES+=usr/include/machine/mtpr.h
 OLD_FILES+=usr/include/machine/pc/msdos.h
 OLD_FILES+=usr/include/machine/physio_proc.h
 OLD_FILES+=usr/include/machine/smb.h
 OLD_FILES+=usr/include/machine/spigot.h
 OLD_FILES+=usr/include/machine/types.h
 OLD_FILES+=usr/include/machine/uc_device.h
 OLD_FILES+=usr/include/machine/ultrasound.h
 OLD_FILES+=usr/include/machine/wtio.h
 OLD_FILES+=usr/include/msdosfs/bootsect.h
 OLD_FILES+=usr/include/msdosfs/bpb.h
 OLD_FILES+=usr/include/msdosfs/denode.h
 OLD_FILES+=usr/include/msdosfs/direntry.h
 OLD_FILES+=usr/include/msdosfs/fat.h
 OLD_FILES+=usr/include/msdosfs/msdosfsmount.h
 OLD_FILES+=usr/include/net/hostcache.h
 OLD_FILES+=usr/include/net/if_faith.h
 OLD_FILES+=usr/include/net/if_ieee80211.h
 OLD_FILES+=usr/include/net/if_tunvar.h
 OLD_FILES+=usr/include/net/intrq.h
 OLD_FILES+=usr/include/netatm/kern_include.h
 OLD_FILES+=usr/include/netinet/if_fddi.h
 OLD_FILES+=usr/include/netinet/in_hostcache.h
 OLD_FILES+=usr/include/netinet/ip_flow.h
 OLD_FILES+=usr/include/netinet/ip_fw2.h
 OLD_FILES+=usr/include/netinet6/in6_prefix.h
 OLD_FILES+=usr/include/netns/idp.h
 OLD_FILES+=usr/include/netns/idp_var.h
 OLD_FILES+=usr/include/netns/ns.h
 OLD_FILES+=usr/include/netns/ns_error.h
 OLD_FILES+=usr/include/netns/ns_if.h
 OLD_FILES+=usr/include/netns/ns_pcb.h
 OLD_FILES+=usr/include/netns/sp.h
 OLD_FILES+=usr/include/netns/spidp.h
 OLD_FILES+=usr/include/netns/spp_debug.h
 OLD_FILES+=usr/include/netns/spp_timer.h
 OLD_FILES+=usr/include/netns/spp_var.h
 OLD_FILES+=usr/include/nfs/nfs.h
 OLD_FILES+=usr/include/nfs/nfsm_subs.h
 OLD_FILES+=usr/include/nfs/nfsmount.h
 OLD_FILES+=usr/include/nfs/nfsnode.h
 OLD_FILES+=usr/include/nfs/nfsrtt.h
 OLD_FILES+=usr/include/nfs/nfsrvcache.h
 OLD_FILES+=usr/include/nfs/nfsv2.h
 OLD_FILES+=usr/include/nfs/nqnfs.h
 OLD_FILES+=usr/include/ntfs/ntfs.h
 OLD_FILES+=usr/include/ntfs/ntfs_compr.h
 OLD_FILES+=usr/include/ntfs/ntfs_ihash.h
 OLD_FILES+=usr/include/ntfs/ntfs_inode.h
 OLD_FILES+=usr/include/ntfs/ntfs_subr.h
 OLD_FILES+=usr/include/ntfs/ntfs_vfsops.h
 OLD_FILES+=usr/include/ntfs/ntfsmount.h
 OLD_FILES+=usr/include/nwfs/nwfs.h
 OLD_FILES+=usr/include/nwfs/nwfs_mount.h
 OLD_FILES+=usr/include/nwfs/nwfs_node.h
 OLD_FILES+=usr/include/nwfs/nwfs_subr.h
 OLD_FILES+=usr/include/posix4/_semaphore.h
 OLD_FILES+=usr/include/posix4/aio.h
 OLD_FILES+=usr/include/posix4/ksem.h
 OLD_FILES+=usr/include/posix4/mqueue.h
 OLD_FILES+=usr/include/posix4/posix4.h
 OLD_FILES+=usr/include/posix4/sched.h
 OLD_FILES+=usr/include/posix4/semaphore.h
 OLD_DIRS+=usr/include/posix4
 OLD_FILES+=usr/include/security/_pam_compat.h
 OLD_FILES+=usr/include/security/_pam_macros.h
 OLD_FILES+=usr/include/security/_pam_types.h
 OLD_FILES+=usr/include/security/pam_malloc.h
 OLD_FILES+=usr/include/security/pam_misc.h
 OLD_FILES+=usr/include/skey.h
 OLD_FILES+=usr/include/strhash.h
 OLD_FILES+=usr/include/struct.h
 OLD_FILES+=usr/include/sys/_label.h
 OLD_FILES+=usr/include/sys/_posix.h
 OLD_FILES+=usr/include/sys/bus_private.h
 OLD_FILES+=usr/include/sys/ccdvar.h
 OLD_FILES+=usr/include/sys/diskslice.h
 OLD_FILES+=usr/include/sys/dmap.h
 OLD_FILES+=usr/include/sys/inttypes.h
 OLD_FILES+=usr/include/sys/jumbo.h
 OLD_FILES+=usr/include/sys/mac_policy.h
 OLD_FILES+=usr/include/sys/pbioio.h
 OLD_FILES+=usr/include/sys/syscall-hide.h
 OLD_FILES+=usr/include/sys/tprintf.h
 OLD_FILES+=usr/include/sys/vnioctl.h
 OLD_FILES+=usr/include/sys/wormio.h
 OLD_FILES+=usr/include/telnet.h
 OLD_FILES+=usr/include/ufs/mfs/mfs_extern.h
 OLD_FILES+=usr/include/ufs/mfs/mfsnode.h
 OLD_FILES+=usr/include/values.h
 OLD_FILES+=usr/include/vm/vm_zone.h
 OLD_FILES+=usr/share/examples/etc/usbd.conf
 OLD_FILES+=usr/share/examples/meteor/README
 OLD_FILES+=usr/share/examples/meteor/rgb16.c
 OLD_FILES+=usr/share/examples/meteor/rgb24.c
 OLD_FILES+=usr/share/examples/meteor/test-n.c
 OLD_FILES+=usr/share/examples/meteor/yuvpk.c
 OLD_FILES+=usr/share/examples/meteor/yuvpl.c
 OLD_FILES+=usr/share/examples/worm/README
 OLD_FILES+=usr/share/examples/worm/makecdfs.sh
 OLD_FILES+=usr/share/groff_font/devlj4/Makefile
 OLD_FILES+=usr/share/groff_font/devlj4/text.map
 OLD_FILES+=usr/share/groff_font/devlj4/special.map
 OLD_FILES+=usr/share/misc/nslookup.help
 OLD_FILES+=usr/share/sendmail/cf/feature/nodns.m4
 OLD_FILES+=usr/share/syscons/keymaps/lat-amer.kbd
 OLD_FILES+=usr/share/vi/catalog/ru_SU.KOI8-R
 OLD_FILES+=usr/share/zoneinfo/SystemV/YST9
 OLD_FILES+=usr/share/zoneinfo/SystemV/PST8
 OLD_FILES+=usr/share/zoneinfo/SystemV/EST5EDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/CST6CDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/MST7MDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/PST8PDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/YST9YDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/HST10
 OLD_FILES+=usr/share/zoneinfo/SystemV/MST7
 OLD_FILES+=usr/share/zoneinfo/SystemV/EST5
 OLD_FILES+=usr/share/zoneinfo/SystemV/AST4ADT
 OLD_FILES+=usr/share/zoneinfo/SystemV/CST6
 OLD_FILES+=usr/share/zoneinfo/SystemV/AST4
 OLD_DIRS+=usr/share/zoneinfo/SystemV
 OLD_FILES+=usr/share/doc/ntp/accopt.htm
 OLD_FILES+=usr/share/doc/ntp/assoc.htm
 OLD_FILES+=usr/share/doc/ntp/audio.htm
 OLD_FILES+=usr/share/doc/ntp/authopt.htm
 OLD_FILES+=usr/share/doc/ntp/biblio.htm
 OLD_FILES+=usr/share/doc/ntp/build.htm
 OLD_FILES+=usr/share/doc/ntp/clockopt.htm
 OLD_FILES+=usr/share/doc/ntp/config.htm
 OLD_FILES+=usr/share/doc/ntp/confopt.htm
 OLD_FILES+=usr/share/doc/ntp/copyright.htm
 OLD_FILES+=usr/share/doc/ntp/debug.htm
 OLD_FILES+=usr/share/doc/ntp/driver1.htm
 OLD_FILES+=usr/share/doc/ntp/driver10.htm
 OLD_FILES+=usr/share/doc/ntp/driver11.htm
 OLD_FILES+=usr/share/doc/ntp/driver12.htm
 OLD_FILES+=usr/share/doc/ntp/driver16.htm
 OLD_FILES+=usr/share/doc/ntp/driver18.htm
 OLD_FILES+=usr/share/doc/ntp/driver19.htm
 OLD_FILES+=usr/share/doc/ntp/driver2.htm
 OLD_FILES+=usr/share/doc/ntp/driver20.htm
 OLD_FILES+=usr/share/doc/ntp/driver22.htm
 OLD_FILES+=usr/share/doc/ntp/driver23.htm
 OLD_FILES+=usr/share/doc/ntp/driver24.htm
 OLD_FILES+=usr/share/doc/ntp/driver26.htm
 OLD_FILES+=usr/share/doc/ntp/driver27.htm
 OLD_FILES+=usr/share/doc/ntp/driver28.htm
 OLD_FILES+=usr/share/doc/ntp/driver29.htm
 OLD_FILES+=usr/share/doc/ntp/driver3.htm
 OLD_FILES+=usr/share/doc/ntp/driver30.htm
 OLD_FILES+=usr/share/doc/ntp/driver32.htm
 OLD_FILES+=usr/share/doc/ntp/driver33.htm
 OLD_FILES+=usr/share/doc/ntp/driver34.htm
 OLD_FILES+=usr/share/doc/ntp/driver35.htm
 OLD_FILES+=usr/share/doc/ntp/driver36.htm
 OLD_FILES+=usr/share/doc/ntp/driver37.htm
 OLD_FILES+=usr/share/doc/ntp/driver4.htm
 OLD_FILES+=usr/share/doc/ntp/driver5.htm
 OLD_FILES+=usr/share/doc/ntp/driver6.htm
 OLD_FILES+=usr/share/doc/ntp/driver7.htm
 OLD_FILES+=usr/share/doc/ntp/driver8.htm
 OLD_FILES+=usr/share/doc/ntp/driver9.htm
 OLD_FILES+=usr/share/doc/ntp/exec.htm
 OLD_FILES+=usr/share/doc/ntp/extern.htm
 OLD_FILES+=usr/share/doc/ntp/gadget.htm
 OLD_FILES+=usr/share/doc/ntp/hints.htm
 OLD_FILES+=usr/share/doc/ntp/howto.htm
 OLD_FILES+=usr/share/doc/ntp/htmlprimer.htm
 OLD_FILES+=usr/share/doc/ntp/index.htm
 OLD_FILES+=usr/share/doc/ntp/kern.htm
 OLD_FILES+=usr/share/doc/ntp/kernpps.htm
 OLD_FILES+=usr/share/doc/ntp/ldisc.htm
 OLD_FILES+=usr/share/doc/ntp/measure.htm
 OLD_FILES+=usr/share/doc/ntp/miscopt.htm
 OLD_FILES+=usr/share/doc/ntp/monopt.htm
 OLD_FILES+=usr/share/doc/ntp/mx4200data.htm
 OLD_FILES+=usr/share/doc/ntp/notes.htm
 OLD_FILES+=usr/share/doc/ntp/ntpd.htm
 OLD_FILES+=usr/share/doc/ntp/ntpdate.htm
 OLD_FILES+=usr/share/doc/ntp/ntpdc.htm
 OLD_FILES+=usr/share/doc/ntp/ntpq.htm
 OLD_FILES+=usr/share/doc/ntp/ntptime.htm
 OLD_FILES+=usr/share/doc/ntp/ntptrace.htm
 OLD_FILES+=usr/share/doc/ntp/parsedata.htm
 OLD_FILES+=usr/share/doc/ntp/parsenew.htm
 OLD_FILES+=usr/share/doc/ntp/patches.htm
 OLD_FILES+=usr/share/doc/ntp/porting.htm
 OLD_FILES+=usr/share/doc/ntp/pps.htm
 OLD_FILES+=usr/share/doc/ntp/prefer.htm
 OLD_FILES+=usr/share/doc/ntp/qth.htm
 OLD_FILES+=usr/share/doc/ntp/quick.htm
 OLD_FILES+=usr/share/doc/ntp/rdebug.htm
 OLD_FILES+=usr/share/doc/ntp/refclock.htm
 OLD_FILES+=usr/share/doc/ntp/release.htm
 OLD_FILES+=usr/share/doc/ntp/tickadj.htm
 OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz
 OLD_FILES+=usr/share/doc/papers/px.ascii.gz
 OLD_FILES+=usr/share/man/man3/exp10.3.gz
 OLD_FILES+=usr/share/man/man3/exp10f.3.gz
 OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
 OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz
 OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz
 OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz
 OLD_FILES+=usr/share/man/man3/mbmb.3.gz
 OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz
 OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz
 .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
 OLD_FILES+=usr/share/man/man8/boot_i386.8.gz
 .endif
 OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz
 OLD_FILES+=usr/share/man/man9/VFS_START.9.gz
 OLD_FILES+=usr/share/man/man9/cpu_critical_exit.9.gz
 OLD_FILES+=usr/share/man/man9/cpu_critical_enter.9.gz
 OLD_FILES+=usr/share/info/annotate.info.gz
 OLD_FILES+=usr/share/info/tar.info.gz
 OLD_FILES+=usr/share/bsnmp/defs/tree.def
 OLD_FILES+=usr/share/bsnmp/defs/mibII_tree.def
 OLD_FILES+=usr/share/bsnmp/defs/netgraph_tree.def
 OLD_FILES+=usr/share/bsnmp/mibs/FOKUS-MIB.txt
 OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-MIB.txt
 OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-SNMPD.txt
 OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-NETGRAPH.txt
 OLD_FILES+=usr/libdata/msdosfs/iso22dos
 OLD_FILES+=usr/libdata/msdosfs/iso72dos
 OLD_FILES+=usr/libdata/msdosfs/koi2dos
 OLD_FILES+=usr/libdata/msdosfs/koi8u2dos
 # The following files are *not* obsolete, they just don't get touched at
 # install, so don't add them:
 #  - boot/loader.rc
 #  - usr/share/tmac/man.local
 #  - usr/share/tmac/mm/locale
 #  - usr/share/tmac/mm/se_locale
 #  - var/yp/Makefile
 
 # Early entries split OLD_FILES, OLD_LIBS, and OLD_DIRS into separate sections
 # in this file, but this practice was abandoned in the mid-2000s.
 #
 # 20071120: shared library version bump
 OLD_LIBS+=usr/lib/libasn1.so.8
 OLD_LIBS+=usr/lib/libgssapi.so.8
 OLD_LIBS+=usr/lib/libgssapi_krb5.so.8
 OLD_LIBS+=usr/lib/libhdb.so.8
 OLD_LIBS+=usr/lib/libkadm5clnt.so.8
 OLD_LIBS+=usr/lib/libkadm5srv.so.8
 OLD_LIBS+=usr/lib/libkafs5.so.8
 OLD_LIBS+=usr/lib/libkrb5.so.8
 OLD_LIBS+=usr/lib/libobjc.so.2
 # 20070519: GCC 4.2
 OLD_FILES+=usr/lib/libg2c.a
 OLD_FILES+=usr/lib/libg2c.so
 OLD_LIBS+=usr/lib/libg2c.so.2
 OLD_FILES+=usr/lib/libg2c_p.a
 OLD_FILES+=usr/lib/libgcc_pic.a
 # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade
 OLD_LIBS+=lib/libcrypto.so.4
 OLD_LIBS+=usr/lib/libssl.so.4
 # 20060521: gethostbyaddr(3) ABI change
 OLD_LIBS+=usr/lib/libroken.so.8
 OLD_LIBS+=lib/libatm.so.3
 OLD_LIBS+=lib/libc.so.6
 OLD_LIBS+=lib/libutil.so.5
 # 20060413: shared library moved to /usr/lib
 MOVED_LIBS+=lib/libgpib.so.1
 # 20060413: libpcap.so.4 moved to /lib/
 MOVED_LIBS+=usr/lib/libpcap.so.4
 # 20060412: libpthread.so.2 moved to /lib/
 MOVED_LIBS+=usr/lib/libpthread.so.2
 # 20060127: revert libdisk to static-only
 OLD_LIBS+=usr/lib/libdisk.so.3
 # 20051027: libc_r discontinued (removed 20101113)
 OLD_FILES+=usr/lib/libc_r.a
 OLD_FILES+=usr/lib/libc_r.so
 OLD_LIBS+=usr/lib/libc_r.so.7
 OLD_FILES+=usr/lib/libc_r_p.a
 # 20050722: bump for 6.0-RELEASE
 OLD_LIBS+=lib/libalias.so.4
 OLD_LIBS+=lib/libatm.so.2
 OLD_LIBS+=lib/libbegemot.so.1
 OLD_LIBS+=lib/libbsdxml.so.1
 OLD_LIBS+=lib/libbsnmp.so.2
 OLD_LIBS+=lib/libc.so.5
 OLD_LIBS+=lib/libcam.so.2
 OLD_LIBS+=lib/libcrypt.so.2
 OLD_LIBS+=lib/libcrypto.so.3
 OLD_LIBS+=lib/libdevstat.so.4
 OLD_LIBS+=lib/libedit.so.4
 OLD_LIBS+=lib/libgeom.so.2
 OLD_LIBS+=lib/libgpib.so.0
 OLD_LIBS+=lib/libipsec.so.1
 OLD_LIBS+=lib/libipx.so.2
 OLD_LIBS+=lib/libkiconv.so.1
 OLD_LIBS+=lib/libkvm.so.2
 OLD_LIBS+=lib/libm.so.3
 OLD_LIBS+=lib/libmd.so.2
 OLD_LIBS+=lib/libncurses.so.5
 OLD_LIBS+=lib/libreadline.so.5
 OLD_LIBS+=lib/libsbuf.so.2
 OLD_LIBS+=lib/libufs.so.2
 OLD_LIBS+=lib/libutil.so.4
 OLD_LIBS+=lib/libz.so.2
 OLD_LIBS+=usr/lib/libarchive.so.1
 OLD_LIBS+=usr/lib/libasn1.so.7
 OLD_LIBS+=usr/lib/libbluetooth.so.1
 OLD_LIBS+=usr/lib/libbz2.so.1
 OLD_LIBS+=usr/lib/libc_r.so.5
 OLD_LIBS+=usr/lib/libcalendar.so.2
 OLD_LIBS+=usr/lib/libcom_err.so.2
 OLD_LIBS+=usr/lib/libdevinfo.so.2
 OLD_LIBS+=usr/lib/libdialog.so.4
 OLD_LIBS+=usr/lib/libfetch.so.3
 OLD_LIBS+=usr/lib/libform.so.2
 OLD_LIBS+=usr/lib/libftpio.so.5
 OLD_LIBS+=usr/lib/libg2c.so.1
 OLD_LIBS+=usr/lib/libgnuregex.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.7
 OLD_LIBS+=usr/lib/libhdb.so.7
 OLD_LIBS+=usr/lib/libhistory.so.5
 OLD_LIBS+=usr/lib/libkadm5clnt.so.7
 OLD_LIBS+=usr/lib/libkadm5srv.so.7
 OLD_LIBS+=usr/lib/libkafs5.so.7
 OLD_LIBS+=usr/lib/libkrb5.so.7
 OLD_LIBS+=usr/lib/libmagic.so.1
 OLD_LIBS+=usr/lib/libmenu.so.2
 OLD_LIBS+=usr/lib/libmilter.so.2
 OLD_LIBS+=usr/lib/libmp.so.4
 OLD_LIBS+=usr/lib/libncp.so.1
 OLD_LIBS+=usr/lib/libnetgraph.so.1
 OLD_LIBS+=usr/lib/libngatm.so.1
 OLD_LIBS+=usr/lib/libobjc.so.1
 OLD_LIBS+=usr/lib/libopie.so.3
 OLD_LIBS+=usr/lib/libpam.so.2
 OLD_LIBS+=usr/lib/libpanel.so.2
 OLD_LIBS+=usr/lib/libpcap.so.3
 OLD_LIBS+=usr/lib/libpmc.so.2
 OLD_LIBS+=usr/lib/libpthread.so.1
 OLD_LIBS+=usr/lib/libradius.so.1
 OLD_LIBS+=usr/lib/libroken.so.7
 OLD_LIBS+=usr/lib/librpcsvc.so.2
 OLD_LIBS+=usr/lib/libsdp.so.1
 OLD_LIBS+=usr/lib/libsmb.so.1
 OLD_LIBS+=usr/lib/libssh.so.2
 OLD_LIBS+=usr/lib/libssl.so.3
 OLD_LIBS+=usr/lib/libstdc++.so.4
 OLD_LIBS+=usr/lib/libtacplus.so.1
 OLD_LIBS+=usr/lib/libthr.so.1
 OLD_LIBS+=usr/lib/libthread_db.so.1
 OLD_LIBS+=usr/lib/libugidfw.so.1
 OLD_LIBS+=usr/lib/libusbhid.so.1
 OLD_LIBS+=usr/lib/libvgl.so.3
 OLD_LIBS+=usr/lib/libwrap.so.3
 OLD_LIBS+=usr/lib/libypclnt.so.1
 OLD_LIBS+=usr/lib/pam_chroot.so.2
 OLD_LIBS+=usr/lib/pam_deny.so.2
 OLD_LIBS+=usr/lib/pam_echo.so.2
 OLD_LIBS+=usr/lib/pam_exec.so.2
 OLD_LIBS+=usr/lib/pam_ftpusers.so.2
 OLD_LIBS+=usr/lib/pam_group.so.2
 OLD_LIBS+=usr/lib/pam_guest.so.2
 OLD_LIBS+=usr/lib/pam_krb5.so.2
 OLD_LIBS+=usr/lib/pam_ksu.so.2
 OLD_LIBS+=usr/lib/pam_lastlog.so.2
 OLD_LIBS+=usr/lib/pam_login_access.so.2
 OLD_LIBS+=usr/lib/pam_nologin.so.2
 OLD_LIBS+=usr/lib/pam_opie.so.2
 OLD_LIBS+=usr/lib/pam_opieaccess.so.2
 OLD_LIBS+=usr/lib/pam_passwdqc.so.2
 OLD_LIBS+=usr/lib/pam_permit.so.2
 OLD_LIBS+=usr/lib/pam_radius.so.2
 OLD_LIBS+=usr/lib/pam_rhosts.so.2
 OLD_LIBS+=usr/lib/pam_rootok.so.2
 OLD_LIBS+=usr/lib/pam_securetty.so.2
 OLD_LIBS+=usr/lib/pam_self.so.2
 OLD_LIBS+=usr/lib/pam_ssh.so.2
 OLD_LIBS+=usr/lib/pam_tacplus.so.2
 OLD_LIBS+=usr/lib/pam_unix.so.2
 OLD_LIBS+=usr/lib/snmp_atm.so.3
 OLD_LIBS+=usr/lib/snmp_mibII.so.3
 OLD_LIBS+=usr/lib/snmp_netgraph.so.3
 OLD_LIBS+=usr/lib/snmp_pf.so.3
 # 200505XX: ?
 OLD_LIBS+=usr/lib/snmp_atm.so.2
 OLD_LIBS+=usr/lib/snmp_mibII.so.2
 OLD_LIBS+=usr/lib/snmp_netgraph.so.2
 OLD_LIBS+=usr/lib/snmp_pf.so.2
 # 2005XXXX: not ready for primetime yet
 OLD_LIBS+=usr/lib/libautofs.so.1
 # 200411XX: libxpg4 removal
 OLD_LIBS+=usr/lib/libxpg4.so.3
 # 200410XX: libm compatibility fix
 OLD_LIBS+=lib/libm.so.2
 # 20041001: version bump
 OLD_LIBS+=lib/libreadline.so.4
 OLD_LIBS+=usr/lib/libhistory.so.4
 OLD_LIBS+=usr/lib/libopie.so.2
 OLD_LIBS+=usr/lib/libpcap.so.2
 # 20040925: bind9 import
 OLD_LIBS+=usr/lib/libisc.so.1
 # 200408XX
 OLD_LIBS+=usr/lib/snmp_netgraph.so.1
 # 200404XX
 OLD_LIBS+=usr/lib/libsnmp.so.1
 OLD_LIBS+=usr/lib/snmp_mibII.so.1
 # 200309XX
 OLD_LIBS+=usr/lib/libasn1.so.6
 OLD_LIBS+=usr/lib/libhdb.so.6
 OLD_LIBS+=usr/lib/libkadm5clnt.so.6
 OLD_LIBS+=usr/lib/libkadm5srv.so.6
 OLD_LIBS+=usr/lib/libkrb5.so.6
 OLD_LIBS+=usr/lib/libroken.so.6
 # 200304XX
 OLD_LIBS+=usr/lib/libc.so.4
 OLD_LIBS+=usr/lib/libc_r.so.4
 OLD_LIBS+=usr/lib/libdevstat.so.2
 OLD_LIBS+=usr/lib/libedit.so.3
 OLD_LIBS+=usr/lib/libgmp.so.3
 OLD_LIBS+=usr/lib/libmp.so.3
 OLD_LIBS+=usr/lib/libpam.so.1
 OLD_LIBS+=usr/lib/libposix1e.so.2
 OLD_LIBS+=usr/lib/libskey.so.2
 OLD_LIBS+=usr/lib/libusbhid.so.0
 OLD_LIBS+=usr/lib/libvgl.so.2
 # 20030218: OpenSSL 0.9.7 import
 OLD_FILES+=usr/include/des.h
 OLD_FILES+=usr/lib/libdes.a
 OLD_FILES+=usr/lib/libdes.so
 OLD_LIBS+=usr/lib/libdes.so.3
 OLD_FILES+=usr/lib/libdes_p.a
 # 200302XX
 OLD_LIBS+=usr/lib/libacl.so.3
 OLD_LIBS+=usr/lib/libasn1.so.5
 OLD_LIBS+=usr/lib/libcrypto.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.5
 OLD_LIBS+=usr/lib/libhdb.so.5
 OLD_LIBS+=usr/lib/libkadm.so.3
 OLD_LIBS+=usr/lib/libkadm5clnt.so.5
 OLD_LIBS+=usr/lib/libkadm5srv.so.5
 OLD_LIBS+=usr/lib/libkafs.so.3
 OLD_LIBS+=usr/lib/libkafs5.so.5
 OLD_LIBS+=usr/lib/libkdb.so.3
 OLD_LIBS+=usr/lib/libkrb.so.3
 OLD_LIBS+=usr/lib/libroken.so.5
 OLD_LIBS+=usr/lib/libssl.so.2
 OLD_LIBS+=usr/lib/pam_kerberosIV.so
 # 200208XX
 OLD_LIBS+=usr/lib/libgssapi.so.4
 # 200203XX
 OLD_LIBS+=usr/lib/libss.so.3
 OLD_LIBS+=usr/lib/libusb.so.0
 # 200112XX
 OLD_LIBS+=usr/lib/libfetch.so.2
 # 200110XX
 OLD_LIBS+=usr/lib/libgssapi.so.3
 # 200104XX
 OLD_LIBS+=usr/lib/libdescrypt.so.2
 OLD_LIBS+=usr/lib/libscrypt.so.2
 # 200102XX
 OLD_LIBS+=usr/lib/libcrypto.so.1
 OLD_LIBS+=usr/lib/libssl.so.1
 # 200009XX
 OLD_LIBS+=usr/lib/libRSAglue.so.1
 OLD_LIBS+=usr/lib/librsaINTL.so.1
 OLD_LIBS+=usr/lib/librsaUSA.so.1
 # 200006XX
 OLD_LIBS+=usr/lib/libalias.so.3
 OLD_LIBS+=usr/lib/libfetch.so.1
 OLD_LIBS+=usr/lib/libipsec.so.0
 # 200005XX
 OLD_LIBS+=usr/lib/libxpg4.so.2
 # 200002XX
 OLD_LIBS+=usr/lib/libc.so.3
 OLD_LIBS+=usr/lib/libcurses.so.2
 OLD_LIBS+=usr/lib/libdialog.so.3
 OLD_LIBS+=usr/lib/libedit.so.2
 OLD_LIBS+=usr/lib/libf2c.so.2
 OLD_LIBS+=usr/lib/libftpio.so.4
 OLD_LIBS+=usr/lib/libg++.so.4
 OLD_LIBS+=usr/lib/libhistory.so.3
 OLD_LIBS+=usr/lib/libmytinfo.so.2
 OLD_LIBS+=usr/lib/libncurses.so.3
 OLD_LIBS+=usr/lib/libreadline.so.3
 OLD_LIBS+=usr/lib/libss.so.2
 OLD_LIBS+=usr/lib/libtermcap.so.2
 OLD_LIBS+=usr/lib/libutil.so.2
 OLD_LIBS+=usr/lib/libvgl.so.1
 OLD_LIBS+=usr/lib/libwrap.so.2
 # ???
 OLD_LIBS+=usr/lib/libarchive.so.2
 OLD_LIBS+=usr/lib/libbsnmp.so.1
 OLD_LIBS+=usr/lib/libc_r.so.6
 OLD_LIBS+=usr/lib/libcipher.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.6
 OLD_LIBS+=usr/lib/libkse.so.1
 OLD_LIBS+=usr/lib/liblwres.so.3
 OLD_LIBS+=usr/lib/pam_ftp.so.2
 
 # 20040925: bind9 import
 OLD_DIRS+=usr/share/doc/bind/html
 OLD_DIRS+=usr/share/doc/bind/misc
 OLD_DIRS+=usr/share/doc/bind/
 # ???
 OLD_DIRS+=usr/include/g++/std
 OLD_DIRS+=usr/include/msdosfs
 OLD_DIRS+=usr/include/ntfs
 OLD_DIRS+=usr/include/nwfs
 OLD_DIRS+=usr/include/ufs/mfs
 # 20011001: UUCP migration to ports
 OLD_DIRS+=usr/libexec/uucp
 
 
 .include "tools/build/mk/OptionalObsoleteFiles.inc"
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index f7c21ab541b6..0b315d64ed35 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1,2491 +1,2490 @@
 .include <src.opts.mk>
 
 MAN=	accept_filter.9 \
 	accf_data.9 \
 	accf_dns.9 \
 	accf_http.9 \
 	accf_tls.9 \
 	acl.9 \
 	alq.9 \
 	altq.9 \
 	atomic.9 \
 	backlight.9 \
 	bhnd.9 \
 	bhnd_erom.9 \
 	bios.9 \
 	bitset.9 \
 	bpf.9 \
 	buf.9 \
 	buf_ring.9 \
 	BUF_ISLOCKED.9 \
 	BUF_LOCK.9 \
 	BUF_LOCKFREE.9 \
 	BUF_LOCKINIT.9 \
 	BUF_RECURSED.9 \
 	BUF_TIMELOCK.9 \
 	BUF_UNLOCK.9 \
 	bus_activate_resource.9 \
 	BUS_ADD_CHILD.9 \
 	bus_adjust_resource.9 \
 	bus_alloc_resource.9 \
 	BUS_BIND_INTR.9 \
 	bus_child_present.9 \
 	BUS_CHILD_DELETED.9 \
 	BUS_CHILD_DETACHED.9 \
 	BUS_CHILD_LOCATION.9 \
 	BUS_CHILD_PNPINFO.9 \
 	BUS_CONFIG_INTR.9 \
 	bus_delayed_attach_children.9 \
 	BUS_DESCRIBE_INTR.9 \
 	bus_dma.9 \
 	bus_generic_attach.9 \
 	bus_generic_detach.9 \
 	bus_generic_new_pass.9 \
 	bus_generic_print_child.9 \
 	bus_generic_read_ivar.9 \
 	bus_generic_shutdown.9 \
 	BUS_GET_CPUS.9 \
 	BUS_GET_PROPERTY.9 \
 	bus_get_resource.9 \
 	bus_map_resource.9 \
 	BUS_NEW_PASS.9 \
 	BUS_PRINT_CHILD.9 \
 	BUS_READ_IVAR.9 \
 	BUS_RESCAN.9 \
 	bus_release_resource.9 \
 	bus_set_pass.9 \
 	bus_set_resource.9 \
 	BUS_SETUP_INTR.9 \
 	bus_space.9 \
 	byteorder.9 \
 	callout.9 \
 	casuword.9 \
 	cd.9 \
 	cdefs.9 \
 	cnv.9 \
 	condvar.9 \
 	config_intrhook.9 \
 	contigmalloc.9 \
 	copy.9 \
 	counter.9 \
 	cpuset.9 \
 	cr_bsd_visible.9 \
 	cr_cansee.9 \
 	cr_canseejailproc.9 \
 	cr_canseeothergids.9 \
 	cr_canseeotheruids.9 \
 	critical_enter.9 \
 	crypto.9 \
 	crypto_buffer.9 \
 	crypto_driver.9 \
 	crypto_request.9 \
 	crypto_session.9 \
 	CTASSERT.9 \
 	DB_COMMAND.9 \
 	DECLARE_GEOM_CLASS.9 \
 	DECLARE_MODULE.9 \
 	DEFINE_IFUNC.9 \
 	DELAY.9 \
 	devclass.9 \
 	devclass_find.9 \
 	devclass_get_device.9 \
 	devclass_get_devices.9 \
 	devclass_get_drivers.9 \
 	devclass_get_maxunit.9 \
 	devclass_get_name.9 \
 	devclass_get_softc.9 \
 	dev_clone.9 \
 	devfs_set_cdevpriv.9 \
 	device.9 \
 	device_add_child.9 \
 	DEVICE_ATTACH.9 \
 	device_delete_child.9 \
 	device_delete_children.9 \
 	DEVICE_DETACH.9 \
 	device_enable.9 \
 	device_find_child.9 \
 	device_get_children.9 \
 	device_get_devclass.9 \
 	device_get_driver.9 \
 	device_get_ivars.9 \
 	device_get_name.9 \
 	device_get_parent.9 \
 	device_get_property.9 \
 	device_get_softc.9 \
 	device_get_state.9 \
 	device_get_sysctl.9 \
 	device_get_unit.9 \
 	DEVICE_IDENTIFY.9 \
 	device_printf.9 \
 	DEVICE_PROBE.9 \
 	device_probe_and_attach.9 \
 	device_quiet.9 \
 	device_set_desc.9 \
 	device_set_driver.9 \
 	device_set_flags.9 \
 	DEVICE_SHUTDOWN.9 \
 	DEV_MODULE.9 \
 	dev_refthread.9 \
 	devctl_notify.9 \
 	devctl_process_running.9 \
 	devctl_safe_quote_sb.9 \
 	devstat.9 \
 	devtoname.9 \
 	disk.9 \
 	dnv.9 \
 	domain.9 \
 	domainset.9 \
 	dpcpu.9 \
 	drbr.9 \
 	driver.9 \
 	DRIVER_MODULE.9 \
 	efirt.9 \
 	epoch.9 \
 	ether_gen_addr.9 \
 	EVENTHANDLER.9 \
 	eventtimers.9 \
 	extattr.9 \
 	fail.9 \
 	fdt_pinctrl.9 \
 	fetch.9 \
 	firmware.9 \
 	fpu_kern.9 \
 	g_access.9 \
 	g_attach.9 \
 	g_bio.9 \
 	g_consumer.9 \
 	g_data.9 \
 	get_cyclecount.9 \
 	getenv.9 \
 	getnewvnode.9 \
 	g_event.9 \
 	g_geom.9 \
 	g_provider.9 \
 	g_provider_by_name.9 \
 	groupmember.9 \
 	g_wither_geom.9 \
 	gone_in.9 \
 	hardclock.9 \
 	hash.9 \
 	hashinit.9 \
 	hexdump.9 \
 	hhook.9 \
 	hz.9 \
 	ieee80211.9 \
 	ieee80211_amrr.9 \
 	ieee80211_beacon.9 \
 	ieee80211_bmiss.9 \
 	ieee80211_crypto.9 \
 	ieee80211_ddb.9 \
 	ieee80211_input.9 \
 	ieee80211_node.9 \
 	ieee80211_output.9 \
 	ieee80211_proto.9 \
 	ieee80211_radiotap.9 \
 	ieee80211_regdomain.9 \
 	ieee80211_scan.9 \
 	ieee80211_vap.9 \
 	iflib.9 \
 	iflibdd.9 \
 	iflibdi.9 \
 	iflibtxrx.9 \
 	ifnet.9 \
 	inittodr.9 \
 	insmntque.9 \
 	intr_event.9 \
 	intro.9 \
 	kasan.9 \
 	KASSERT.9 \
 	kern_reboot.9 \
 	kern_testfrwk.9 \
 	kern_yield.9 \
 	kernacc.9 \
 	kernel_mount.9 \
 	khelp.9 \
 	kmsan.9 \
 	kobj.9 \
 	kproc.9 \
 	kqueue.9 \
 	kstack_contains.9 \
 	kthread.9 \
 	ktr.9 \
 	lock.9 \
 	locking.9 \
 	LOCK_PROFILING.9 \
 	mac.9 \
 	make_dev.9 \
 	malloc.9 \
 	mbchain.9 \
 	mbuf.9 \
 	mbuf_tags.9 \
 	MD5.9 \
 	mdchain.9 \
 	memcchr.9 \
 	memguard.9 \
 	microseq.9 \
 	microtime.9 \
 	microuptime.9 \
 	mi_switch.9 \
 	mod_cc.9 \
 	module.9 \
 	MODULE_DEPEND.9 \
 	MODULE_PNP_INFO.9 \
 	MODULE_VERSION.9 \
 	mtx_pool.9 \
 	mutex.9 \
 	namei.9 \
 	netisr.9 \
 	nv.9 \
 	nvmem.9 \
 	OF_child.9 \
 	OF_device_from_xref.9 \
 	OF_finddevice.9 \
 	OF_getprop.9 \
 	OF_node_from_xref.9 \
 	OF_package_to_path.9 \
 	ofw_bus_is_compatible.9 \
 	ofw_bus_status_okay.9 \
 	ofw_graph.9 \
 	osd.9 \
 	owll.9 \
 	own.9 \
 	panic.9 \
 	p_candebug.9 \
 	p_cansee.9 \
 	pci.9 \
 	PCI_IOV_ADD_VF.9 \
 	PCI_IOV_INIT.9 \
 	pci_iov_schema.9 \
 	PCI_IOV_UNINIT.9 \
 	pfil.9 \
 	pfind.9 \
 	pget.9 \
 	pgfind.9 \
 	PHOLD.9 \
 	physio.9 \
 	pmap.9 \
 	pmap_activate.9 \
 	pmap_clear_modify.9 \
 	pmap_copy.9 \
 	pmap_enter.9 \
 	pmap_extract.9 \
 	pmap_kextract.9 \
 	pmap_growkernel.9 \
 	pmap_init.9 \
 	pmap_is_modified.9 \
 	pmap_is_prefaultable.9 \
 	pmap_map.9 \
 	pmap_mincore.9 \
 	pmap_object_init_pt.9 \
 	pmap_page_exists_quick.9 \
 	pmap_page_init.9 \
 	pmap_pinit.9 \
 	pmap_protect.9 \
 	pmap_qenter.9 \
 	pmap_quick_enter_page.9 \
 	pmap_release.9 \
 	pmap_remove.9 \
 	pmap_resident_count.9 \
 	pmap_unwire.9 \
 	pmap_zero_page.9 \
 	printf.9 \
 	prison_check.9 \
 	priv.9 \
 	prng.9 \
 	proc_rwmem.9 \
 	pseudofs.9 \
 	psignal.9 \
 	pwmbus.9 \
 	random.9 \
 	random_harvest.9 \
 	ratecheck.9 \
 	redzone.9 \
 	refcount.9 \
 	regulator.9 \
 	resettodr.9 \
 	resource_int_value.9 \
 	rijndael.9 \
 	rman.9 \
 	rmlock.9 \
 	rtentry.9 \
 	runqueue.9 \
 	rwlock.9 \
 	sbuf.9 \
 	scheduler.9 \
 	SDT.9 \
 	securelevel_gt.9 \
 	selrecord.9 \
 	sema.9 \
 	seqc.9 \
 	sf_buf.9 \
 	sglist.9 \
 	shm_map.9 \
 	signal.9 \
 	sleep.9 \
 	sleepqueue.9 \
 	smr.9 \
 	socket.9 \
 	stack.9 \
 	store.9 \
 	style.9 \
 	style.lua.9 \
 	${_superio.9} \
 	swi.9 \
 	sx.9 \
 	syscall_helper_register.9 \
 	SYSCALL_MODULE.9 \
 	sysctl.9 \
 	sysctl_add_oid.9 \
 	sysctl_ctx_init.9 \
 	SYSINIT.9 \
 	taskqueue.9 \
 	tcp_functions.9 \
 	thread_exit.9 \
 	time.9 \
 	tvtohz.9 \
 	ucred.9 \
 	uidinfo.9 \
 	uio.9 \
 	unr.9 \
 	vaccess.9 \
 	vaccess_acl_nfs4.9 \
 	vaccess_acl_posix1e.9 \
 	vflush.9 \
 	VFS.9 \
 	vfs_busy.9 \
 	VFS_CHECKEXP.9 \
 	vfsconf.9 \
 	VFS_FHTOVP.9 \
 	vfs_getnewfsid.9 \
 	vfs_getopt.9 \
 	vfs_getvfs.9 \
 	VFS_MOUNT.9 \
 	vfs_mountedfrom.9 \
 	VFS_QUOTACTL.9 \
 	VFS_ROOT.9 \
 	vfs_rootmountalloc.9 \
 	VFS_SET.9 \
 	VFS_STATFS.9 \
 	vfs_suser.9 \
 	VFS_SYNC.9 \
 	vfs_timestamp.9 \
 	vfs_unbusy.9 \
 	VFS_UNMOUNT.9 \
 	vfs_unmountall.9 \
 	VFS_VGET.9 \
 	vget.9 \
 	vgone.9 \
 	vhold.9 \
 	vinvalbuf.9 \
 	vm_fault_prefault.9 \
 	vm_map.9 \
 	vm_map_check_protection.9 \
 	vm_map_delete.9 \
 	vm_map_entry_resize_free.9 \
 	vm_map_find.9 \
 	vm_map_findspace.9 \
 	vm_map_inherit.9 \
 	vm_map_init.9 \
 	vm_map_insert.9 \
 	vm_map_lock.9 \
 	vm_map_lookup.9 \
 	vm_map_madvise.9 \
 	vm_map_max.9 \
 	vm_map_protect.9 \
 	vm_map_remove.9 \
 	vm_map_simplify_entry.9 \
 	vm_map_stack.9 \
 	vm_map_submap.9 \
 	vm_map_sync.9 \
 	vm_map_wire.9 \
 	vm_page_alloc.9 \
 	vm_page_bits.9 \
 	vm_page_busy.9 \
 	vm_page_deactivate.9 \
 	vm_page_dontneed.9 \
 	vm_page_aflag.9 \
 	vm_page_free.9 \
 	vm_page_grab.9 \
 	vm_page_insert.9 \
 	vm_page_lookup.9 \
 	vm_page_rename.9 \
 	vm_page_wire.9 \
 	vm_set_page_size.9 \
 	vmem.9 \
 	vn_deallocate.9 \
 	vn_fullpath.9 \
 	vn_isdisk.9 \
 	vnet.9 \
 	vnode.9 \
 	vnode_pager_setsize.9 \
 	vnode_pager_purge_range.9 \
 	VOP_ACCESS.9 \
 	VOP_ACLCHECK.9 \
 	VOP_ADVISE.9 \
 	VOP_ADVLOCK.9 \
 	VOP_ALLOCATE.9 \
 	VOP_ATTRIB.9 \
 	VOP_BMAP.9 \
 	VOP_BWRITE.9 \
 	VOP_COPY_FILE_RANGE.9 \
 	VOP_CREATE.9 \
 	VOP_DEALLOCATE.9 \
 	VOP_FSYNC.9 \
 	VOP_GETACL.9 \
 	VOP_GETEXTATTR.9 \
 	VOP_GETPAGES.9 \
 	VOP_INACTIVE.9 \
 	VOP_IOCTL.9 \
 	VOP_LINK.9 \
 	VOP_LISTEXTATTR.9 \
 	VOP_LOCK.9 \
 	VOP_LOOKUP.9 \
 	VOP_OPENCLOSE.9 \
 	VOP_PATHCONF.9 \
 	VOP_PRINT.9 \
 	VOP_RDWR.9 \
 	VOP_READ_PGCACHE.9 \
 	VOP_READDIR.9 \
 	VOP_READLINK.9 \
 	VOP_REALLOCBLKS.9 \
 	VOP_REMOVE.9 \
 	VOP_RENAME.9 \
 	VOP_REVOKE.9 \
 	VOP_SETACL.9 \
 	VOP_SETEXTATTR.9 \
 	VOP_STRATEGY.9 \
 	VOP_VPTOCNP.9 \
 	VOP_VPTOFH.9 \
 	vref.9 \
 	vrefcnt.9 \
 	vrele.9 \
 	vslock.9 \
 	watchdog.9 \
 	zero_region.9 \
 	zone.9
 
 MLINKS=	accept_filter.9 accept_filt_add.9 \
 	accept_filter.9 accept_filt_del.9 \
 	accept_filter.9 accept_filt_generic_mod_event.9 \
 	accept_filter.9 accept_filt_get.9
 MLINKS+=alq.9 ALQ.9 \
 	alq.9 alq_close.9 \
 	alq.9 alq_flush.9 \
 	alq.9 alq_get.9 \
 	alq.9 alq_getn.9 \
 	alq.9 alq_open.9 \
 	alq.9 alq_open_flags.9 \
 	alq.9 alq_post.9 \
 	alq.9 alq_post_flags.9 \
 	alq.9 alq_write.9 \
 	alq.9 alq_writen.9
 MLINKS+=altq.9 ALTQ.9
 MLINKS+=atomic.9 atomic_add.9 \
 	atomic.9 atomic_clear.9 \
 	atomic.9 atomic_cmpset.9 \
 	atomic.9 atomic_fcmpset.9 \
 	atomic.9 atomic_fetchadd.9 \
 	atomic.9 atomic_load.9 \
 	atomic.9 atomic_readandclear.9 \
 	atomic.9 atomic_set.9 \
 	atomic.9 atomic_store.9 \
 	atomic.9 atomic_subtract.9 \
 	atomic.9 atomic_swap.9 \
 	atomic.9 atomic_testandclear.9 \
 	atomic.9 atomic_testandset.9 \
 	atomic.9 atomic_thread_fence.9
 MLINKS+=bhnd.9 BHND_MATCH_BOARD_TYPE.9 \
 	bhnd.9 BHND_MATCH_BOARD_VENDOR.9 \
 	bhnd.9 BHND_MATCH_CHIP_ID.9 \
 	bhnd.9 BHND_MATCH_CHIP_PKG.9 \
 	bhnd.9 BHND_MATCH_CHIP_REV.9 \
 	bhnd.9 BHND_MATCH_CORE_ID.9 \
 	bhnd.9 BHND_MATCH_CORE_VENDOR.9 \
 	bhnd.9 bhnd_activate_resource.9 \
 	bhnd.9 bhnd_alloc_pmu.9 \
 	bhnd.9 bhnd_alloc_resource.9 \
 	bhnd.9 bhnd_alloc_resource_any.9 \
 	bhnd.9 bhnd_alloc_resources.9 \
 	bhnd.9 bhnd_board_matches.9 \
 	bhnd.9 bhnd_bus_match_child.9 \
 	bhnd.9 bhnd_bus_read_1.9 \
 	bhnd.9 bhnd_bus_read_2.9 \
 	bhnd.9 bhnd_bus_read_4.9 \
 	bhnd.9 bhnd_bus_read_stream_1.9 \
 	bhnd.9 bhnd_bus_read_stream_2.9 \
 	bhnd.9 bhnd_bus_read_stream_4.9 \
 	bhnd.9 bhnd_bus_write_1.9 \
 	bhnd.9 bhnd_bus_write_2.9 \
 	bhnd.9 bhnd_bus_write_4.9 \
 	bhnd.9 bhnd_bus_write_stream_1.9 \
 	bhnd.9 bhnd_bus_write_stream_2.9 \
 	bhnd.9 bhnd_bus_write_stream_4.9 \
 	bhnd.9 bhnd_chip_matches.9 \
 	bhnd.9 bhnd_core_class.9 \
 	bhnd.9 bhnd_core_get_match_desc.9 \
 	bhnd.9 bhnd_core_matches.9 \
 	bhnd.9 bhnd_core_name.9 \
 	bhnd.9 bhnd_cores_equal.9 \
 	bhnd.9 bhnd_deactivate_resource.9 \
 	bhnd.9 bhnd_decode_port_rid.9 \
 	bhnd.9 bhnd_deregister_provider.9 \
 	bhnd.9 bhnd_device_lookup.9 \
 	bhnd.9 bhnd_device_matches.9 \
 	bhnd.9 bhnd_device_quirks.9 \
 	bhnd.9 bhnd_driver_get_erom_class.9 \
 	bhnd.9 bhnd_enable_clocks.9 \
 	bhnd.9 bhnd_find_core_class.9 \
 	bhnd.9 bhnd_find_core_name.9 \
 	bhnd.9 bhnd_format_chip_id.9 \
 	bhnd.9 bhnd_get_attach_type.9 \
 	bhnd.9 bhnd_get_chipid.9 \
 	bhnd.9 bhnd_get_class.9 \
 	bhnd.9 bhnd_get_clock_freq.9 \
 	bhnd.9 bhnd_get_clock_latency.9 \
 	bhnd.9 bhnd_get_core_index.9 \
 	bhnd.9 bhnd_get_core_info.9 \
 	bhnd.9 bhnd_get_core_unit.9 \
 	bhnd.9 bhnd_get_device.9 \
 	bhnd.9 bhnd_get_device_name.9 \
 	bhnd.9 bhnd_get_dma_translation.9 \
 	bhnd.9 bhnd_get_hwrev.9 \
 	bhnd.9 bhnd_get_intr_count.9 \
 	bhnd.9 bhnd_get_intr_ivec.9 \
 	bhnd.9 bhnd_get_port_count.9 \
 	bhnd.9 bhnd_get_port_rid.9 \
 	bhnd.9 bhnd_get_region_addr.9 \
 	bhnd.9 bhnd_get_region_count.9 \
 	bhnd.9 bhnd_get_vendor.9 \
 	bhnd.9 bhnd_get_vendor_name.9 \
 	bhnd.9 bhnd_hwrev_matches.9 \
 	bhnd.9 bhnd_is_hw_suspended.9 \
 	bhnd.9 bhnd_is_region_valid.9 \
 	bhnd.9 bhnd_map_intr.9 \
 	bhnd.9 bhnd_match_core.9 \
 	bhnd.9 bhnd_nvram_getvar.9 \
 	bhnd.9 bhnd_nvram_getvar_array.9 \
 	bhnd.9 bhnd_nvram_getvar_int.9 \
 	bhnd.9 bhnd_nvram_getvar_int16.9 \
 	bhnd.9 bhnd_nvram_getvar_int32.9 \
 	bhnd.9 bhnd_nvram_getvar_int8.9 \
 	bhnd.9 bhnd_nvram_getvar_str.9 \
 	bhnd.9 bhnd_nvram_getvar_uint.9 \
 	bhnd.9 bhnd_nvram_getvar_uint16.9 \
 	bhnd.9 bhnd_nvram_getvar_uint32.9 \
 	bhnd.9 bhnd_nvram_getvar_uint8.9 \
 	bhnd.9 bhnd_nvram_string_array_next.9 \
 	bhnd.9 bhnd_read_board_info.9 \
 	bhnd.9 bhnd_read_config.9 \
 	bhnd.9 bhnd_read_ioctl.9 \
 	bhnd.9 bhnd_read_iost.9 \
 	bhnd.9 bhnd_register_provider.9 \
 	bhnd.9 bhnd_release_ext_rsrc.9 \
 	bhnd.9 bhnd_release_pmu.9 \
 	bhnd.9 bhnd_release_provider.9 \
 	bhnd.9 bhnd_release_resource.9 \
 	bhnd.9 bhnd_release_resources.9 \
 	bhnd.9 bhnd_request_clock.9 \
 	bhnd.9 bhnd_request_ext_rsrc.9 \
 	bhnd.9 bhnd_reset_hw.9 \
 	bhnd.9 bhnd_retain_provider.9 \
 	bhnd.9 bhnd_set_custom_core_desc.9 \
 	bhnd.9 bhnd_set_default_core_desc.9 \
 	bhnd.9 bhnd_suspend_hw.9 \
 	bhnd.9 bhnd_unmap_intr.9 \
 	bhnd.9 bhnd_vendor_name.9 \
 	bhnd.9 bhnd_write_config.9 \
 	bhnd.9 bhnd_write_ioctl.9
 MLINKS+=bhnd_erom.9 bhnd_erom_alloc.9 \
 	bhnd_erom.9 bhnd_erom_dump.9 \
 	bhnd_erom.9 bhnd_erom_fini_static.9 \
 	bhnd_erom.9 bhnd_erom_free.9 \
 	bhnd_erom.9 bhnd_erom_free_core_table.9 \
 	bhnd_erom.9 bhnd_erom_get_core_table.9 \
 	bhnd_erom.9 bhnd_erom_init_static.9 \
 	bhnd_erom.9 bhnd_erom_io.9 \
 	bhnd_erom.9 bhnd_erom_io_fini.9 \
 	bhnd_erom.9 bhnd_erom_io_map.9 \
 	bhnd_erom.9 bhnd_erom_io_read.9 \
 	bhnd_erom.9 bhnd_erom_iobus_init.9 \
 	bhnd_erom.9 bhnd_erom_iores_new.9 \
 	bhnd_erom.9 bhnd_erom_lookup_core.9 \
 	bhnd_erom.9 bhnd_erom_lookup_core_addr.9 \
 	bhnd_erom.9 bhnd_erom_probe.9 \
 	bhnd_erom.9 bhnd_erom_probe_driver_classes.9
 MLINKS+=bitset.9 BITSET_DEFINE.9 \
 	bitset.9 BITSET_T_INITIALIZER.9 \
 	bitset.9 BITSET_FSET.9 \
 	bitset.9 BIT_CLR.9 \
 	bitset.9 BIT_COPY.9 \
 	bitset.9 BIT_ISSET.9 \
 	bitset.9 BIT_SET.9 \
 	bitset.9 BIT_ZERO.9 \
 	bitset.9 BIT_FILL.9 \
 	bitset.9 BIT_SETOF.9 \
 	bitset.9 BIT_EMPTY.9 \
 	bitset.9 BIT_ISFULLSET.9 \
 	bitset.9 BIT_FFS.9 \
 	bitset.9 BIT_FFS_AT.9 \
 	bitset.9 BIT_FLS.9 \
 	bitset.9 BIT_FOREACH_ISSET.9 \
 	bitset.9 BIT_FOREACH_ISCLR.9 \
 	bitset.9 BIT_COUNT.9 \
 	bitset.9 BIT_SUBSET.9 \
 	bitset.9 BIT_OVERLAP.9 \
 	bitset.9 BIT_CMP.9 \
 	bitset.9 BIT_OR.9 \
 	bitset.9 BIT_OR2.9 \
 	bitset.9 BIT_ORNOT.9 \
 	bitset.9 BIT_ORNOT2.9 \
 	bitset.9 BIT_AND.9 \
 	bitset.9 BIT_AND2.9 \
 	bitset.9 BIT_ANDNOT.9 \
 	bitset.9 BIT_ANDNOT2.9 \
 	bitset.9 BIT_XOR.9 \
 	bitset.9 BIT_XOR2.9 \
 	bitset.9 BIT_CLR_ATOMIC.9 \
 	bitset.9 BIT_SET_ATOMIC.9 \
 	bitset.9 BIT_SET_ATOMIC_ACQ.9 \
 	bitset.9 BIT_TEST_SET_ATOMIC.9 \
 	bitset.9 BIT_TEST_CLR_ATOMIC.9 \
 	bitset.9 BIT_AND_ATOMIC.9 \
 	bitset.9 BIT_OR_ATOMIC.9 \
 	bitset.9 BIT_COPY_STORE_REL.9
 MLINKS+=bpf.9 bpfattach.9 \
 	bpf.9 bpfattach2.9 \
 	bpf.9 bpfdetach.9 \
 	bpf.9 bpf_filter.9 \
 	bpf.9 bpf_mtap.9 \
 	bpf.9 bpf_mtap2.9 \
 	bpf.9 bpf_tap.9 \
 	bpf.9 bpf_validate.9
 MLINKS+=buf.9 bp.9
 MLINKS+=buf_ring.9 buf_ring_alloc.9 \
 	buf_ring.9 buf_ring_free.9 \
 	buf_ring.9 buf_ring_enqueue.9 \
 	buf_ring.9 buf_ring_enqueue_bytes.9 \
 	buf_ring.9 buf_ring_dequeue_mc.9 \
 	buf_ring.9 buf_ring_dequeue_sc.9 \
 	buf_ring.9 buf_ring_count.9 \
 	buf_ring.9 buf_ring_empty.9 \
 	buf_ring.9 buf_ring_full.9 \
 	buf_ring.9 buf_ring_peek.9
 MLINKS+=bus_activate_resource.9 bus_deactivate_resource.9
 MLINKS+=bus_alloc_resource.9 bus_alloc_resource_any.9
 MLINKS+=BUS_BIND_INTR.9 bus_bind_intr.9
 MLINKS+=BUS_DESCRIBE_INTR.9 bus_describe_intr.9
 MLINKS+=bus_dma.9 busdma.9 \
 	bus_dma.9 bus_dmamap_create.9 \
 	bus_dma.9 bus_dmamap_destroy.9 \
 	bus_dma.9 bus_dmamap_load.9 \
 	bus_dma.9 bus_dmamap_load_bio.9 \
 	bus_dma.9 bus_dmamap_load_ccb.9 \
 	bus_dma.9 bus_dmamap_load_crp.9 \
 	bus_dma.9 bus_dmamap_load_crp_buffer.9 \
 	bus_dma.9 bus_dmamap_load_mbuf.9 \
 	bus_dma.9 bus_dmamap_load_mbuf_sg.9 \
 	bus_dma.9 bus_dmamap_load_uio.9 \
 	bus_dma.9 bus_dmamap_sync.9 \
 	bus_dma.9 bus_dmamap_unload.9 \
 	bus_dma.9 bus_dmamem_alloc.9 \
 	bus_dma.9 bus_dmamem_free.9 \
 	bus_dma.9 bus_dma_tag_create.9 \
 	bus_dma.9 bus_dma_tag_destroy.9
 MLINKS+=bus_generic_read_ivar.9 bus_generic_write_ivar.9
 MLINKS+=BUS_GET_CPUS.9 bus_get_cpus.9
 MLINKS+=bus_map_resource.9 bus_unmap_resource.9 \
 	bus_map_resource.9 resource_init_map_request.9
 MLINKS+=BUS_READ_IVAR.9 BUS_WRITE_IVAR.9
 MLINKS+=BUS_SETUP_INTR.9 bus_setup_intr.9 \
 	BUS_SETUP_INTR.9 BUS_TEARDOWN_INTR.9 \
 	BUS_SETUP_INTR.9 bus_teardown_intr.9
 MLINKS+=bus_space.9 bus_space_alloc.9 \
 	bus_space.9 bus_space_barrier.9 \
 	bus_space.9 bus_space_copy_region_1.9 \
 	bus_space.9 bus_space_copy_region_2.9 \
 	bus_space.9 bus_space_copy_region_4.9 \
 	bus_space.9 bus_space_copy_region_8.9 \
 	bus_space.9 bus_space_copy_region_stream_1.9 \
 	bus_space.9 bus_space_copy_region_stream_2.9 \
 	bus_space.9 bus_space_copy_region_stream_4.9 \
 	bus_space.9 bus_space_copy_region_stream_8.9 \
 	bus_space.9 bus_space_free.9 \
 	bus_space.9 bus_space_map.9 \
 	bus_space.9 bus_space_peek_1.9 \
 	bus_space.9 bus_space_peek_2.9 \
 	bus_space.9 bus_space_peek_4.9 \
 	bus_space.9 bus_space_peek_8.9 \
 	bus_space.9 bus_space_poke_1.9 \
 	bus_space.9 bus_space_poke_2.9 \
 	bus_space.9 bus_space_poke_4.9 \
 	bus_space.9 bus_space_poke_8.9 \
 	bus_space.9 bus_space_read_1.9 \
 	bus_space.9 bus_space_read_2.9 \
 	bus_space.9 bus_space_read_4.9 \
 	bus_space.9 bus_space_read_8.9 \
 	bus_space.9 bus_space_read_multi_1.9 \
 	bus_space.9 bus_space_read_multi_2.9 \
 	bus_space.9 bus_space_read_multi_4.9 \
 	bus_space.9 bus_space_read_multi_8.9 \
 	bus_space.9 bus_space_read_multi_stream_1.9 \
 	bus_space.9 bus_space_read_multi_stream_2.9 \
 	bus_space.9 bus_space_read_multi_stream_4.9 \
 	bus_space.9 bus_space_read_multi_stream_8.9 \
 	bus_space.9 bus_space_read_region_1.9 \
 	bus_space.9 bus_space_read_region_2.9 \
 	bus_space.9 bus_space_read_region_4.9 \
 	bus_space.9 bus_space_read_region_8.9 \
 	bus_space.9 bus_space_read_region_stream_1.9 \
 	bus_space.9 bus_space_read_region_stream_2.9 \
 	bus_space.9 bus_space_read_region_stream_4.9 \
 	bus_space.9 bus_space_read_region_stream_8.9 \
 	bus_space.9 bus_space_read_stream_1.9 \
 	bus_space.9 bus_space_read_stream_2.9 \
 	bus_space.9 bus_space_read_stream_4.9 \
 	bus_space.9 bus_space_read_stream_8.9 \
 	bus_space.9 bus_space_set_multi_1.9 \
 	bus_space.9 bus_space_set_multi_2.9 \
 	bus_space.9 bus_space_set_multi_4.9 \
 	bus_space.9 bus_space_set_multi_8.9 \
 	bus_space.9 bus_space_set_multi_stream_1.9 \
 	bus_space.9 bus_space_set_multi_stream_2.9 \
 	bus_space.9 bus_space_set_multi_stream_4.9 \
 	bus_space.9 bus_space_set_multi_stream_8.9 \
 	bus_space.9 bus_space_set_region_1.9 \
 	bus_space.9 bus_space_set_region_2.9 \
 	bus_space.9 bus_space_set_region_4.9 \
 	bus_space.9 bus_space_set_region_8.9 \
 	bus_space.9 bus_space_set_region_stream_1.9 \
 	bus_space.9 bus_space_set_region_stream_2.9 \
 	bus_space.9 bus_space_set_region_stream_4.9 \
 	bus_space.9 bus_space_set_region_stream_8.9 \
 	bus_space.9 bus_space_subregion.9 \
 	bus_space.9 bus_space_unmap.9 \
 	bus_space.9 bus_space_write_1.9 \
 	bus_space.9 bus_space_write_2.9 \
 	bus_space.9 bus_space_write_4.9 \
 	bus_space.9 bus_space_write_8.9 \
 	bus_space.9 bus_space_write_multi_1.9 \
 	bus_space.9 bus_space_write_multi_2.9 \
 	bus_space.9 bus_space_write_multi_4.9 \
 	bus_space.9 bus_space_write_multi_8.9 \
 	bus_space.9 bus_space_write_multi_stream_1.9 \
 	bus_space.9 bus_space_write_multi_stream_2.9 \
 	bus_space.9 bus_space_write_multi_stream_4.9 \
 	bus_space.9 bus_space_write_multi_stream_8.9 \
 	bus_space.9 bus_space_write_region_1.9 \
 	bus_space.9 bus_space_write_region_2.9 \
 	bus_space.9 bus_space_write_region_4.9 \
 	bus_space.9 bus_space_write_region_8.9 \
 	bus_space.9 bus_space_write_region_stream_1.9 \
 	bus_space.9 bus_space_write_region_stream_2.9 \
 	bus_space.9 bus_space_write_region_stream_4.9 \
 	bus_space.9 bus_space_write_region_stream_8.9 \
 	bus_space.9 bus_space_write_stream_1.9 \
 	bus_space.9 bus_space_write_stream_2.9 \
 	bus_space.9 bus_space_write_stream_4.9 \
 	bus_space.9 bus_space_write_stream_8.9
 MLINKS+=byteorder.9 be16dec.9 \
 	byteorder.9 be16enc.9 \
 	byteorder.9 be16toh.9 \
 	byteorder.9 be32dec.9 \
 	byteorder.9 be32enc.9 \
 	byteorder.9 be32toh.9 \
 	byteorder.9 be64dec.9 \
 	byteorder.9 be64enc.9 \
 	byteorder.9 be64toh.9 \
 	byteorder.9 bswap16.9 \
 	byteorder.9 bswap32.9 \
 	byteorder.9 bswap64.9 \
 	byteorder.9 htobe16.9 \
 	byteorder.9 htobe32.9 \
 	byteorder.9 htobe64.9 \
 	byteorder.9 htole16.9 \
 	byteorder.9 htole32.9 \
 	byteorder.9 htole64.9 \
 	byteorder.9 le16dec.9 \
 	byteorder.9 le16enc.9 \
 	byteorder.9 le16toh.9 \
 	byteorder.9 le32dec.9 \
 	byteorder.9 le32enc.9 \
 	byteorder.9 le32toh.9 \
 	byteorder.9 le64dec.9 \
 	byteorder.9 le64enc.9 \
 	byteorder.9 le64toh.9
 MLINKS+=callout.9 callout_active.9 \
 	callout.9 callout_deactivate.9 \
 	callout.9 callout_drain.9 \
 	callout.9 callout_init.9 \
 	callout.9 callout_init_mtx.9 \
 	callout.9 callout_init_rm.9 \
 	callout.9 callout_init_rw.9 \
 	callout.9 callout_pending.9 \
 	callout.9 callout_reset.9 \
 	callout.9 callout_reset_curcpu.9 \
 	callout.9 callout_reset_on.9 \
 	callout.9 callout_reset_sbt.9 \
 	callout.9 callout_reset_sbt_curcpu.9 \
 	callout.9 callout_reset_sbt_on.9 \
 	callout.9 callout_schedule.9 \
 	callout.9 callout_schedule_curcpu.9 \
 	callout.9 callout_schedule_on.9 \
 	callout.9 callout_schedule_sbt.9 \
 	callout.9 callout_schedule_sbt_curcpu.9 \
 	callout.9 callout_schedule_sbt_on.9 \
 	callout.9 callout_stop.9 \
 	callout.9 callout_when.9
 MLINKS+=cnv.9 cnvlist.9 \
 	cnv.9 cnvlist_free_binary.9 \
 	cnv.9 cnvlist_free_bool.9 \
 	cnv.9 cnvlist_free_bool_array.9 \
 	cnv.9 cnvlist_free_descriptor.9 \
 	cnv.9 cnvlist_free_descriptor_array.9 \
 	cnv.9 cnvlist_free_null.9 \
 	cnv.9 cnvlist_free_number.9 \
 	cnv.9 cnvlist_free_number_array.9 \
 	cnv.9 cnvlist_free_nvlist.9 \
 	cnv.9 cnvlist_free_nvlist_array.9 \
 	cnv.9 cnvlist_free_string.9 \
 	cnv.9 cnvlist_free_string_array.9 \
 	cnv.9 cnvlist_get_binary.9 \
 	cnv.9 cnvlist_get_bool.9 \
 	cnv.9 cnvlist_get_bool_array.9 \
 	cnv.9 cnvlist_get_descriptor.9 \
 	cnv.9 cnvlist_get_descriptor_array.9 \
 	cnv.9 cnvlist_get_number.9 \
 	cnv.9 cnvlist_get_number_array.9 \
 	cnv.9 cnvlist_get_nvlist.9 \
 	cnv.9 cnvlist_get_nvlist_array.9 \
 	cnv.9 cnvlist_get_string.9 \
 	cnv.9 cnvlist_get_string_array.9 \
 	cnv.9 cnvlist_take_binary.9 \
 	cnv.9 cnvlist_take_bool.9 \
 	cnv.9 cnvlist_take_bool_array.9 \
 	cnv.9 cnvlist_take_descriptor.9 \
 	cnv.9 cnvlist_take_descriptor_array.9 \
 	cnv.9 cnvlist_take_number.9 \
 	cnv.9 cnvlist_take_number_array.9 \
 	cnv.9 cnvlist_take_nvlist.9 \
 	cnv.9 cnvlist_take_nvlist_array.9 \
 	cnv.9 cnvlist_take_string.9 \
 	cnv.9 cnvlist_take_string_array.9
 MLINKS+=condvar.9 cv_broadcast.9 \
 	condvar.9 cv_broadcastpri.9 \
 	condvar.9 cv_destroy.9 \
 	condvar.9 cv_init.9 \
 	condvar.9 cv_signal.9 \
 	condvar.9 cv_timedwait.9 \
 	condvar.9 cv_timedwait_sig.9 \
 	condvar.9 cv_timedwait_sig_sbt.9 \
 	condvar.9 cv_wait.9 \
 	condvar.9 cv_wait_sig.9 \
 	condvar.9 cv_wait_unlock.9 \
 	condvar.9 cv_wmesg.9
 MLINKS+=config_intrhook.9 config_intrhook_disestablish.9 \
 	config_intrhook.9 config_intrhook_drain.9 \
 	config_intrhook.9 config_intrhook_establish.9 \
 	config_intrhook.9 config_intrhook_oneshot.9
-MLINKS+=contigmalloc.9 contigmalloc_domainset.9 \
-	contigmalloc.9 contigfree.9
+MLINKS+=contigmalloc.9 contigmalloc_domainset.9
 MLINKS+=casuword.9 casueword.9 \
 	casuword.9 casueword32.9 \
 	casuword.9 casuword32.9
 MLINKS+=copy.9 copyin.9 \
 	copy.9 copyin_nofault.9 \
 	copy.9 copyinstr.9 \
 	copy.9 copyout.9 \
 	copy.9 copyout_nofault.9 \
 	copy.9 copystr.9
 MLINKS+=counter.9 counter_u64_alloc.9 \
 	counter.9 counter_u64_free.9 \
 	counter.9 counter_u64_add.9 \
 	counter.9 counter_enter.9 \
 	counter.9 counter_exit.9 \
 	counter.9 counter_ratecheck.9 \
 	counter.9 counter_u64_add_protected.9 \
 	counter.9 counter_u64_fetch.9 \
 	counter.9 counter_u64_zero.9 \
 	counter.9 SYSCTL_COUNTER_U64.9 \
 	counter.9 SYSCTL_ADD_COUNTER_U64.9 \
 	counter.9 SYSCTL_COUNTER_U64_ARRAY.9 \
 	counter.9 SYSCTL_ADD_COUNTER_U64_ARRAY.9
 MLINKS+=cpuset.9 CPUSET_T_INITIALIZER.9 \
 	cpuset.9 CPUSET_FSET.9 \
 	cpuset.9 CPU_CLR.9 \
 	cpuset.9 CPU_COPY.9 \
 	cpuset.9 CPU_ISSET.9 \
 	cpuset.9 CPU_SET.9 \
 	cpuset.9 CPU_ZERO.9 \
 	cpuset.9 CPU_FILL.9 \
 	cpuset.9 CPU_SETOF.9 \
 	cpuset.9 CPU_EMPTY.9 \
 	cpuset.9 CPU_ISFULLSET.9 \
 	cpuset.9 CPU_FFS.9 \
 	cpuset.9 CPU_COUNT.9 \
 	cpuset.9 CPU_SUBSET.9 \
 	cpuset.9 CPU_OVERLAP.9 \
 	cpuset.9 CPU_CMP.9 \
 	cpuset.9 CPU_OR.9 \
 	cpuset.9 CPU_ORNOT.9 \
 	cpuset.9 CPU_AND.9 \
 	cpuset.9 CPU_ANDNOT.9 \
 	cpuset.9 CPU_CLR_ATOMIC.9 \
 	cpuset.9 CPU_SET_ATOMIC.9 \
 	cpuset.9 CPU_SET_ATOMIC_ACQ.9 \
 	cpuset.9 CPU_AND_ATOMIC.9 \
 	cpuset.9 CPU_OR_ATOMIC.9 \
 	cpuset.9 CPU_COPY_STORE_REL.9
 MLINKS+=critical_enter.9 critical.9 \
 	critical_enter.9 critical_exit.9 \
 	critical_enter.9 CRITICAL_ASSERT.9
 MLINKS+=crypto_buffer.9 crypto_apply.9 \
 	crypto_buffer.9 crypto_apply_buf.9 \
 	crypto_buffer.9 crypto_buffer_contiguous_segment.9 \
 	crypto_buffer.9 crypto_buffer_len.9 \
 	crypto_buffer.9 crypto_contiguous_segment.9 \
 	crypto_buffer.9 crypto_cursor_init.9 \
 	crypto_buffer.9 crypto_cursor_advance.9 \
 	crypto_buffer.9 crypto_cursor_copyback.9 \
 	crypto_buffer.9 crypto_cursor_copydata.9 \
 	crypto_buffer.9 crypto_cursor_copydata_noadv.9 \
 	crypto_buffer.9 crypto_cursor_segment.9 \
 	crypto_buffer.9 CRYPTO_HAS_OUTPUT_BUFFER.9
 MLINKS+=crypto_driver.9 crypto_copyback.9 \
 	crypto_driver.9 crypto_copydata.9 \
 	crypto_driver.9 crypto_done.9 \
 	crypto_driver.9 crypto_get_driverid.9 \
 	crypto_driver.9 crypto_get_driver_session.9 \
 	crypto_driver.9 crypto_read_iv.9 \
 	crypto_driver.9 crypto_unblock.9 \
 	crypto_driver.9 crypto_unregister_all.9 \
 	crypto_driver.9 CRYPTODEV_FREESESSION.9 \
 	crypto_driver.9 CRYPTODEV_NEWSESSION.9 \
 	crypto_driver.9 CRYPTODEV_PROBESESSION.9 \
 	crypto_driver.9 CRYPTODEV_PROCESS.9 \
 	crypto_driver.9 hmac_init_ipad.9 \
 	crypto_driver.9 hmac_init_opad.9
 MLINKS+=crypto_request.9 crypto_clonereq.9 \
 	crypto_request.9 crypto_destroyreq.9 \
 	crypto_request.9 crypto_dispatch.9 \
 	crypto_request.9 crypto_freereq.9 \
 	crypto_request.9 crypto_getreq.9 \
 	crypto_request.9 crypto_initreq.9 \
 	crypto_request.9 crypto_use_buf.9 \
 	crypto_request.9 crypto_use_mbuf.9 \
 	crypto_request.9 crypto_use_output_buf.9 \
 	crypto_request.9 crypto_use_output_mbuf.9 \
 	crypto_request.9 crypto_use_output_uio.9 \
 	crypto_request.9 crypto_use_uio.9
 MLINKS+=crypto_session.9 crypto_auth_hash.9 \
 	crypto_session.9 crypto_cipher.9 \
 	crypto_session.9 crypto_get_params.9 \
 	crypto_session.9 crypto_newsession.9 \
 	crypto_session.9 crypto_freesession.9
 MLINKS+=DB_COMMAND.9 DB_ALIAS.9 \
 	DB_COMMAND.9 DB_ALIAS_FLAGS.9 \
 	DB_COMMAND.9 DB_COMMAND_FLAGS.9 \
 	DB_COMMAND.9 DB_SHOW_ALIAS.9 \
 	DB_COMMAND.9 DB_SHOW_ALIAS_FLAGS.9 \
 	DB_COMMAND.9 DB_SHOW_ALL_ALIAS.9 \
 	DB_COMMAND.9 DB_SHOW_ALL_COMMAND.9 \
 	DB_COMMAND.9 DB_SHOW_COMMAND.9 \
 	DB_COMMAND.9 DB_SHOW_COMMAND_FLAGS.9 \
 	DB_COMMAND.9 DB_DECLARE_TABLE.9 \
 	DB_COMMAND.9 DB_DEFINE_TABLE.9 \
 	DB_COMMAND.9 DB_TABLE_COMMAND.9 \
 	DB_COMMAND.9 DB_TABLE_COMMAND_FLAGS.9 \
 	DB_COMMAND.9 DB_TABLE_ALIAS.9 \
 	DB_COMMAND.9 DB_TABLE_ALIAS_FLAGS.9
 MLINKS+=DECLARE_MODULE.9 DECLARE_MODULE_TIED.9
 MLINKS+=dev_clone.9 drain_dev_clone_events.9
 MLINKS+=dev_refthread.9 devvn_refthread.9 \
 	dev_refthread.9 dev_relthread.9
 MLINKS+=devfs_set_cdevpriv.9 devfs_clear_cdevpriv.9 \
 	devfs_set_cdevpriv.9 devfs_get_cdevpriv.9 \
 	devfs_set_cdevpriv.9 devfs_foreach_cdevpriv.9
 MLINKS+=device_add_child.9 device_add_child_ordered.9
 MLINKS+=device_enable.9 device_disable.9 \
 	device_enable.9 device_is_enabled.9
 MLINKS+=device_get_ivars.9 device_set_ivars.9
 MLINKS+=device_get_name.9 device_get_nameunit.9
 MLINKS+=device_get_state.9 device_busy.9 \
 	device_get_state.9 device_is_alive.9 \
 	device_get_state.9 device_is_attached.9 \
 	device_get_state.9 device_unbusy.9
 MLINKS+=device_get_sysctl.9 device_get_sysctl_ctx.9 \
 	device_get_sysctl.9 device_get_sysctl_tree.9
 MLINKS+=device_quiet.9 device_is_quiet.9 \
 	device_quiet.9 device_verbose.9
 MLINKS+=device_set_desc.9 device_get_desc.9 \
 	device_set_desc.9 device_set_descf.9 \
 	device_set_desc.9 device_set_desc_copy.9
 MLINKS+=device_set_flags.9 device_get_flags.9
 MLINKS+=devstat.9 devicestat.9 \
 	devstat.9 devstat_new_entry.9 \
 	devstat.9 devstat_end_transaction.9 \
 	devstat.9 devstat_end_transaction_bio.9 \
 	devstat.9 devstat_remove_entry.9 \
 	devstat.9 devstat_start_transaction.9 \
 	devstat.9 devstat_start_transaction_bio.9
 MLINKS+=disk.9 disk_add_alias.9 \
 	disk.9 disk_alloc.9 \
 	disk.9 disk_create.9 \
 	disk.9 disk_destroy.9 \
 	disk.9 disk_gone.9 \
 	disk.9 disk_resize.9
 MLINKS+=dnv.9 dnvlist.9 \
 	dnv.9 dnvlist_get_binary.9 \
 	dnv.9 dnvlist_get_bool.9 \
 	dnv.9 dnvlist_get_descriptor.9 \
 	dnv.9 dnvlist_get_number.9 \
 	dnv.9 dnvlist_get_nvlist.9 \
 	dnv.9 dnvlist_get_string.9 \
 	dnv.9 dnvlist_take_binary.9 \
 	dnv.9 dnvlist_take_bool.9 \
 	dnv.9 dnvlist_take_descriptor.9 \
 	dnv.9 dnvlist_take_number.9 \
 	dnv.9 dnvlist_take_nvlist.9 \
 	dnv.9 dnvlist_take_string.9
 MLINKS+=domain.9 protosw.9 \
 	domain.9 domain_add.9 \
 	domain.9 protosw_register.9 \
 	domain.9 protosw_unregister.9
 MLINKS+=dpcpu.9 DPCPU_DECLARE.9 \
 	dpcpu.9 DPCPU_DEFINE.9 \
 	dpcpu.9 DPCPU_DEFINE_STATIC.9 \
 	dpcpu.9 DPCPU_GET.9 \
 	dpcpu.9 DPCPU_ID_PTR.9 \
 	dpcpu.9 DPCPU_ID_GET.9 \
 	dpcpu.9 DPCPU_ID_SET.9 \
 	dpcpu.9 DPCPU_PTR.9 \
 	dpcpu.9 DPCPU_SET.9
 MLINKS+=drbr.9 drbr_free.9 \
 	drbr.9 drbr_enqueue.9 \
 	drbr.9 drbr_dequeue.9 \
 	drbr.9 drbr_dequeue_cond.9 \
 	drbr.9 drbr_flush.9 \
 	drbr.9 drbr_empty.9 \
 	drbr.9 drbr_inuse.9 \
 	drbr.9 drbr_stats_update.9
 MLINKS+=DRIVER_MODULE.9 DRIVER_MODULE_ORDERED.9 \
 	DRIVER_MODULE.9 EARLY_DRIVER_MODULE.9 \
 	DRIVER_MODULE.9 EARLY_DRIVER_MODULE_ORDERED.9
 MLINKS+=epoch.9 epoch_context.9 \
 	epoch.9 epoch_alloc.9 \
 	epoch.9 epoch_free.9 \
 	epoch.9 epoch_enter.9 \
 	epoch.9 epoch_exit.9 \
 	epoch.9 epoch_wait.9 \
 	epoch.9 epoch_call.9 \
 	epoch.9 epoch_drain_callbacks.9 \
 	epoch.9 in_epoch.9
 MLINKS+=EVENTHANDLER.9 EVENTHANDLER_DECLARE.9 \
 	EVENTHANDLER.9 EVENTHANDLER_DEFINE.9 \
 	EVENTHANDLER.9 EVENTHANDLER_DEREGISTER.9 \
 	EVENTHANDLER.9 eventhandler_deregister.9 \
 	EVENTHANDLER.9 eventhandler_find_list.9 \
 	EVENTHANDLER.9 EVENTHANDLER_INVOKE.9 \
 	EVENTHANDLER.9 eventhandler_prune_list.9 \
 	EVENTHANDLER.9 EVENTHANDLER_REGISTER.9 \
 	EVENTHANDLER.9 eventhandler_register.9
 MLINKS+=eventtimers.9 et_register.9 \
 	eventtimers.9 et_deregister.9 \
 	eventtimers.9 et_ban.9 \
 	eventtimers.9 et_find.9 \
 	eventtimers.9 et_free.9 \
 	eventtimers.9 et_init.9 \
 	eventtimers.9 ET_LOCK.9 \
 	eventtimers.9 ET_UNLOCK.9 \
 	eventtimers.9 et_start.9 \
 	eventtimers.9 et_stop.9
 MLINKS+=fail.9 KFAIL_POINT_CODE.9 \
 	fail.9 KFAIL_POINT_ERROR.9 \
 	fail.9 KFAIL_POINT_GOTO.9 \
 	fail.9 KFAIL_POINT_RETURN.9 \
 	fail.9 KFAIL_POINT_RETURN_VOID.9
 MLINKS+=fdt_pinctrl.9 fdt_pinctrl_configure.9 \
 	fdt_pinctrl.9 fdt_pinctrl_configure_by_name.9 \
 	fdt_pinctrl.9 fdt_pinctrl_configure_tree.9 \
 	fdt_pinctrl.9 fdt_pinctrl_register.9
 MLINKS+=fetch.9 fubyte.9 \
 	fetch.9 fuword.9 \
 	fetch.9 fuword16.9 \
 	fetch.9 fuword32.9 \
 	fetch.9 fuword64.9 \
 	fetch.9 fueword.9 \
 	fetch.9 fueword32.9 \
 	fetch.9 fueword64.9
 MLINKS+=firmware.9 firmware_get.9 \
 	firmware.9 firmware_put.9 \
 	firmware.9 firmware_register.9 \
 	firmware.9 firmware_unregister.9
 MLINKS+=fpu_kern.9 fpu_kern_alloc_ctx.9 \
 	fpu_kern.9 fpu_kern_free_ctx.9 \
 	fpu_kern.9 fpu_kern_enter.9 \
 	fpu_kern.9 fpu_kern_leave.9 \
 	fpu_kern.9 fpu_kern_thread.9 \
 	fpu_kern.9 is_fpu_kern_thread.9
 MLINKS+=g_attach.9 g_detach.9
 MLINKS+=g_bio.9 bio.9 \
 	g_bio.9 g_alloc_bio.9 \
 	g_bio.9 g_clone_bio.9 \
 	g_bio.9 g_destroy_bio.9 \
 	g_bio.9 g_duplicate_bio.9 \
 	g_bio.9 g_format_bio.9 \
 	g_bio.9 g_new_bio.9 \
 	g_bio.9 g_print_bio.9 \
 	g_bio.9 g_reset_bio.9
 MLINKS+=g_consumer.9 g_destroy_consumer.9 \
 	g_consumer.9 g_new_consumer.9
 MLINKS+=g_data.9 g_read_data.9 \
 	g_data.9 g_write_data.9
 MLINKS+=getenv.9 freeenv.9 \
 	getenv.9 getenv_int.9 \
 	getenv.9 getenv_long.9 \
 	getenv.9 getenv_string.9 \
 	getenv.9 getenv_quad.9 \
 	getenv.9 getenv_uint.9 \
 	getenv.9 getenv_ulong.9 \
 	getenv.9 getenv_bool.9 \
 	getenv.9 getenv_is_true.9 \
 	getenv.9 getenv_is_false.9 \
 	getenv.9 kern_getenv.9 \
 	getenv.9 kern_setenv.9 \
 	getenv.9 kern_unsetenv.9 \
 	getenv.9 setenv.9 \
 	getenv.9 testenv.9 \
 	getenv.9 unsetenv.9
 MLINKS+=g_event.9 g_cancel_event.9 \
 	g_event.9 g_post_event.9 \
 	g_event.9 g_waitfor_event.9
 MLINKS+=g_geom.9 g_destroy_geom.9 \
 	g_geom.9 g_new_geomf.9
 MLINKS+=g_provider.9 g_destroy_provider.9 \
 	g_provider.9 g_error_provider.9 \
 	g_provider.9 g_new_providerf.9
 MLINKS+=gone_in.9 gone_in_dev.9
 MLINKS+=groupmember.9 realgroupmember.9
 MLINKS+=hash.9 hash32.9 \
 	hash.9 hash32_buf.9 \
 	hash.9 hash32_str.9 \
 	hash.9 hash32_stre.9 \
 	hash.9 hash32_strn.9 \
 	hash.9 hash32_strne.9 \
 	hash.9 jenkins_hash.9 \
 	hash.9 jenkins_hash32.9
 MLINKS+=hashinit.9 hashdestroy.9 \
 	hashinit.9 hashinit_flags.9 \
 	hashinit.9 phashinit.9
 MLINKS+=hhook.9 hhook_head_register.9 \
 	hhook.9 hhook_head_deregister.9 \
 	hhook.9 hhook_head_deregister_lookup.9 \
 	hhook.9 hhook_run_hooks.9 \
 	hhook.9 HHOOKS_RUN_IF.9 \
 	hhook.9 HHOOKS_RUN_LOOKUP_IF.9
 MLINKS+=hz.9 tick.9
 MLINKS+=ieee80211.9 ieee80211_ifattach.9 \
 	ieee80211.9 ieee80211_ifdetach.9
 MLINKS+=ieee80211_amrr.9 ieee80211_amrr_choose.9 \
 	ieee80211_amrr.9 ieee80211_amrr_cleanup.9 \
 	ieee80211_amrr.9 ieee80211_amrr_init.9 \
 	ieee80211_amrr.9 ieee80211_amrr_node_init.9 \
 	ieee80211_amrr.9 ieee80211_amrr_setinterval.9 \
 	ieee80211_amrr.9 ieee80211_amrr_tx_complete.9 \
 	ieee80211_amrr.9 ieee80211_amrr_tx_update.9
 MLINKS+=ieee80211_beacon.9 ieee80211_beacon_alloc.9 \
 	ieee80211_beacon.9 ieee80211_beacon_notify.9 \
 	ieee80211_beacon.9 ieee80211_beacon_update.9
 MLINKS+=ieee80211_bmiss.9 ieee80211_beacon_miss.9
 MLINKS+=ieee80211_crypto.9 ieee80211_crypto_available.9 \
 	ieee80211_crypto.9 ieee80211_crypto_decap.9 \
 	ieee80211_crypto.9 ieee80211_crypto_delglobalkeys.9 \
 	ieee80211_crypto.9 ieee80211_crypto_delkey.9 \
 	ieee80211_crypto.9 ieee80211_crypto_demic.9 \
 	ieee80211_crypto.9 ieee80211_crypto_encap.9 \
 	ieee80211_crypto.9 ieee80211_crypto_enmic.9 \
 	ieee80211_crypto.9 ieee80211_crypto_newkey.9 \
 	ieee80211_crypto.9 ieee80211_crypto_register.9 \
 	ieee80211_crypto.9 ieee80211_crypto_reload_keys.9 \
 	ieee80211_crypto.9 ieee80211_crypto_setkey.9 \
 	ieee80211_crypto.9 ieee80211_crypto_unregister.9 \
 	ieee80211_crypto.9 ieee80211_key_update_begin.9 \
 	ieee80211_crypto.9 ieee80211_key_update_end.9 \
 	ieee80211_crypto.9 ieee80211_notify_michael_failure.9 \
 	ieee80211_crypto.9 ieee80211_notify_replay_failure.9
 MLINKS+=ieee80211_input.9 ieee80211_input_all.9
 MLINKS+=ieee80211_node.9 ieee80211_dump_node.9 \
 	ieee80211_node.9 ieee80211_dump_nodes.9 \
 	ieee80211_node.9 ieee80211_find_rxnode.9 \
 	ieee80211_node.9 ieee80211_find_rxnode_withkey.9 \
 	ieee80211_node.9 ieee80211_free_node.9 \
 	ieee80211_node.9 ieee80211_iterate_nodes.9 \
 	ieee80211_node.9 ieee80211_ref_node.9
 MLINKS+=ieee80211_output.9 ieee80211_process_callback.9 \
 	ieee80211_output.9 M_SEQNO_GET.9 \
 	ieee80211_output.9 M_WME_GETAC.9
 MLINKS+=ieee80211_proto.9 ieee80211_new_state.9 \
 	ieee80211_proto.9 ieee80211_resume_all.9 \
 	ieee80211_proto.9 ieee80211_start_all.9 \
 	ieee80211_proto.9 ieee80211_stop_all.9 \
 	ieee80211_proto.9 ieee80211_suspend_all.9 \
 	ieee80211_proto.9 ieee80211_waitfor_parent.9
 MLINKS+=ieee80211_radiotap.9 ieee80211_radiotap_active.9 \
 	ieee80211_radiotap.9 ieee80211_radiotap_active_vap.9 \
 	ieee80211_radiotap.9 ieee80211_radiotap_attach.9 \
 	ieee80211_radiotap.9 ieee80211_radiotap_tx.9 \
 	ieee80211_radiotap.9 radiotap.9
 MLINKS+=ieee80211_regdomain.9 ieee80211_alloc_countryie.9 \
 	ieee80211_regdomain.9 ieee80211_init_channels.9 \
 	ieee80211_regdomain.9 ieee80211_sort_channels.9
 MLINKS+=ieee80211_scan.9 ieee80211_add_scan.9 \
 	ieee80211_scan.9 ieee80211_bg_scan.9 \
 	ieee80211_scan.9 ieee80211_cancel_scan.9 \
 	ieee80211_scan.9 ieee80211_cancel_scan_any.9 \
 	ieee80211_scan.9 ieee80211_check_scan.9 \
 	ieee80211_scan.9 ieee80211_check_scan_current.9 \
 	ieee80211_scan.9 ieee80211_flush.9 \
 	ieee80211_scan.9 ieee80211_probe_curchan.9 \
 	ieee80211_scan.9 ieee80211_scan_assoc_fail.9 \
 	ieee80211_scan.9 ieee80211_scan_done.9 \
 	ieee80211_scan.9 ieee80211_scan_dump_channels.9 \
 	ieee80211_scan.9 ieee80211_scan_flush.9 \
 	ieee80211_scan.9 ieee80211_scan_iterate.9 \
 	ieee80211_scan.9 ieee80211_scan_next.9 \
 	ieee80211_scan.9 ieee80211_scan_timeout.9 \
 	ieee80211_scan.9 ieee80211_scanner_get.9 \
 	ieee80211_scan.9 ieee80211_scanner_register.9 \
 	ieee80211_scan.9 ieee80211_scanner_unregister.9 \
 	ieee80211_scan.9 ieee80211_scanner_unregister_all.9 \
 	ieee80211_scan.9 ieee80211_start_scan.9
 MLINKS+=ieee80211_vap.9 ieee80211_vap_attach.9 \
 	ieee80211_vap.9 ieee80211_vap_detach.9 \
 	ieee80211_vap.9 ieee80211_vap_setup.9
 MLINKS+=iflibdd.9 ifdi_attach_pre.9 \
 	iflibdd.9 ifdi_attach_post.9 \
 	iflibdd.9 ifdi_detach.9 \
 	iflibdd.9 ifdi_get_counter.9 \
 	iflibdd.9 ifdi_i2c_req.9 \
 	iflibdd.9 ifdi_init.9 \
 	iflibdd.9 ifdi_intr_enable.9 \
 	iflibdd.9 ifdi_intr_disable.9 \
 	iflibdd.9 ifdi_led_func.9 \
 	iflibdd.9 ifdi_link_intr_enable.9 \
 	iflibdd.9 ifdi_media_set.9 \
 	iflibdd.9 ifdi_media_status.9 \
 	iflibdd.9 ifdi_media_change.9 \
 	iflibdd.9 ifdi_mtu_set.9 \
 	iflibdd.9 ifdi_multi_set.9 \
 	iflibdd.9 ifdi_promisc_set.9 \
 	iflibdd.9 ifdi_queues_alloc.9 \
 	iflibdd.9 ifdi_queues_free.9 \
 	iflibdd.9 ifdi_queue_intr_enable.9 \
 	iflibdd.9 ifdi_resume.9 \
 	iflibdd.9 ifdi_rxq_setup.9 \
 	iflibdd.9 ifdi_stop.9 \
 	iflibdd.9 ifdi_suspend.9 \
 	iflibdd.9 ifdi_sysctl_int_delay.9 \
 	iflibdd.9 ifdi_timer.9 \
 	iflibdd.9 ifdi_txq_setup.9 \
 	iflibdd.9 ifdi_update_admin_status.9 \
 	iflibdd.9 ifdi_vf_add.9 \
 	iflibdd.9 ifdi_vflr_handle.9 \
 	iflibdd.9 ifdi_vlan_register.9 \
 	iflibdd.9 ifdi_vlan_unregister.9 \
 	iflibdd.9 ifdi_watchdog_reset.9 \
 	iflibdd.9 iov_init.9 \
 	iflibdd.9 iov_uinit.9
 MLINKS+=iflibdi.9 iflib_add_int_delay_sysctl.9 \
 	iflibdi.9 iflib_device_attach.9 \
 	iflibdi.9 iflib_device_deregister.9 \
 	iflibdi.9 iflib_device_detach.9 \
 	iflibdi.9 iflib_device_suspend.9 \
 	iflibdi.9 iflib_device_register.9 \
 	iflibdi.9 iflib_device_resume.9 \
 	iflibdi.9 iflib_led_create.9 \
 	iflibdi.9 iflib_irq_alloc.9 \
 	iflibdi.9 iflib_irq_alloc_generic.9 \
 	iflibdi.9 iflib_link_intr_deferred.9 \
 	iflibdi.9 iflib_link_state_change.9 \
 	iflibdi.9 iflib_rx_intr_deferred.9 \
 	iflibdi.9 iflib_tx_intr_deferred.9
 MLINKS+=iflibtxrx.9 isc_rxd_available.9 \
 	iflibtxrx.9 isc_rxd_refill.9 \
 	iflibtxrx.9 isc_rxd_flush.9 \
 	iflibtxrx.9 isc_rxd_pkt_get.9 \
 	iflibtxrx.9 isc_txd_credits_update.9 \
 	iflibtxrx.9 isc_txd_encap.9 \
 	iflibtxrx.9 isc_txd_flush.9
 MLINKS+=ifnet.9 if_addmulti.9 \
 	ifnet.9 if_alloc.9 \
 	ifnet.9 if_alloc_dev.9 \
 	ifnet.9 if_alloc_domain.9 \
 	ifnet.9 if_allmulti.9 \
 	ifnet.9 if_attach.9 \
 	ifnet.9 if_data.9 \
 	ifnet.9 IF_DEQUEUE.9 \
 	ifnet.9 if_delmulti.9 \
 	ifnet.9 if_detach.9 \
 	ifnet.9 if_down.9 \
 	ifnet.9 if_findmulti.9 \
 	ifnet.9 if_free.9 \
 	ifnet.9 if_free_type.9 \
 	ifnet.9 if_up.9 \
 	ifnet.9 ifa_free.9 \
 	ifnet.9 ifa_ifwithaddr.9 \
 	ifnet.9 ifa_ifwithdstaddr.9 \
 	ifnet.9 ifa_ifwithnet.9 \
 	ifnet.9 ifa_ref.9 \
 	ifnet.9 ifaddr.9 \
 	ifnet.9 ifaddr_byindex.9 \
 	ifnet.9 ifaof_ifpforaddr.9 \
 	ifnet.9 ifioctl.9 \
 	ifnet.9 ifpromisc.9 \
 	ifnet.9 ifqueue.9 \
 	ifnet.9 ifunit.9 \
 	ifnet.9 ifunit_ref.9
 MLINKS+=insmntque.9 insmntque1.9
 MLINKS+=intr_event.9 intr_event_add_handler.9 \
 	intr_event.9 intr_event_create.9 \
 	intr_event.9 intr_event_destroy.9 \
 	intr_event.9 intr_event_handle.9 \
 	intr_event.9 intr_event_remove_handler.9 \
 	intr_event.9 intr_priority.9
 MLINKS+=KASSERT.9 MPASS.9
 MLINKS+=kern_reboot.9 reboot.9 \
 	kern_reboot.9 shutdown_nice.9
 MLINKS+=kern_yield.9 maybe_yield.9 \
 	kern_yield.9 should_yield.9
 MLINKS+=kernacc.9 useracc.9
 MLINKS+=kernel_mount.9 free_mntarg.9 \
 	kernel_mount.9 mount_arg.9 \
 	kernel_mount.9 mount_argb.9 \
 	kernel_mount.9 mount_argf.9 \
 	kernel_mount.9 mount_argsu.9
 MLINKS+=kasan.9 KASAN.9 \
 	kasan.9 kasan_mark.9
 MLINKS+=khelp.9 khelp_add_hhook.9 \
 	khelp.9 KHELP_DECLARE_MOD.9 \
 	khelp.9 KHELP_DECLARE_MOD_UMA.9 \
 	khelp.9 khelp_destroy_osd.9 \
 	khelp.9 khelp_get_id.9 \
 	khelp.9 khelp_get_osd.9 \
 	khelp.9 khelp_init_osd.9 \
 	khelp.9 khelp_remove_hhook.9
 MLINKS+=kmsan.9 KMSAN.9 \
 	kmsan.9 kmsan_check.9 \
 	kmsan.9 kmsan_check_bio.9 \
 	kmsan.9 kmsan_check_ccb.9 \
 	kmsan.9 kmsan_check_mbuf.9 \
 	kmsan.9 kmsan_check_uio.9 \
 	kmsan.9 kmsan_mark.9 \
 	kmsan.9 kmsan_oirg.9
 MLINKS+=kobj.9 DEFINE_CLASS.9 \
 	kobj.9 kobj_class_compile.9 \
 	kobj.9 kobj_class_compile_static.9 \
 	kobj.9 kobj_class_free.9 \
 	kobj.9 kobj_create.9 \
 	kobj.9 kobj_delete.9 \
 	kobj.9 kobj_init.9 \
 	kobj.9 kobj_init_static.9
 MLINKS+=kproc.9 kproc_create.9 \
 	kproc.9 kproc_exit.9 \
 	kproc.9 kproc_kthread_add.9 \
 	kproc.9 kproc_resume.9 \
 	kproc.9 kproc_shutdown.9 \
 	kproc.9 kproc_start.9 \
 	kproc.9 kproc_suspend.9 \
 	kproc.9 kproc_suspend_check.9 \
 	kproc.9 kthread_create.9
 MLINKS+=kqueue.9 knlist_add.9 \
 	kqueue.9 knlist_clear.9 \
 	kqueue.9 knlist_delete.9 \
 	kqueue.9 knlist_destroy.9 \
 	kqueue.9 knlist_empty.9 \
 	kqueue.9 knlist_init.9 \
 	kqueue.9 knlist_init_mtx.9 \
 	kqueue.9 knlist_remove.9 \
 	kqueue.9 knote_fdclose.9 \
 	kqueue.9 KNOTE_LOCKED.9 \
 	kqueue.9 KNOTE_UNLOCKED.9 \
 	kqueue.9 kqfd_register.9 \
 	kqueue.9 kqueue_add_filteropts.9 \
 	kqueue.9 kqueue_del_filteropts.9
 MLINKS+=kthread.9 kthread_add.9 \
 	kthread.9 kthread_exit.9 \
 	kthread.9 kthread_resume.9 \
 	kthread.9 kthread_shutdown.9 \
 	kthread.9 kthread_start.9 \
 	kthread.9 kthread_suspend.9 \
 	kthread.9 kthread_suspend_check.9
 MLINKS+=ktr.9 CTR0.9 \
 	ktr.9 CTR1.9 \
 	ktr.9 CTR2.9 \
 	ktr.9 CTR3.9 \
 	ktr.9 CTR4.9 \
 	ktr.9 CTR5.9 \
 	ktr.9 CTR6.9
 MLINKS+=lock.9 lockdestroy.9 \
 	lock.9 lockinit.9 \
 	lock.9 lockmgr.9 \
 	lock.9 lockmgr_args.9 \
 	lock.9 lockmgr_args_rw.9 \
 	lock.9 lockmgr_assert.9 \
 	lock.9 lockmgr_disown.9 \
 	lock.9 lockmgr_disowned.9 \
 	lock.9 lockmgr_lock_flags.9 \
 	lock.9 lockmgr_printinfo.9 \
 	lock.9 lockmgr_recursed.9 \
 	lock.9 lockmgr_rw.9 \
 	lock.9 lockmgr_slock.9 \
 	lock.9 lockmgr_unlock.9 \
 	lock.9 lockmgr_xlock.9 \
 	lock.9 lockstatus.9
 MLINKS+=LOCK_PROFILING.9 MUTEX_PROFILING.9
 MLINKS+=make_dev.9 destroy_dev.9 \
 	make_dev.9 destroy_dev_drain.9 \
 	make_dev.9 destroy_dev_sched.9 \
 	make_dev.9 destroy_dev_sched_cb.9 \
 	make_dev.9 dev_depends.9 \
 	make_dev.9 make_dev_alias.9 \
 	make_dev.9 make_dev_alias_p.9 \
 	make_dev.9 make_dev_cred.9 \
 	make_dev.9 make_dev_credf.9 \
 	make_dev.9 make_dev_p.9 \
 	make_dev.9 make_dev_s.9
 MLINKS+=malloc.9 free.9 \
 	malloc.9 malloc_aligned.9 \
 	malloc.9 malloc_domainset.9 \
 	malloc.9 malloc_domainset_aligned.9 \
 	malloc.9 malloc_domainset_exec.9 \
 	malloc.9 malloc_exec.9 \
 	malloc.9 malloc_usable_size.9 \
 	malloc.9 mallocarray.9 \
 	malloc.9 mallocarray_domainset.9 \
 	malloc.9 MALLOC_DECLARE.9 \
 	malloc.9 MALLOC_DEFINE.9 \
 	malloc.9 realloc.9 \
 	malloc.9 reallocf.9 \
 	malloc.9 zfree.9
 MLINKS+=mbchain.9 mb_detach.9 \
 	mbchain.9 mb_done.9 \
 	mbchain.9 mb_fixhdr.9 \
 	mbchain.9 mb_init.9 \
 	mbchain.9 mb_initm.9 \
 	mbchain.9 mb_put_int64be.9 \
 	mbchain.9 mb_put_int64le.9 \
 	mbchain.9 mb_put_mbuf.9 \
 	mbchain.9 mb_put_mem.9 \
 	mbchain.9 mb_put_uint16be.9 \
 	mbchain.9 mb_put_uint16le.9 \
 	mbchain.9 mb_put_uint32be.9 \
 	mbchain.9 mb_put_uint32le.9 \
 	mbchain.9 mb_put_uint8.9 \
 	mbchain.9 mb_put_uio.9 \
 	mbchain.9 mb_reserve.9
 MLINKS+=\
 	mbuf.9 m_adj.9 \
 	mbuf.9 m_align.9 \
 	mbuf.9 M_ALIGN.9 \
 	mbuf.9 m_append.9 \
 	mbuf.9 m_apply.9 \
 	mbuf.9 m_cat.9 \
 	mbuf.9 m_catpkt.9 \
 	mbuf.9 MCHTYPE.9 \
 	mbuf.9 MCLGET.9 \
 	mbuf.9 m_collapse.9 \
 	mbuf.9 m_copyback.9 \
 	mbuf.9 m_copydata.9 \
 	mbuf.9 m_copym.9 \
 	mbuf.9 m_copypacket.9 \
 	mbuf.9 m_copyup.9 \
 	mbuf.9 m_defrag.9 \
 	mbuf.9 m_devget.9 \
 	mbuf.9 m_dup.9 \
 	mbuf.9 m_dup_pkthdr.9 \
 	mbuf.9 MEXTADD.9 \
 	mbuf.9 m_fixhdr.9 \
 	mbuf.9 m_free.9 \
 	mbuf.9 m_freem.9 \
 	mbuf.9 MGET.9 \
 	mbuf.9 m_get.9 \
 	mbuf.9 m_get2.9 \
 	mbuf.9 m_get3.9 \
 	mbuf.9 m_getjcl.9 \
 	mbuf.9 m_getcl.9 \
 	mbuf.9 MGETHDR.9 \
 	mbuf.9 m_gethdr.9 \
 	mbuf.9 m_getm.9 \
 	mbuf.9 m_getptr.9 \
 	mbuf.9 MH_ALIGN.9 \
 	mbuf.9 M_LEADINGSPACE.9 \
 	mbuf.9 m_length.9 \
 	mbuf.9 M_MOVE_PKTHDR.9 \
 	mbuf.9 m_move_pkthdr.9 \
 	mbuf.9 M_PREPEND.9 \
 	mbuf.9 m_prepend.9 \
 	mbuf.9 m_pulldown.9 \
 	mbuf.9 m_pullup.9 \
 	mbuf.9 m_split.9 \
 	mbuf.9 mtod.9 \
 	mbuf.9 mtodo.9 \
 	mbuf.9 M_TRAILINGSPACE.9 \
 	mbuf.9 m_unshare.9 \
 	mbuf.9 M_WRITABLE.9
 MLINKS+=\
 	mbuf_tags.9 m_tag_alloc.9 \
 	mbuf_tags.9 m_tag_copy.9 \
 	mbuf_tags.9 m_tag_copy_chain.9 \
 	mbuf_tags.9 m_tag_delete.9 \
 	mbuf_tags.9 m_tag_delete_chain.9 \
 	mbuf_tags.9 m_tag_delete_nonpersistent.9 \
 	mbuf_tags.9 m_tag_find.9 \
 	mbuf_tags.9 m_tag_first.9 \
 	mbuf_tags.9 m_tag_free.9 \
 	mbuf_tags.9 m_tag_get.9 \
 	mbuf_tags.9 m_tag_init.9 \
 	mbuf_tags.9 m_tag_locate.9 \
 	mbuf_tags.9 m_tag_next.9 \
 	mbuf_tags.9 m_tag_prepend.9 \
 	mbuf_tags.9 m_tag_unlink.9
 MLINKS+=MD5.9 MD5Init.9 \
 	MD5.9 MD5Transform.9
 MLINKS+=mdchain.9 md_append_record.9 \
 	mdchain.9 md_done.9 \
 	mdchain.9 md_get_int64.9 \
 	mdchain.9 md_get_int64be.9 \
 	mdchain.9 md_get_int64le.9 \
 	mdchain.9 md_get_mbuf.9 \
 	mdchain.9 md_get_mem.9 \
 	mdchain.9 md_get_uint16.9 \
 	mdchain.9 md_get_uint16be.9 \
 	mdchain.9 md_get_uint16le.9 \
 	mdchain.9 md_get_uint32.9 \
 	mdchain.9 md_get_uint32be.9 \
 	mdchain.9 md_get_uint32le.9 \
 	mdchain.9 md_get_uint8.9 \
 	mdchain.9 md_get_uio.9 \
 	mdchain.9 md_initm.9 \
 	mdchain.9 md_next_record.9
 MLINKS+=microtime.9 bintime.9 \
 	microtime.9 getbintime.9 \
 	microtime.9 getmicrotime.9 \
 	microtime.9 getnanotime.9 \
 	microtime.9 nanotime.9
 MLINKS+=microuptime.9 binuptime.9 \
 	microuptime.9 getbinuptime.9 \
 	microuptime.9 getmicrouptime.9 \
 	microuptime.9 getnanouptime.9 \
 	microuptime.9 getsbinuptime.9 \
 	microuptime.9 nanouptime.9 \
 	microuptime.9 sbinuptime.9
 MLINKS+=mi_switch.9 cpu_switch.9 \
 	mi_switch.9 cpu_throw.9
 MLINKS+=mod_cc.9 CCV.9 \
 	mod_cc.9 DECLARE_CC_MODULE.9
 MLINKS+=mtx_pool.9 mtx_pool_alloc.9 \
 	mtx_pool.9 mtx_pool_create.9 \
 	mtx_pool.9 mtx_pool_destroy.9 \
 	mtx_pool.9 mtx_pool_find.9 \
 	mtx_pool.9 mtx_pool_lock.9 \
 	mtx_pool.9 mtx_pool_lock_spin.9 \
 	mtx_pool.9 mtx_pool_unlock.9 \
 	mtx_pool.9 mtx_pool_unlock_spin.9
 MLINKS+=mutex.9 mtx_assert.9 \
 	mutex.9 mtx_destroy.9 \
 	mutex.9 mtx_init.9 \
 	mutex.9 mtx_initialized.9 \
 	mutex.9 mtx_lock.9 \
 	mutex.9 mtx_lock_flags.9 \
 	mutex.9 mtx_lock_spin.9 \
 	mutex.9 mtx_lock_spin_flags.9 \
 	mutex.9 mtx_owned.9 \
 	mutex.9 mtx_recursed.9 \
 	mutex.9 mtx_sleep.9 \
 	mutex.9 MTX_SYSINIT.9 \
 	mutex.9 mtx_trylock.9 \
 	mutex.9 mtx_trylock_flags.9 \
 	mutex.9 mtx_trylock_spin.9 \
 	mutex.9 mtx_trylock_spin_flags.9 \
 	mutex.9 mtx_unlock.9 \
 	mutex.9 mtx_unlock_flags.9 \
 	mutex.9 mtx_unlock_spin.9 \
 	mutex.9 mtx_unlock_spin_flags.9
 MLINKS+=namei.9 NDFREE.9 \
 	namei.9 NDINIT.9
 MLINKS+=netisr.9 netisr_clearqdrops.9 \
 	netisr.9 netisr_default_flow2cpu.9 \
 	netisr.9 netisr_dispatch.9 \
 	netisr.9 netisr_dispatch_src.9 \
 	netisr.9 netisr_get_cpucount.9 \
 	netisr.9 netisr_get_cpuid.9 \
 	netisr.9 netisr_getqdrops.9 \
 	netisr.9 netisr_getqlimit.9 \
 	netisr.9 netisr_queue.9 \
 	netisr.9 netisr_queue_src.9 \
 	netisr.9 netisr_register.9 \
 	netisr.9 netisr_setqlimit.9 \
 	netisr.9 netisr_unregister.9
 MLINKS+=nv.9 libnv.9 \
 	nv.9 nvlist.9 \
 	nv.9 nvlist_add_binary.9 \
 	nv.9 nvlist_add_bool.9 \
 	nv.9 nvlist_add_bool_array.9 \
 	nv.9 nvlist_add_descriptor.9 \
 	nv.9 nvlist_add_descriptor_array.9 \
 	nv.9 nvlist_add_null.9 \
 	nv.9 nvlist_add_number.9 \
 	nv.9 nvlist_add_number_array.9 \
 	nv.9 nvlist_add_nvlist.9 \
 	nv.9 nvlist_add_nvlist_array.9 \
 	nv.9 nvlist_add_string.9 \
 	nv.9 nvlist_add_stringf.9 \
 	nv.9 nvlist_add_stringv.9 \
 	nv.9 nvlist_add_string_array.9 \
 	nv.9 nvlist_append_bool_array.9 \
 	nv.9 nvlist_append_descriptor_array.9 \
 	nv.9 nvlist_append_nvlist_array.9 \
 	nv.9 nvlist_append_number_array.9 \
 	nv.9 nvlist_append_string_array.9 \
 	nv.9 nvlist_clone.9 \
 	nv.9 nvlist_create.9 \
 	nv.9 nvlist_destroy.9 \
 	nv.9 nvlist_dump.9 \
 	nv.9 nvlist_empty.9 \
 	nv.9 nvlist_error.9 \
 	nv.9 nvlist_exists.9 \
 	nv.9 nvlist_exists_binary.9 \
 	nv.9 nvlist_exists_bool.9 \
 	nv.9 nvlist_exists_bool_array.9 \
 	nv.9 nvlist_exists_descriptor.9 \
 	nv.9 nvlist_exists_descriptor_array.9 \
 	nv.9 nvlist_exists_null.9 \
 	nv.9 nvlist_exists_number.9 \
 	nv.9 nvlist_exists_number_array.9 \
 	nv.9 nvlist_exists_nvlist.9 \
 	nv.9 nvlist_exists_nvlist_array.9 \
 	nv.9 nvlist_exists_string.9 \
 	nv.9 nvlist_exists_type.9 \
 	nv.9 nvlist_fdump.9 \
 	nv.9 nvlist_flags.9 \
 	nv.9 nvlist_free.9 \
 	nv.9 nvlist_free_binary.9 \
 	nv.9 nvlist_free_bool.9 \
 	nv.9 nvlist_free_bool_array.9 \
 	nv.9 nvlist_free_descriptor.9 \
 	nv.9 nvlist_free_descriptor_array.9 \
 	nv.9 nvlist_free_null.9 \
 	nv.9 nvlist_free_number.9 \
 	nv.9 nvlist_free_number_array.9 \
 	nv.9 nvlist_free_nvlist.9 \
 	nv.9 nvlist_free_nvlist_array.9 \
 	nv.9 nvlist_free_string.9 \
 	nv.9 nvlist_free_string_array.9 \
 	nv.9 nvlist_free_type.9 \
 	nv.9 nvlist_get_binary.9 \
 	nv.9 nvlist_get_bool.9 \
 	nv.9 nvlist_get_bool_array.9 \
 	nv.9 nvlist_get_descriptor.9 \
 	nv.9 nvlist_get_descriptor_array.9 \
 	nv.9 nvlist_get_number.9 \
 	nv.9 nvlist_get_number_array.9 \
 	nv.9 nvlist_get_nvlist.9 \
 	nv.9 nvlist_get_nvlist_array.9 \
 	nv.9 nvlist_get_parent.9 \
 	nv.9 nvlist_get_string.9 \
 	nv.9 nvlist_get_string_array.9 \
 	nv.9 nvlist_move_binary.9 \
 	nv.9 nvlist_move_descriptor.9 \
 	nv.9 nvlist_move_descriptor_array.9 \
 	nv.9 nvlist_move_nvlist.9 \
 	nv.9 nvlist_move_nvlist_array.9 \
 	nv.9 nvlist_move_string.9 \
 	nv.9 nvlist_move_string_array.9 \
 	nv.9 nvlist_next.9 \
 	nv.9 nvlist_pack.9 \
 	nv.9 nvlist_recv.9 \
 	nv.9 nvlist_send.9 \
 	nv.9 nvlist_set_error.9 \
 	nv.9 nvlist_size.9 \
 	nv.9 nvlist_take_binary.9 \
 	nv.9 nvlist_take_bool.9 \
 	nv.9 nvlist_take_bool_array.9 \
 	nv.9 nvlist_take_descriptor.9 \
 	nv.9 nvlist_take_descriptor_array.9 \
 	nv.9 nvlist_take_number.9 \
 	nv.9 nvlist_take_number_array.9 \
 	nv.9 nvlist_take_nvlist.9 \
 	nv.9 nvlist_take_nvlist_array.9 \
 	nv.9 nvlist_take_string.9 \
 	nv.9 nvlist_take_string_array.9 \
 	nv.9 nvlist_unpack.9 \
 	nv.9 nvlist_xfer.9
 MLINKS+=OF_child.9 OF_parent.9 \
 	OF_child.9 OF_peer.9
 MLINKS+=OF_device_from_xref.9 OF_device_register_xref.9 \
 	OF_device_from_xref.9 OF_xref_from_device.9
 MLINKS+=OF_getprop.9 OF_getencprop.9 \
 	OF_getprop.9 OF_getencprop_alloc.9 \
 	OF_getprop.9 OF_getencprop_alloc_multi.9 \
 	OF_getprop.9 OF_getprop_alloc.9 \
 	OF_getprop.9 OF_getprop_alloc_multi.9 \
 	OF_getprop.9 OF_getproplen.9 \
 	OF_getprop.9 OF_hasprop.9 \
 	OF_getprop.9 OF_nextprop.9 \
 	OF_getprop.9 OF_prop_free.9 \
 	OF_getprop.9 OF_searchencprop.9 \
 	OF_getprop.9 OF_searchprop.9 \
 	OF_getprop.9 OF_setprop.9
 MLINKS+=OF_node_from_xref.9 OF_xref_from_node.9
 MLINKS+=ofw_bus_is_compatible.9 ofw_bus_is_compatible_strict.9 \
 	ofw_bus_is_compatible.9 ofw_bus_node_is_compatible.9 \
 	ofw_bus_is_compatible.9 ofw_bus_search_compatible.9
 MLINKS+= ofw_bus_status_okay.9 ofw_bus_get_status.9 \
 	ofw_bus_status_okay.9 ofw_bus_node_status_okay.9
 MLINKS+=ofw_graph.9 ofw_graph_get_device_by_port_ep.9 \
 	ofw_graph.9 ofw_graph_get_endpoint_by_idx.9 \
 	ofw_graph.9 ofw_graph_get_port_by_idx.9 \
 	ofw_graph.9 ofw_graph_get_remove_endpoint.9 \
 	ofw_graph.9 ofw_graph_get_remove_parent.9 \
 	ofw_graph.9 ofw_graph_port_get_num_endpoints.9
 MLINKS+=osd.9 osd_call.9 \
 	osd.9 osd_del.9 \
 	osd.9 osd_deregister.9 \
 	osd.9 osd_exit.9 \
 	osd.9 osd_free_reserved.9 \
 	osd.9 osd_get.9 \
 	osd.9 osd_register.9 \
 	osd.9 osd_reserve.9 \
 	osd.9 osd_set.9 \
 	osd.9 osd_set_reserved.9
 MLINKS+=panic.9 vpanic.9 \
 	panic.9 KERNEL_PANICKED.9
 MLINKS+=pci.9 pci_alloc_msi.9 \
 	pci.9 pci_alloc_msix.9 \
 	pci.9 pci_disable_busmaster.9 \
 	pci.9 pci_disable_io.9 \
 	pci.9 pci_enable_busmaster.9 \
 	pci.9 pci_enable_io.9 \
 	pci.9 pci_find_bsf.9 \
 	pci.9 pci_find_cap.9 \
 	pci.9 pci_find_dbsf.9 \
 	pci.9 pci_find_device.9 \
 	pci.9 pci_find_extcap.9 \
 	pci.9 pci_find_htcap.9 \
 	pci.9 pci_find_pcie_root_port.9 \
 	pci.9 pci_get_id.9 \
 	pci.9 pci_get_max_read_req.9 \
 	pci.9 pci_get_powerstate.9 \
 	pci.9 pci_get_vpd_ident.9 \
 	pci.9 pci_get_vpd_readonly.9 \
 	pci.9 pci_iov_attach.9 \
 	pci.9 pci_iov_attach_name.9 \
 	pci.9 pci_iov_detach.9 \
 	pci.9 pci_msi_count.9 \
 	pci.9 pci_msix_count.9 \
 	pci.9 pci_msix_pba_bar.9 \
 	pci.9 pci_msix_table_bar.9 \
 	pci.9 pci_pending_msix.9 \
 	pci.9 pci_read_config.9 \
 	pci.9 pci_release_msi.9 \
 	pci.9 pci_remap_msix.9 \
 	pci.9 pci_restore_state.9 \
 	pci.9 pci_save_state.9 \
 	pci.9 pci_set_powerstate.9 \
 	pci.9 pci_set_max_read_req.9 \
 	pci.9 pci_write_config.9 \
 	pci.9 pcie_adjust_config.9 \
 	pci.9 pcie_flr.9 \
 	pci.9 pcie_max_completion_timeout.9 \
 	pci.9 pcie_read_config.9 \
 	pci.9 pcie_wait_for_pending_transactions.9 \
 	pci.9 pcie_write_config.9
 MLINKS+=pci_iov_schema.9 pci_iov_schema_alloc_node.9 \
 	pci_iov_schema.9 pci_iov_schema_add_bool.9 \
 	pci_iov_schema.9 pci_iov_schema_add_string.9 \
 	pci_iov_schema.9 pci_iov_schema_add_uint8.9 \
 	pci_iov_schema.9 pci_iov_schema_add_uint16.9 \
 	pci_iov_schema.9 pci_iov_schema_add_uint32.9 \
 	pci_iov_schema.9 pci_iov_schema_add_uint64.9 \
 	pci_iov_schema.9 pci_iov_schema_add_unicast_mac.9
 MLINKS+=pfil.9 pfil_add_hook.9 \
 	pfil.9 pfil_head_register.9 \
 	pfil.9 pfil_head_unregister.9 \
 	pfil.9 pfil_remove_hook.9 \
 	pfil.9 pfil_run_hooks.9 \
 	pfil.9 pfil_link.9
 MLINKS+=pfind.9 zpfind.9
 MLINKS+=PHOLD.9 PRELE.9 \
 	PHOLD.9 _PHOLD.9 \
 	PHOLD.9 _PRELE.9 \
 	PHOLD.9 PROC_ASSERT_HELD.9 \
 	PHOLD.9 PROC_ASSERT_NOT_HELD.9
 MLINKS+=pmap_copy.9 pmap_copy_page.9
 MLINKS+=pmap_extract.9 pmap_extract_and_hold.9
 MLINKS+=pmap_kextract.9 vtophys.9
 MLINKS+=pmap_is_modified.9 pmap_ts_referenced.9
 MLINKS+=pmap_pinit.9 pmap_pinit0.9
 MLINKS+=pmap_qenter.9 pmap_qremove.9
 MLINKS+=pmap_quick_enter_page.9 pmap_quick_remove_page.9
 MLINKS+=pmap_remove.9 pmap_remove_all.9 \
 	pmap_remove.9 pmap_remove_pages.9
 MLINKS+=pmap_resident_count.9 pmap_wired_count.9
 MLINKS+=pmap_zero_page.9 pmap_zero_area.9
 MLINKS+=printf.9 log.9 \
 	printf.9 tprintf.9 \
 	printf.9 uprintf.9 \
 	printf.9 vlog.9 \
 	printf.9 vprintf.9
 MLINKS+=priv.9 priv_check.9 \
 	priv.9 priv_check_cred.9
 MLINKS+=prng.9 prng32.9 \
 	prng.9 prng32_bounded.9 \
 	prng.9 prng64.9 \
 	prng.9 prng64_bounded.9
 MLINKS+=proc_rwmem.9 proc_readmem.9 \
 	proc_rwmem.9 proc_writemem.9
 MLINKS+=psignal.9 pgsignal.9 \
 	psignal.9 tdsignal.9
 MLINKS+=pwmbus.9 pwm.9
 MLINKS+=random.9 arc4rand.9 \
 	random.9 arc4random.9 \
 	random.9 is_random_seeded.9 \
 	random.9 read_random.9 \
 	random.9 read_random_uio.9 \
 	random.9 srandom.9
 MLINKS+=random_harvest.9 random_harvest_direct.9 \
 	random_harvest.9 random_harvest_fast.9 \
 	random_harvest.9 random_harvest_queue.9
 MLINKS+=ratecheck.9 ppsratecheck.9
 MLINKS+=refcount.9 refcount_acquire.9 \
 	refcount.9 refcount_acquire_checked.9 \
 	refcount.9 refcount_acquire_if_not_zero.9 \
 	refcount.9 refcount_init.9 \
 	refcount.9 refcount_load.9 \
 	refcount.9 refcount_release.9 \
 	refcount.9 refcount_release_if_last.9 \
 	refcount.9 refcount_release_if_not_last.9
 MLINKS+=resource_int_value.9 resource_long_value.9 \
 	resource_int_value.9 resource_string_value.9
 MLINKS+=rman.9 rman_activate_resource.9 \
 	rman.9 rman_adjust_resource.9 \
 	rman.9 rman_deactivate_resource.9 \
 	rman.9 rman_fini.9 \
 	rman.9 rman_first_free_region.9 \
 	rman.9 rman_get_bushandle.9 \
 	rman.9 rman_get_bustag.9 \
 	rman.9 rman_get_device.9 \
 	rman.9 rman_get_end.9 \
 	rman.9 rman_get_flags.9 \
 	rman.9 rman_get_mapping.9 \
 	rman.9 rman_get_rid.9 \
 	rman.9 rman_get_size.9 \
 	rman.9 rman_get_start.9 \
 	rman.9 rman_get_type.9 \
 	rman.9 rman_get_virtual.9 \
 	rman.9 rman_init.9 \
 	rman.9 rman_init_from_resource.9 \
 	rman.9 rman_is_region_manager.9 \
 	rman.9 rman_last_free_region.9 \
 	rman.9 rman_make_alignment_flags.9 \
 	rman.9 rman_manage_region.9 \
 	rman.9 rman_release_resource.9 \
 	rman.9 rman_reserve_resource.9 \
 	rman.9 rman_reserve_resource_bound.9 \
 	rman.9 rman_set_bushandle.9 \
 	rman.9 rman_set_bustag.9 \
 	rman.9 rman_set_mapping.9 \
 	rman.9 rman_set_rid.9 \
 	rman.9 rman_set_type.9 \
 	rman.9 rman_set_virtual.9
 MLINKS+=rmlock.9 rm_assert.9 \
 	rmlock.9 rm_destroy.9 \
 	rmlock.9 rm_init.9 \
 	rmlock.9 rm_init_flags.9 \
 	rmlock.9 rm_rlock.9 \
 	rmlock.9 rm_runlock.9 \
 	rmlock.9 rm_sleep.9 \
 	rmlock.9 RM_SYSINIT.9 \
 	rmlock.9 RM_SYSINIT_FLAGS.9 \
 	rmlock.9 rm_try_rlock.9 \
 	rmlock.9 rm_wlock.9 \
 	rmlock.9 rm_wowned.9 \
 	rmlock.9 rm_wunlock.9
 MLINKS+=runqueue.9 choosethread.9 \
 	runqueue.9 procrunnable.9 \
 	runqueue.9 remrunqueue.9 \
 	runqueue.9 setrunqueue.9
 MLINKS+=rwlock.9 rw_assert.9 \
 	rwlock.9 rw_destroy.9 \
 	rwlock.9 rw_downgrade.9 \
 	rwlock.9 rw_init.9 \
 	rwlock.9 rw_init_flags.9 \
 	rwlock.9 rw_initialized.9 \
 	rwlock.9 rw_rlock.9 \
 	rwlock.9 rw_runlock.9 \
 	rwlock.9 rw_unlock.9 \
 	rwlock.9 rw_sleep.9 \
 	rwlock.9 RW_SYSINIT.9 \
 	rwlock.9 RW_SYSINIT_FLAGS.9 \
 	rwlock.9 rw_try_rlock.9 \
 	rwlock.9 rw_try_upgrade.9 \
 	rwlock.9 rw_try_wlock.9 \
 	rwlock.9 rw_wlock.9 \
 	rwlock.9 rw_wowned.9 \
 	rwlock.9 rw_wunlock.9
 MLINKS+=sbuf.9 sbuf_bcat.9 \
 	sbuf.9 sbuf_bcopyin.9 \
 	sbuf.9 sbuf_bcpy.9 \
 	sbuf.9 sbuf_cat.9 \
 	sbuf.9 sbuf_clear.9 \
 	sbuf.9 sbuf_clear_flags.9 \
 	sbuf.9 sbuf_copyin.9 \
 	sbuf.9 sbuf_cpy.9 \
 	sbuf.9 sbuf_data.9 \
 	sbuf.9 sbuf_delete.9 \
 	sbuf.9 sbuf_done.9 \
 	sbuf.9 sbuf_error.9 \
 	sbuf.9 sbuf_finish.9 \
 	sbuf.9 sbuf_get_flags.9 \
 	sbuf.9 sbuf_hexdump.9 \
 	sbuf.9 sbuf_len.9 \
 	sbuf.9 sbuf_new.9 \
 	sbuf.9 sbuf_new_auto.9 \
 	sbuf.9 sbuf_new_for_sysctl.9 \
 	sbuf.9 sbuf_nl_terminate.9 \
 	sbuf.9 sbuf_printf.9 \
 	sbuf.9 sbuf_printf_drain.9 \
 	sbuf.9 sbuf_putbuf.9 \
 	sbuf.9 sbuf_putc.9 \
 	sbuf.9 sbuf_set_drain.9 \
 	sbuf.9 sbuf_set_flags.9 \
 	sbuf.9 sbuf_setpos.9 \
 	sbuf.9 sbuf_start_section.9 \
 	sbuf.9 sbuf_end_section.9  \
 	sbuf.9 sbuf_trim.9 \
 	sbuf.9 sbuf_vprintf.9
 MLINKS+=scheduler.9 curpriority_cmp.9 \
 	scheduler.9 maybe_resched.9 \
 	scheduler.9 propagate_priority.9 \
 	scheduler.9 resetpriority.9 \
 	scheduler.9 roundrobin.9 \
 	scheduler.9 roundrobin_interval.9 \
 	scheduler.9 schedclock.9 \
 	scheduler.9 schedcpu.9 \
 	scheduler.9 sched_setup.9 \
 	scheduler.9 setrunnable.9 \
 	scheduler.9 updatepri.9
 MLINKS+=SDT.9 SDT_PROVIDER_DECLARE.9 \
 	SDT.9 SDT_PROVIDER_DEFINE.9 \
 	SDT.9 SDT_PROBE_DECLARE.9 \
 	SDT.9 SDT_PROBE_DEFINE.9 \
 	SDT.9 SDT_PROBE.9
 MLINKS+=securelevel_gt.9 securelevel_ge.9
 MLINKS+=selrecord.9 seldrain.9 \
 	selrecord.9 selwakeup.9
 MLINKS+=sema.9 sema_destroy.9 \
 	sema.9 sema_init.9 \
 	sema.9 sema_post.9 \
 	sema.9 sema_timedwait.9 \
 	sema.9 sema_trywait.9 \
 	sema.9 sema_value.9 \
 	sema.9 sema_wait.9
 MLINKS+=seqc.9 seqc_consistent.9 \
 	seqc.9 seqc_read.9 \
 	seqc.9 seqc_write_begin.9 \
 	seqc.9 seqc_write_end.9
 MLINKS+=sf_buf.9 sf_buf_alloc.9 \
 	sf_buf.9 sf_buf_free.9 \
 	sf_buf.9 sf_buf_kva.9 \
 	sf_buf.9 sf_buf_page.9
 MLINKS+=sglist.9 sglist_alloc.9 \
 	sglist.9 sglist_append.9 \
 	sglist.9 sglist_append_bio.9 \
 	sglist.9 sglist_append_mbuf.9 \
 	sglist.9 sglist_append_mbuf_epg.9 \
 	sglist.9 sglist_append_phys.9 \
 	sglist.9 sglist_append_sglist.9 \
 	sglist.9 sglist_append_single_mbuf.9 \
 	sglist.9 sglist_append_uio.9 \
 	sglist.9 sglist_append_user.9 \
 	sglist.9 sglist_append_vmpages.9 \
 	sglist.9 sglist_build.9 \
 	sglist.9 sglist_clone.9 \
 	sglist.9 sglist_consume_uio.9 \
 	sglist.9 sglist_count.9 \
 	sglist.9 sglist_count_mbuf_epg.9 \
 	sglist.9 sglist_count_vmpages.9 \
 	sglist.9 sglist_free.9 \
 	sglist.9 sglist_hold.9 \
 	sglist.9 sglist_init.9 \
 	sglist.9 sglist_join.9 \
 	sglist.9 sglist_length.9 \
 	sglist.9 sglist_reset.9 \
 	sglist.9 sglist_slice.9 \
 	sglist.9 sglist_split.9
 MLINKS+=shm_map.9 shm_unmap.9
 MLINKS+=signal.9 cursig.9 \
 	signal.9 execsigs.9 \
 	signal.9 issignal.9 \
 	signal.9 killproc.9 \
 	signal.9 pgsigio.9 \
 	signal.9 postsig.9 \
 	signal.9 SETSETNEQ.9 \
 	signal.9 SETSETOR.9 \
 	signal.9 SIGADDSET.9 \
 	signal.9 SIG_CONTSIGMASK.9 \
 	signal.9 SIGDELSET.9 \
 	signal.9 SIGEMPTYSET.9 \
 	signal.9 sigexit.9 \
 	signal.9 SIGFILLSET.9 \
 	signal.9 siginit.9 \
 	signal.9 SIGISEMPTY.9 \
 	signal.9 SIGISMEMBER.9 \
 	signal.9 SIGNOTEMPTY.9 \
 	signal.9 signotify.9 \
 	signal.9 SIGPENDING.9 \
 	signal.9 SIGSETAND.9 \
 	signal.9 SIGSETCANTMASK.9 \
 	signal.9 SIGSETEQ.9 \
 	signal.9 SIGSETNAND.9 \
 	signal.9 SIG_STOPSIGMASK.9 \
 	signal.9 trapsignal.9
 MLINKS+=sleep.9 msleep.9 \
 	sleep.9 msleep_sbt.9 \
 	sleep.9 msleep_spin.9 \
 	sleep.9 msleep_spin_sbt.9 \
 	sleep.9 pause.9 \
 	sleep.9 pause_sig.9 \
 	sleep.9 pause_sbt.9 \
 	sleep.9 tsleep.9 \
 	sleep.9 tsleep_sbt.9 \
 	sleep.9 wakeup.9 \
 	sleep.9 wakeup_one.9 \
 	sleep.9 wakeup_any.9
 MLINKS+=sleepqueue.9 init_sleepqueues.9 \
 	sleepqueue.9 sleepq_abort.9 \
 	sleepqueue.9 sleepq_add.9 \
 	sleepqueue.9 sleepq_alloc.9 \
 	sleepqueue.9 sleepq_broadcast.9 \
 	sleepqueue.9 sleepq_free.9 \
 	sleepqueue.9 sleepq_lookup.9 \
 	sleepqueue.9 sleepq_lock.9 \
 	sleepqueue.9 sleepq_release.9 \
 	sleepqueue.9 sleepq_remove.9 \
 	sleepqueue.9 sleepq_set_timeout.9 \
 	sleepqueue.9 sleepq_set_timeout_sbt.9 \
 	sleepqueue.9 sleepq_signal.9 \
 	sleepqueue.9 sleepq_sleepcnt.9 \
 	sleepqueue.9 sleepq_timedwait.9 \
 	sleepqueue.9 sleepq_timedwait_sig.9 \
 	sleepqueue.9 sleepq_type.9 \
 	sleepqueue.9 sleepq_wait.9 \
 	sleepqueue.9 sleepq_wait_sig.9
 MLINKS+=smr.9 smr_advance.9 \
 	smr.9 smr_create.9 \
 	smr.9 smr_destroy.9 \
 	smr.9 smr_enter.9 \
 	smr.9 smr_exit.9 \
 	smr.9 smr_poll.9 \
 	smr.9 smr_synchronize.9 \
 	smr.9 smr_wait.9
 MLINKS+=socket.9 soabort.9 \
 	socket.9 soaccept.9 \
 	socket.9 sobind.9 \
 	socket.9 socheckuid.9 \
 	socket.9 soclose.9 \
 	socket.9 soconnect.9 \
 	socket.9 socreate.9 \
 	socket.9 sodisconnect.9 \
 	socket.9 sodtor_set.9 \
 	socket.9 sodupsockaddr.9 \
 	socket.9 sofree.9 \
 	socket.9 sogetopt.9 \
 	socket.9 sohasoutofband.9 \
 	socket.9 solisten.9 \
 	socket.9 solisten_proto.9 \
 	socket.9 solisten_proto_check.9 \
 	socket.9 sonewconn.9 \
 	socket.9 sooptcopyin.9 \
 	socket.9 sooptcopyout.9 \
 	socket.9 sopoll.9 \
 	socket.9 sopoll_generic.9 \
 	socket.9 soreceive.9 \
 	socket.9 soreceive_dgram.9 \
 	socket.9 soreceive_generic.9 \
 	socket.9 soreceive_stream.9 \
 	socket.9 soreserve.9 \
 	socket.9 sorflush.9 \
 	socket.9 sosend.9 \
 	socket.9 sosend_dgram.9 \
 	socket.9 sosend_generic.9 \
 	socket.9 sosetopt.9 \
 	socket.9 soshutdown.9 \
 	socket.9 sotoxsocket.9 \
 	socket.9 soupcall_clear.9 \
 	socket.9 soupcall_set.9 \
 	socket.9 sowakeup.9
 MLINKS+=stack.9 stack_copy.9 \
 	stack.9 stack_create.9 \
 	stack.9 stack_destroy.9 \
 	stack.9 stack_print.9 \
 	stack.9 stack_print_ddb.9 \
 	stack.9 stack_print_short.9 \
 	stack.9 stack_print_short_ddb.9 \
 	stack.9 stack_put.9 \
 	stack.9 stack_save.9 \
 	stack.9 stack_sbuf_print.9 \
 	stack.9 stack_sbuf_print_ddb.9 \
 	stack.9 stack_zero.9
 MLINKS+=store.9 subyte.9 \
 	store.9 suword.9 \
 	store.9 suword16.9 \
 	store.9 suword32.9 \
 	store.9 suword64.9
 MLINKS+=swi.9 swi_add.9 \
 	swi.9 swi_remove.9 \
 	swi.9 swi_sched.9
 MLINKS+=sx.9 sx_assert.9 \
 	sx.9 sx_destroy.9 \
 	sx.9 sx_downgrade.9 \
 	sx.9 sx_init.9 \
 	sx.9 sx_init_flags.9 \
 	sx.9 sx_sleep.9 \
 	sx.9 sx_slock.9 \
 	sx.9 sx_slock_sig.9 \
 	sx.9 sx_sunlock.9 \
 	sx.9 SX_SYSINIT.9 \
 	sx.9 SX_SYSINIT_FLAGS.9 \
 	sx.9 sx_try_slock.9 \
 	sx.9 sx_try_upgrade.9 \
 	sx.9 sx_try_xlock.9 \
 	sx.9 sx_unlock.9 \
 	sx.9 sx_xholder.9 \
 	sx.9 sx_xlock.9 \
 	sx.9 sx_xlock_sig.9 \
 	sx.9 sx_xlocked.9 \
 	sx.9 sx_xunlock.9
 MLINKS+=syscall_helper_register.9 syscall_helper_unregister.9 \
 	syscall_helper_register.9 SYSCALL_INIT_HELPER.9 \
 	syscall_helper_register.9 SYSCALL_INIT_HELPER_COMPAT.9 \
 	syscall_helper_register.9 SYSCALL_INIT_HELPER_COMPAT_F.9 \
 	syscall_helper_register.9 SYSCALL_INIT_HELPER_F.9
 MLINKS+=sysctl.9 SYSCTL_DECL.9 \
 	sysctl.9 SYSCTL_ADD_CONST_STRING.9 \
 	sysctl.9 SYSCTL_ADD_INT.9 \
 	sysctl.9 SYSCTL_ADD_LONG.9 \
 	sysctl.9 SYSCTL_ADD_NODE.9 \
 	sysctl.9 SYSCTL_ADD_NODE_WITH_LABEL.9 \
 	sysctl.9 SYSCTL_ADD_OPAQUE.9 \
 	sysctl.9 SYSCTL_ADD_PROC.9 \
 	sysctl.9 SYSCTL_ADD_QUAD.9 \
 	sysctl.9 SYSCTL_ADD_ROOT_NODE.9 \
 	sysctl.9 SYSCTL_ADD_S8.9 \
 	sysctl.9 SYSCTL_ADD_S16.9 \
 	sysctl.9 SYSCTL_ADD_S32.9 \
 	sysctl.9 SYSCTL_ADD_S64.9 \
 	sysctl.9 SYSCTL_ADD_STRING.9 \
 	sysctl.9 SYSCTL_ADD_STRUCT.9 \
 	sysctl.9 SYSCTL_ADD_TIMEVAL_SEC.9 \
 	sysctl.9 SYSCTL_ADD_U8.9 \
 	sysctl.9 SYSCTL_ADD_U16.9 \
 	sysctl.9 SYSCTL_ADD_U32.9 \
 	sysctl.9 SYSCTL_ADD_U64.9 \
 	sysctl.9 SYSCTL_ADD_UAUTO.9 \
 	sysctl.9 SYSCTL_ADD_UINT.9 \
 	sysctl.9 SYSCTL_ADD_ULONG.9 \
 	sysctl.9 SYSCTL_ADD_UMA_CUR.9 \
 	sysctl.9 SYSCTL_ADD_UMA_MAX.9 \
 	sysctl.9 SYSCTL_ADD_UQUAD.9 \
 	sysctl.9 SYSCTL_CHILDREN.9 \
 	sysctl.9 SYSCTL_STATIC_CHILDREN.9 \
 	sysctl.9 SYSCTL_NODE_CHILDREN.9 \
 	sysctl.9 SYSCTL_PARENT.9 \
 	sysctl.9 SYSCTL_INT.9 \
 	sysctl.9 SYSCTL_INT_WITH_LABEL.9 \
 	sysctl.9 SYSCTL_LONG.9 \
 	sysctl.9 sysctl_msec_to_ticks.9 \
 	sysctl.9 SYSCTL_NODE.9 \
 	sysctl.9 SYSCTL_NODE_WITH_LABEL.9 \
 	sysctl.9 SYSCTL_OPAQUE.9 \
 	sysctl.9 SYSCTL_PROC.9 \
 	sysctl.9 SYSCTL_QUAD.9 \
 	sysctl.9 SYSCTL_ROOT_NODE.9 \
 	sysctl.9 SYSCTL_S8.9 \
 	sysctl.9 SYSCTL_S16.9 \
 	sysctl.9 SYSCTL_S32.9 \
 	sysctl.9 SYSCTL_S64.9 \
 	sysctl.9 SYSCTL_STRING.9 \
 	sysctl.9 SYSCTL_STRUCT.9 \
 	sysctl.9 SYSCTL_TIMEVAL_SEC.9 \
 	sysctl.9 SYSCTL_U8.9 \
 	sysctl.9 SYSCTL_U16.9 \
 	sysctl.9 SYSCTL_U32.9 \
 	sysctl.9 SYSCTL_U64.9 \
 	sysctl.9 SYSCTL_UINT.9 \
 	sysctl.9 SYSCTL_ULONG.9 \
 	sysctl.9 SYSCTL_UMA_CUR.9 \
 	sysctl.9 SYSCTL_UMA_MAX.9 \
 	sysctl.9 SYSCTL_UQUAD.9
 MLINKS+=sysctl_add_oid.9 sysctl_move_oid.9 \
 	sysctl_add_oid.9 sysctl_remove_oid.9 \
 	sysctl_add_oid.9 sysctl_remove_name.9
 MLINKS+=sysctl_ctx_init.9 sysctl_ctx_entry_add.9 \
 	sysctl_ctx_init.9 sysctl_ctx_entry_del.9 \
 	sysctl_ctx_init.9 sysctl_ctx_entry_find.9 \
 	sysctl_ctx_init.9 sysctl_ctx_free.9
 MLINKS+=SYSINIT.9 SYSUNINIT.9
 MLINKS+=taskqueue.9 TASK_INIT.9 \
 	taskqueue.9 TASK_INITIALIZER.9 \
 	taskqueue.9 taskqueue_block.9 \
 	taskqueue.9 taskqueue_cancel.9 \
 	taskqueue.9 taskqueue_cancel_timeout.9 \
 	taskqueue.9 taskqueue_create.9 \
 	taskqueue.9 taskqueue_create_fast.9 \
 	taskqueue.9 TASKQUEUE_DECLARE.9 \
 	taskqueue.9 TASKQUEUE_DEFINE.9 \
 	taskqueue.9 TASKQUEUE_DEFINE_THREAD.9 \
 	taskqueue.9 taskqueue_drain.9 \
 	taskqueue.9 taskqueue_drain_all.9 \
 	taskqueue.9 taskqueue_drain_timeout.9 \
 	taskqueue.9 taskqueue_enqueue.9 \
 	taskqueue.9 taskqueue_enqueue_timeout.9 \
 	taskqueue.9 taskqueue_enqueue_timeout_sbt.9 \
 	taskqueue.9 TASKQUEUE_FAST_DEFINE.9 \
 	taskqueue.9 TASKQUEUE_FAST_DEFINE_THREAD.9 \
 	taskqueue.9 taskqueue_free.9 \
 	taskqueue.9 taskqueue_member.9 \
 	taskqueue.9 taskqueue_quiesce.9 \
 	taskqueue.9 taskqueue_run.9 \
 	taskqueue.9 taskqueue_set_callback.9 \
 	taskqueue.9 taskqueue_start_threads.9 \
 	taskqueue.9 taskqueue_start_threads_cpuset.9 \
 	taskqueue.9 taskqueue_start_threads_in_proc.9 \
 	taskqueue.9 taskqueue_unblock.9 \
 	taskqueue.9 TIMEOUT_TASK_INIT.9
 MLINKS+=tcp_functions.9 register_tcp_functions.9 \
 	tcp_functions.9 register_tcp_functions_as_name.9 \
 	tcp_functions.9 register_tcp_functions_as_names.9 \
 	tcp_functions.9 deregister_tcp_functions.9
 MLINKS+=time.9 boottime.9 \
 	time.9 time_second.9 \
 	time.9 time_uptime.9
 MLINKS+=ucred.9 crcopy.9 \
 	ucred.9 crcopysafe.9 \
 	ucred.9 crdup.9 \
 	ucred.9 crfree.9 \
 	ucred.9 crget.9 \
 	ucred.9 crhold.9 \
 	ucred.9 crsetgroups.9 \
 	ucred.9 cru2x.9
 MLINKS+=uidinfo.9 uifind.9 \
 	uidinfo.9 uifree.9 \
 	uidinfo.9 uihashinit.9 \
 	uidinfo.9 uihold.9
 MLINKS+=uio.9 uiomove.9 \
 	uio.9 uiomove_frombuf.9 \
 	uio.9 uiomove_nofault.9
 MLINKS+=unr.9 alloc_unr.9 \
 	unr.9 alloc_unrl.9 \
 	unr.9 alloc_unr_specific.9 \
 	unr.9 clear_unrhdr.9 \
 	unr.9 delete_unrhdr.9 \
 	unr.9 free_unr.9 \
 	unr.9 new_unrhdr.9
 
 .if ${MK_USB} != "no"
 MAN+=	usbdi.9
 MLINKS+=usbdi.9 usbd_do_request.9 \
 	usbdi.9 usbd_do_request_flags.9 \
 	usbdi.9 usbd_errstr.9 \
 	usbdi.9 usbd_lookup_id_by_info.9 \
 	usbdi.9 usbd_lookup_id_by_uaa.9 \
 	usbdi.9 usbd_transfer_clear_stall.9 \
 	usbdi.9 usbd_transfer_drain.9 \
 	usbdi.9 usbd_transfer_pending.9 \
 	usbdi.9 usbd_transfer_poll.9 \
 	usbdi.9 usbd_transfer_setup.9 \
 	usbdi.9 usbd_transfer_start.9 \
 	usbdi.9 usbd_transfer_stop.9 \
 	usbdi.9 usbd_transfer_submit.9 \
 	usbdi.9 usbd_transfer_unsetup.9 \
 	usbdi.9 usbd_xfer_clr_flag.9 \
 	usbdi.9 usbd_xfer_frame_data.9 \
 	usbdi.9 usbd_xfer_frame_len.9 \
 	usbdi.9 usbd_xfer_get_frame.9 \
 	usbdi.9 usbd_xfer_get_priv.9 \
 	usbdi.9 usbd_xfer_is_stalled.9 \
 	usbdi.9 usbd_xfer_max_framelen.9 \
 	usbdi.9 usbd_xfer_max_frames.9 \
 	usbdi.9 usbd_xfer_max_len.9 \
 	usbdi.9 usbd_xfer_set_flag.9 \
 	usbdi.9 usbd_xfer_set_frame_data.9 \
 	usbdi.9 usbd_xfer_set_frame_len.9 \
 	usbdi.9 usbd_xfer_set_frame_offset.9 \
 	usbdi.9 usbd_xfer_set_frames.9 \
 	usbdi.9 usbd_xfer_set_interval.9 \
 	usbdi.9 usbd_xfer_set_priv.9 \
 	usbdi.9 usbd_xfer_set_stall.9 \
 	usbdi.9 usbd_xfer_set_timeout.9 \
 	usbdi.9 usbd_xfer_softc.9 \
 	usbdi.9 usbd_xfer_state.9 \
 	usbdi.9 usbd_xfer_status.9 \
 	usbdi.9 usb_fifo_alloc_buffer.9 \
 	usbdi.9 usb_fifo_attach.9 \
 	usbdi.9 usb_fifo_detach.9 \
 	usbdi.9 usb_fifo_free_buffer.9 \
 	usbdi.9 usb_fifo_get_data.9 \
 	usbdi.9 usb_fifo_get_data_buffer.9 \
 	usbdi.9 usb_fifo_get_data_error.9 \
 	usbdi.9 usb_fifo_get_data_linear.9 \
 	usbdi.9 usb_fifo_put_bytes_max.9 \
 	usbdi.9 usb_fifo_put_data.9 \
 	usbdi.9 usb_fifo_put_data_buffer.9 \
 	usbdi.9 usb_fifo_put_data_error.9 \
 	usbdi.9 usb_fifo_put_data_linear.9 \
 	usbdi.9 usb_fifo_reset.9 \
 	usbdi.9 usb_fifo_softc.9 \
 	usbdi.9 usb_fifo_wakeup.9
 .endif
 MLINKS+=vfsconf.9 vfs_modevent.9 \
 	vfsconf.9 vfs_register.9 \
 	vfsconf.9 vfs_unregister.9
 MLINKS+=vfs_getopt.9 vfs_copyopt.9 \
 	vfs_getopt.9 vfs_filteropt.9 \
 	vfs_getopt.9 vfs_flagopt.9 \
 	vfs_getopt.9 vfs_getopts.9 \
 	vfs_getopt.9 vfs_scanopt.9 \
 	vfs_getopt.9 vfs_setopt.9 \
 	vfs_getopt.9 vfs_setopt_part.9 \
 	vfs_getopt.9 vfs_setopts.9
 MLINKS+=vhold.9 vdrop.9 \
 	vhold.9 vdropl.9 \
 	vhold.9 vholdl.9
 MLINKS+=vmem.9 vmem_add.9 \
 	vmem.9 vmem_alloc.9 \
 	vmem.9 vmem_create.9 \
 	vmem.9 vmem_destroy.9 \
 	vmem.9 vmem_free.9 \
 	vmem.9 vmem_xalloc.9 \
 	vmem.9 vmem_xfree.9
 MLINKS+=vm_map_lock.9 vm_map_lock_downgrade.9 \
 	vm_map_lock.9 vm_map_lock_read.9 \
 	vm_map_lock.9 vm_map_lock_upgrade.9 \
 	vm_map_lock.9 vm_map_trylock.9 \
 	vm_map_lock.9 vm_map_trylock_read.9 \
 	vm_map_lock.9 vm_map_unlock.9 \
 	vm_map_lock.9 vm_map_unlock_read.9
 MLINKS+=vm_map_lookup.9 vm_map_lookup_done.9
 MLINKS+=vm_map_max.9 vm_map_min.9 \
 	vm_map_max.9 vm_map_pmap.9
 MLINKS+=vm_map_stack.9 vm_map_growstack.9
 MLINKS+=vm_map_wire.9 vm_map_unwire.9
 MLINKS+=vm_page_alloc.9 vm_page_alloc_after.9 \
 	vm_page_alloc.9 vm_page_alloc_contig.9 \
 	vm_page_alloc.9 vm_page_alloc_contig_domain.9 \
 	vm_page_alloc.9 vm_page_alloc_domain.9 \
 	vm_page_alloc.9 vm_page_alloc_domain_after.9 \
 	vm_page_alloc.9 vm_page_alloc_noobj.9 \
 	vm_page_alloc.9 vm_page_alloc_noobj_contig.9 \
 	vm_page_alloc.9 vm_page_alloc_noobj_contig_domain.9 \
 	vm_page_alloc.9 vm_page_alloc_noobj_domain.9
 MLINKS+=vm_page_bits.9 vm_page_clear_dirty.9 \
 	vm_page_bits.9 vm_page_dirty.9 \
 	vm_page_bits.9 vm_page_is_valid.9 \
 	vm_page_bits.9 vm_page_set_invalid.9 \
 	vm_page_bits.9 vm_page_set_validclean.9 \
 	vm_page_bits.9 vm_page_test_dirty.9 \
 	vm_page_bits.9 vm_page_undirty.9 \
 	vm_page_bits.9 vm_page_zero_invalid.9
 MLINKS+=vm_page_busy.9 vm_page_busied.9 \
 	vm_page_busy.9 vm_page_busy_downgrade.9 \
 	vm_page_busy.9 vm_page_busy_sleep.9 \
 	vm_page_busy.9 vm_page_sbusied.9 \
 	vm_page_busy.9 vm_page_sunbusy.9 \
 	vm_page_busy.9 vm_page_trysbusy.9 \
 	vm_page_busy.9 vm_page_tryxbusy.9 \
 	vm_page_busy.9 vm_page_xbusied.9 \
 	vm_page_busy.9 vm_page_xunbusy.9 \
 	vm_page_busy.9 vm_page_assert_sbusied.9 \
 	vm_page_busy.9 vm_page_assert_unbusied.9 \
 	vm_page_busy.9 vm_page_assert_xbusied.9
 MLINKS+=vm_page_aflag.9 vm_page_aflag_clear.9 \
 	vm_page_aflag.9 vm_page_aflag_set.9 \
 	vm_page_aflag.9 vm_page_reference.9
 MLINKS+=vm_page_free.9 vm_page_free_toq.9 \
 	vm_page_free.9 vm_page_free_zero.9 \
 	vm_page_free.9 vm_page_try_to_free.9
 MLINKS+=vm_page_insert.9 vm_page_remove.9
 MLINKS+=vm_page_wire.9 vm_page_unwire.9 \
 	vm_page_wire.9 vm_page_unwire_noq.9 \
 	vm_page_wire.9 vm_page_wire_mapped.9
 MLINKS+=VOP_ACCESS.9 VOP_ACCESSX.9
 MLINKS+=VOP_ATTRIB.9 VOP_GETATTR.9 \
 	VOP_ATTRIB.9 VOP_SETATTR.9 \
 	VOP_ATTRIB.9 VOP_STAT.9
 MLINKS+=VOP_CREATE.9 VOP_MKDIR.9 \
 	VOP_CREATE.9 VOP_MKNOD.9 \
 	VOP_CREATE.9 VOP_SYMLINK.9
 MLINKS+=VOP_FSYNC.9 VOP_FDATASYNC.9
 MLINKS+=VOP_GETPAGES.9 VOP_PUTPAGES.9
 MLINKS+=VOP_INACTIVE.9 VOP_RECLAIM.9
 MLINKS+=VOP_LOCK.9 vn_lock.9 \
 	VOP_LOCK.9 VOP_ISLOCKED.9 \
 	VOP_LOCK.9 VOP_UNLOCK.9
 MLINKS+=VOP_OPENCLOSE.9 VOP_CLOSE.9 \
 	VOP_OPENCLOSE.9 VOP_OPEN.9
 MLINKS+=VOP_RDWR.9 VOP_READ.9 \
 	VOP_RDWR.9 VOP_WRITE.9
 MLINKS+=VOP_REMOVE.9 VOP_RMDIR.9
 MLINKS+=vnet.9 vimage.9
 MLINKS+=vref.9 VREF.9 \
 	vref.9 vrefl.9
 MLINKS+=vrele.9 vput.9 \
 	vrele.9 vunref.9
 MLINKS+=vslock.9 vsunlock.9
 MLINKS+=zone.9 uma.9 \
 	zone.9 uma_prealloc.9 \
 	zone.9 uma_reclaim.9 \
 	zone.9 uma_zalloc.9 \
 	zone.9 uma_zalloc_arg.9 \
 	zone.9 uma_zalloc_domain.9 \
 	zone.9 uma_zalloc_pcpu.9 \
 	zone.9 uma_zalloc_pcpu_arg.9 \
 	zone.9 uma_zcache_create.9 \
 	zone.9 uma_zcreate.9 \
 	zone.9 uma_zdestroy.9 \
 	zone.9 uma_zfree.9 \
 	zone.9 uma_zfree_arg.9 \
 	zone.9 uma_zfree_pcpu.9 \
 	zone.9 uma_zfree_pcpu_arg.9 \
 	zone.9 uma_zone_get_cur.9 \
 	zone.9 uma_zone_get_max.9 \
 	zone.9 uma_zone_reclaim.9 \
 	zone.9 uma_zone_reserve.9 \
 	zone.9 uma_zone_reserve_kva.9 \
 	zone.9 uma_zone_set_allocf.9 \
 	zone.9 uma_zone_set_freef.9 \
 	zone.9 uma_zone_set_max.9 \
 	zone.9 uma_zone_set_maxaction.9 \
 	zone.9 uma_zone_set_maxcache.9 \
 	zone.9 uma_zone_set_warning.9 \
 	zone.9 uma_zsecond_create.9
 
 # This makes more sense for amd64 and i386 but
 # we decide to install all manpages in all architectures
 _superio.9=	superio.9
 MLINKS+=superio.9 superio_devid.9 \
 	superio.9 superio_dev_disable.9 \
 	superio.9 superio_dev_enable.9 \
 	superio.9 superio_dev_enabled.9 \
 	superio.9 superio_find_dev.9 \
 	superio.9 superio_get_dma.9 \
 	superio.9 superio_get_iobase.9 \
 	superio.9 superio_get_irq.9 \
 	superio.9 superio_get_ldn.9 \
 	superio.9 superio_get_type.9 \
 	superio.9 superio_read.9 \
 	superio.9 superio_revid.9 \
 	superio.9 superio_vendor.9 \
 	superio.9 superio_write.9
 
 .include <bsd.prog.mk>
diff --git a/share/man/man9/contigmalloc.9 b/share/man/man9/contigmalloc.9
index 9e7086885870..edbcb1d60942 100644
--- a/share/man/man9/contigmalloc.9
+++ b/share/man/man9/contigmalloc.9
@@ -1,168 +1,149 @@
 .\"
 .\" Copyright (c) 2004 Joseph Koshy
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''
 .\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 .\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 .\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE
 .\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 .\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 .\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd July 22, 2024
+.Dd July 26, 2024
 .Dt CONTIGMALLOC 9
 .Os
 .Sh NAME
-.Nm contigmalloc , contigfree
+.Nm contigmalloc
 .Nd manage contiguous kernel physical memory
 .Sh SYNOPSIS
 .In sys/types.h
 .In sys/malloc.h
 .Ft "void *"
 .Fo contigmalloc
 .Fa "unsigned long size"
 .Fa "struct malloc_type *type"
 .Fa "int flags"
 .Fa "vm_paddr_t low"
 .Fa "vm_paddr_t high"
 .Fa "unsigned long alignment"
 .Fa "vm_paddr_t boundary"
 .Fc
-.Ft void
-.Fo contigfree
-.Fa "void *addr"
-.Fa "unsigned long size"
-.Fa "struct malloc_type *type"
-.Fc
 .In sys/param.h
 .In sys/domainset.h
 .Ft "void *"
 .Fo contigmalloc_domainset
 .Fa "unsigned long size"
 .Fa "struct malloc_type *type"
 .Fa "struct domainset *ds"
 .Fa "int flags"
 .Fa "vm_paddr_t low"
 .Fa "vm_paddr_t high"
 .Fa "unsigned long alignment"
 .Fa "vm_paddr_t boundary"
 .Fc
 .Sh DESCRIPTION
 The
 .Fn contigmalloc
 function allocates
 .Fa size
 bytes of contiguous physical memory that is aligned to
 .Fa alignment
 bytes, and which does not cross a boundary of
 .Fa boundary
 bytes.
 If successful, the allocation will reside between physical addresses
 .Fa low
 and
 .Fa high .
 The returned pointer points to a wired kernel virtual
 address range of
 .Fa size
 bytes allocated from the kernel virtual address (KVA) map.
 .Pp
 The
 .Fn contigmalloc_domainset
 variant allows the caller to additionally specify a
 .Xr numa 4
 domain selection policy.
 See
 .Xr domainset 9
 for some example policies.
 .Pp
 The
 .Fa flags
 parameter modifies
 .Fn contigmalloc Ns 's
 behaviour as follows:
 .Bl -tag -width indent
 .It Dv M_ZERO
 Causes the allocated physical memory to be zero filled.
 .It Dv M_NOWAIT
 Causes
 .Fn contigmalloc
 to return
 .Dv NULL
 if the request cannot be immediately fulfilled due to resource shortage.
 .El
 .Pp
 Other flags (if present) are ignored.
 .Pp
 The
 .Fn contigfree
-function deallocates memory allocated by a previous call to
-.Fn contigmalloc
-or
-.Fn contigmalloc_domainset .
-Its use is deprecated in favor of
-.Xr free 9
-which no longer requires the caller to know the
-.Fa size
-and also accepts
-.Dv NULL
-as an address.
+function is deprecated.
+Use
+.Xr free(9)
+instead.
 .Sh IMPLEMENTATION NOTES
 The
 .Fn contigmalloc
 function does not sleep waiting for memory resources to be freed up,
 but instead actively reclaims pages before giving up.
 However, unless
 .Dv M_NOWAIT
 is specified, it may select a page for reclamation that must first be
 written to backing storage, causing it to sleep.
 .Pp
-The
-.Fn contigfree
-function does not accept
-.Dv NULL
-as an address input, unlike
-.Xr free 9 .
 .Sh RETURN VALUES
 The
 .Fn contigmalloc
 function returns a kernel virtual address if allocation succeeds,
 or
 .Dv NULL
 otherwise.
 .Sh EXAMPLES
 .Bd -literal
 void *p;
 p = contigmalloc(8192, M_DEVBUF, M_ZERO, 0, (1L << 22),
     32 * 1024, 1024 * 1024);
 .Ed
 .Pp
 Ask for 8192 bytes of zero-filled memory residing between physical
 address 0 and 4194303 inclusive, aligned to a 32K boundary and not
 crossing a 1M address boundary.
 .Sh DIAGNOSTICS
 The
 .Fn contigmalloc
 function will panic if
 .Fa size
 is zero, or if
 .Fa alignment
 or
 .Fa boundary
 is not a power of two.
 .Sh SEE ALSO
 .Xr malloc 9 ,
 .Xr memguard 9
diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c
index b6e6f99bc719..351cd16ff9ca 100644
--- a/sys/amd64/acpica/acpi_wakeup.c
+++ b/sys/amd64/acpica/acpi_wakeup.c
@@ -1,463 +1,462 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
  * Copyright (c) 2001-2012 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
  * Copyright (c) 2003 Peter Wemm
  * Copyright (c) 2008-2012 Jung-uk Kim <jkim@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 AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 #include <sys/smp.h>
 #include <sys/systm.h>
 #include <sys/cons.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_page.h>
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
 #include <x86/mca.h>
 #include <machine/pcb.h>
 #include <machine/specialreg.h>
 #include <x86/ucode.h>
 
 #include <x86/apicreg.h>
 #include <x86/apicvar.h>
 #ifdef SMP
 #include <machine/smp.h>
 #include <machine/vmparam.h>
 #endif
 
 #include <contrib/dev/acpica/include/acpi.h>
 
 #include <dev/acpica/acpivar.h>
 
 #include "acpi_wakecode.h"
 #include "acpi_wakedata.h"
 
 /* Make sure the code is less than a page and leave room for the stack. */
 CTASSERT(sizeof(wakecode) < PAGE_SIZE - 1024);
 
 extern int		acpi_resume_beep;
 extern int		acpi_reset_video;
 extern int		acpi_susp_bounce;
 
 #ifdef SMP
 extern struct susppcb	**susppcbs;
 static cpuset_t		suspcpus;
 #else
 static struct susppcb	**susppcbs;
 #endif
 
 static void		acpi_stop_beep(void *);
 
 #ifdef SMP
 static int		acpi_wakeup_ap(struct acpi_softc *, int);
 static void		acpi_wakeup_cpus(struct acpi_softc *);
 #endif
 
 #define	ACPI_WAKEPT_PAGES	7
 
 #define	WAKECODE_FIXUP(offset, type, val)	do {	\
 	type	*addr;					\
 	addr = (type *)(sc->acpi_wakeaddr + (offset));	\
 	*addr = val;					\
 } while (0)
 
 static void
 acpi_stop_beep(void *arg)
 {
 
 	if (acpi_resume_beep != 0)
 		timer_spkr_release();
 }
 
 #ifdef SMP
 static int
 acpi_wakeup_ap(struct acpi_softc *sc, int cpu)
 {
 	struct pcb *pcb;
 	int		vector = (sc->acpi_wakephys >> 12) & 0xff;
 	int		apic_id = cpu_apic_ids[cpu];
 	int		ms;
 
 	pcb = &susppcbs[cpu]->sp_pcb;
 	WAKECODE_FIXUP(wakeup_pcb, struct pcb *, pcb);
 	WAKECODE_FIXUP(wakeup_gdt, uint16_t, pcb->pcb_gdt.rd_limit);
 	WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, pcb->pcb_gdt.rd_base);
 
 	ipi_startup(apic_id, vector);
 
 	/* Wait up to 5 seconds for it to resume. */
 	for (ms = 0; ms < 5000; ms++) {
 		if (!CPU_ISSET(cpu, &suspended_cpus))
 			return (1);	/* return SUCCESS */
 		DELAY(1000);
 	}
 	return (0);		/* return FAILURE */
 }
 
 #define	WARMBOOT_TARGET		0
 #define	WARMBOOT_OFF		(KERNBASE + 0x0467)
 #define	WARMBOOT_SEG		(KERNBASE + 0x0469)
 
 #define	CMOS_REG		(0x70)
 #define	CMOS_DATA		(0x71)
 #define	BIOS_RESET		(0x0f)
 #define	BIOS_WARM		(0x0a)
 
 static void
 acpi_wakeup_cpus(struct acpi_softc *sc)
 {
 	uint32_t	mpbioswarmvec;
 	int		cpu;
 	u_char		mpbiosreason;
 
 	if (!efi_boot) {
 		/* save the current value of the warm-start vector */
 		mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF);
 		outb(CMOS_REG, BIOS_RESET);
 		mpbiosreason = inb(CMOS_DATA);
 
 		/* setup a vector to our boot code */
 		*((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET;
 		*((volatile u_short *)WARMBOOT_SEG) = sc->acpi_wakephys >> 4;
 		outb(CMOS_REG, BIOS_RESET);
 		outb(CMOS_DATA, BIOS_WARM);	/* 'warm-start' */
 	}
 
 	/* Wake up each AP. */
 	for (cpu = 1; cpu < mp_ncpus; cpu++) {
 		if (!CPU_ISSET(cpu, &suspcpus))
 			continue;
 		if (acpi_wakeup_ap(sc, cpu) == 0) {
 			/* restore the warmstart vector */
 			*(uint32_t *)WARMBOOT_OFF = mpbioswarmvec;
 			panic("acpi_wakeup: failed to resume AP #%d (PHY #%d)",
 			    cpu, cpu_apic_ids[cpu]);
 		}
 	}
 
 	if (!efi_boot) {
 		/* restore the warmstart vector */
 		*(uint32_t *)WARMBOOT_OFF = mpbioswarmvec;
 
 		outb(CMOS_REG, BIOS_RESET);
 		outb(CMOS_DATA, mpbiosreason);
 	}
 }
 #endif
 
 int
 acpi_sleep_machdep(struct acpi_softc *sc, int state)
 {
 	ACPI_STATUS	status;
 	struct pcb	*pcb;
 	struct pcpu *pc;
 	int i;
 
 	if (sc->acpi_wakeaddr == 0ul)
 		return (-1);	/* couldn't alloc wake memory */
 
 #ifdef SMP
 	suspcpus = all_cpus;
 	CPU_CLR(PCPU_GET(cpuid), &suspcpus);
 #endif
 
 	if (acpi_resume_beep != 0)
 		timer_spkr_acquire();
 
 	AcpiSetFirmwareWakingVector(sc->acpi_wakephys, 0);
 
 	intr_suspend();
 
 	pcb = &susppcbs[0]->sp_pcb;
 	if (savectx(pcb)) {
 		fpususpend(susppcbs[0]->sp_fpususpend);
 #ifdef SMP
 		if (!CPU_EMPTY(&suspcpus) && suspend_cpus(suspcpus) == 0) {
 			device_printf(sc->acpi_dev, "Failed to suspend APs\n");
 			return (0);	/* couldn't sleep */
 		}
 #endif
 		hw_ibrs_ibpb_active = 0;
 		hw_ssb_active = 0;
 		cpu_stdext_feature3 = 0;
 		CPU_FOREACH(i) {
 			pc = pcpu_find(i);
 			pc->pc_ibpb_set = 0;
 		}
 
 		WAKECODE_FIXUP(resume_beep, uint8_t, (acpi_resume_beep != 0));
 		WAKECODE_FIXUP(reset_video, uint8_t, (acpi_reset_video != 0));
 
 		WAKECODE_FIXUP(wakeup_efer, uint64_t, rdmsr(MSR_EFER) &
 		    ~(EFER_LMA));
 		WAKECODE_FIXUP(wakeup_pcb, struct pcb *, pcb);
 		WAKECODE_FIXUP(wakeup_gdt, uint16_t, pcb->pcb_gdt.rd_limit);
 		WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, pcb->pcb_gdt.rd_base);
 
 		/* Call ACPICA to enter the desired sleep state */
 		if (state == ACPI_STATE_S4 && sc->acpi_s4bios)
 			status = AcpiEnterSleepStateS4bios();
 		else
 			status = AcpiEnterSleepState(state);
 		if (ACPI_FAILURE(status)) {
 			device_printf(sc->acpi_dev,
 			    "AcpiEnterSleepState failed - %s\n",
 			    AcpiFormatException(status));
 			return (0);	/* couldn't sleep */
 		}
 
 		if (acpi_susp_bounce)
 			resumectx(pcb);
 
 		for (;;)
 			ia32_pause();
 	} else {
 		/*
 		 * Re-initialize console hardware as soon as possible.
 		 * No console output (e.g. printf) is allowed before
 		 * this point.
 		 */
 		cnresume();
 		fpuresume(susppcbs[0]->sp_fpususpend);
 	}
 
 	return (1);	/* wakeup successfully */
 }
 
 int
 acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result,
     int intr_enabled)
 {
 
 	if (sleep_result == -1)
 		return (sleep_result);
 
 	if (!intr_enabled) {
 		/* Wakeup MD procedures in interrupt disabled context */
 		if (sleep_result == 1) {
 			ucode_reload();
 			pmap_init_pat();
 			initializecpu();
 			PCPU_SET(switchtime, 0);
 			PCPU_SET(switchticks, ticks);
 			lapic_xapic_mode();
 #ifdef SMP
 			if (!CPU_EMPTY(&suspcpus))
 				acpi_wakeup_cpus(sc);
 #endif
 		}
 
 #ifdef SMP
 		if (!CPU_EMPTY(&suspcpus))
 			resume_cpus(suspcpus);
 #endif
 
 		/*
 		 * Re-read cpu_stdext_feature3, which was zeroed-out
 		 * in acpi_sleep_machdep(), after the microcode was
 		 * reloaded.  Then recalculate the active mitigation
 		 * knobs that depend on the microcode and
 		 * cpu_stdext_feature3.  Do it after LAPICs are woken,
 		 * so that IPIs work.
 		 */
 		identify_cpu_ext_features();
 
 		mca_resume();
 		if (vmm_resume_p != NULL)
 			vmm_resume_p();
 		intr_resume(/*suspend_cancelled*/false);
 
 		hw_ibrs_recalculate(true);
 		amd64_syscall_ret_flush_l1d_recalc();
 		hw_ssb_recalculate(true);
 		x86_rngds_mitg_recalculate(true);
 		zenbleed_check_and_apply(true);
 
 		AcpiSetFirmwareWakingVector(0, 0);
 	} else {
 		/* Wakeup MD procedures in interrupt enabled context */
 		if (sleep_result == 1 && mem_range_softc.mr_op != NULL &&
 		    mem_range_softc.mr_op->reinit != NULL)
 			mem_range_softc.mr_op->reinit(&mem_range_softc);
 	}
 
 	return (sleep_result);
 }
 
 static void
 acpi_alloc_wakeup_handler(void **wakeaddr,
     void *wakept_pages[ACPI_WAKEPT_PAGES])
 {
 	vm_page_t wakept_m[ACPI_WAKEPT_PAGES];
 	int i;
 
 	*wakeaddr = NULL;
 	memset(wakept_pages, 0, ACPI_WAKEPT_PAGES * sizeof(*wakept_pages));
 	memset(wakept_m, 0, ACPI_WAKEPT_PAGES * sizeof(*wakept_m));
 
 	/*
 	 * Specify the region for our wakeup code.  We want it in the
 	 * low 1 MB region, excluding real mode IVT (0-0x3ff), BDA
 	 * (0x400-0x4ff), EBDA (less than 128KB, below 0xa0000, must
 	 * be excluded by SMAP and DSDT), and ROM area (0xa0000 and
 	 * above).
 	 */
 	*wakeaddr = contigmalloc(PAGE_SIZE, M_DEVBUF,
 	    M_NOWAIT, 0x500, 0xa0000, PAGE_SIZE, 0ul);
 	if (*wakeaddr == NULL) {
 		printf("%s: can't alloc wake memory\n", __func__);
 		goto freepages;
 	}
 
 	for (i = 0; i < ACPI_WAKEPT_PAGES - (la57 ? 0 : 1); i++) {
 		wakept_m[i] = pmap_page_alloc_below_4g(true);
 		wakept_pages[i] = (void *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(
 		    wakept_m[i]));
 	}
 	if (EVENTHANDLER_REGISTER(power_resume, acpi_stop_beep, NULL,
 	    EVENTHANDLER_PRI_LAST) == NULL) {
 		printf("%s: can't register event handler\n", __func__);
 		goto freepages;
 	}
 	susppcbs = malloc(mp_ncpus * sizeof(*susppcbs), M_DEVBUF, M_WAITOK);
 	for (i = 0; i < mp_ncpus; i++) {
 		susppcbs[i] = malloc(sizeof(**susppcbs), M_DEVBUF, M_WAITOK);
 		susppcbs[i]->sp_fpususpend = alloc_fpusave(M_WAITOK);
 	}
 	return;
 
 freepages:
-	if (*wakeaddr != NULL)
-		contigfree(*wakeaddr, PAGE_SIZE, M_DEVBUF);
+	free(*wakeaddr, M_DEVBUF);
 	for (i = 0; i < ACPI_WAKEPT_PAGES; i++) {
 		if (wakept_m[i] != NULL)
 			vm_page_free(wakept_m[i]);
 	}
 	*wakeaddr = NULL;
 }
 
 void
 acpi_install_wakeup_handler(struct acpi_softc *sc)
 {
 	static void *wakeaddr;
 	void *wakept_pages[ACPI_WAKEPT_PAGES];
 	uint64_t *pt5, *pt4, *pt3, *pt2_0, *pt2_1, *pt2_2, *pt2_3;
 	vm_paddr_t pt5pa, pt4pa, pt3pa, pt2_0pa, pt2_1pa, pt2_2pa, pt2_3pa;
 	int i;
 
 	if (wakeaddr != NULL)
 		return;
 	acpi_alloc_wakeup_handler(&wakeaddr, wakept_pages);
 	if (wakeaddr == NULL)
 		return;
 
 	sc->acpi_wakeaddr = (vm_offset_t)wakeaddr;
 	sc->acpi_wakephys = vtophys(wakeaddr);
 
 	if (la57) {
 		pt5 = wakept_pages[6];
 		pt5pa = vtophys(pt5);
 	}
 	pt4 = wakept_pages[0];
 	pt3 = wakept_pages[1];
 	pt2_0 = wakept_pages[2];
 	pt2_1 = wakept_pages[3];
 	pt2_2 = wakept_pages[4];
 	pt2_3 = wakept_pages[5];
 	pt4pa = vtophys(pt4);
 	pt3pa = vtophys(pt3);
 	pt2_0pa = vtophys(pt2_0);
 	pt2_1pa = vtophys(pt2_1);
 	pt2_2pa = vtophys(pt2_2);
 	pt2_3pa = vtophys(pt2_3);
 
 	bcopy(wakecode, (void *)sc->acpi_wakeaddr, sizeof(wakecode));
 
 	/* Patch GDT base address, ljmp targets. */
 	WAKECODE_FIXUP((bootgdtdesc + 2), uint32_t,
 	    sc->acpi_wakephys + bootgdt);
 	WAKECODE_FIXUP((wakeup_sw32 + 2), uint32_t,
 	    sc->acpi_wakephys + wakeup_32);
 	WAKECODE_FIXUP((wakeup_sw64 + 1), uint32_t,
 	    sc->acpi_wakephys + wakeup_64);
 	WAKECODE_FIXUP(wakeup_pagetables, uint32_t, la57 ? (pt5pa | 0x1) :
 	    pt4pa);
 
 	/* Save pointers to some global data. */
 	WAKECODE_FIXUP(wakeup_ret, void *, resumectx);
 	/* Create 1:1 mapping for the low 4G */
 	if (la57) {
 		bcopy(kernel_pmap->pm_pmltop, pt5, PAGE_SIZE);
 		pt5[0] = (uint64_t)pt4pa;
 		pt5[0] |= PG_V | PG_RW | PG_U;
 	} else {
 		bcopy(kernel_pmap->pm_pmltop, pt4, PAGE_SIZE);
 	}
 
 	pt4[0] = (uint64_t)pt3pa;
 	pt4[0] |= PG_V | PG_RW | PG_U;
 
 	pt3[0] = (uint64_t)pt2_0pa;
 	pt3[0] |= PG_V | PG_RW | PG_U;
 	pt3[1] = (uint64_t)pt2_1pa;
 	pt3[1] |= PG_V | PG_RW | PG_U;
 	pt3[2] = (uint64_t)pt2_2pa;
 	pt3[2] |= PG_V | PG_RW | PG_U;
 	pt3[3] = (uint64_t)pt2_3pa;
 	pt3[3] |= PG_V | PG_RW | PG_U;
 
 	for (i = 0; i < NPDEPG; i++) {
 		pt2_0[i] = (pd_entry_t)i * NBPDR;
 		pt2_0[i] |= PG_V | PG_RW | PG_PS | PG_U;
 	}
 	for (i = 0; i < NPDEPG; i++) {
 		pt2_1[i] = (pd_entry_t)NBPDP + i * NBPDR;
 		pt2_1[i] |= PG_V | PG_RW | PG_PS | PG_U;
 	}
 	for (i = 0; i < NPDEPG; i++) {
 		pt2_2[i] = (pd_entry_t)2 * NBPDP + i * NBPDR;
 		pt2_2[i] |= PG_V | PG_RW | PG_PS | PG_U;
 	}
 	for (i = 0; i < NPDEPG; i++) {
 		pt2_3[i] = (pd_entry_t)3 * NBPDP + i * NBPDR;
 		pt2_3[i] |= PG_V | PG_RW | PG_PS | PG_U;
 	}
 
 	if (bootverbose)
 		device_printf(sc->acpi_dev, "wakeup code va %#jx pa %#jx\n",
 		    (uintmax_t)sc->acpi_wakeaddr, (uintmax_t)sc->acpi_wakephys);
 }
diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c
index f1106158e44e..b35cf53be080 100644
--- a/sys/amd64/vmm/amd/svm.c
+++ b/sys/amd64/vmm/amd/svm.c
@@ -1,2828 +1,2828 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2013, Anish Gupta (akgupt3@gmail.com)
  * 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 unmodified, 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.
  */
 
 #include <sys/cdefs.h>
 #include "opt_bhyve_snapshot.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/smp.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/pcpu.h>
 #include <sys/proc.h>
 #include <sys/reg.h>
 #include <sys/smr.h>
 #include <sys/sysctl.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>
 
 #include <machine/cpufunc.h>
 #include <machine/psl.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 #include <machine/smp.h>
 #include <machine/vmm.h>
 #include <machine/vmm_dev.h>
 #include <machine/vmm_instruction_emul.h>
 #include <machine/vmm_snapshot.h>
 
 #include "vmm_lapic.h"
 #include "vmm_stat.h"
 #include "vmm_ktr.h"
 #include "vmm_ioport.h"
 #include "vatpic.h"
 #include "vlapic.h"
 #include "vlapic_priv.h"
 
 #include "x86.h"
 #include "vmcb.h"
 #include "svm.h"
 #include "svm_softc.h"
 #include "svm_msr.h"
 #include "npt.h"
 
 SYSCTL_DECL(_hw_vmm);
 SYSCTL_NODE(_hw_vmm, OID_AUTO, svm, CTLFLAG_RW | CTLFLAG_MPSAFE, NULL,
     NULL);
 
 /*
  * SVM CPUID function 0x8000_000A, edx bit decoding.
  */
 #define AMD_CPUID_SVM_NP		BIT(0)  /* Nested paging or RVI */
 #define AMD_CPUID_SVM_LBR		BIT(1)  /* Last branch virtualization */
 #define AMD_CPUID_SVM_SVML		BIT(2)  /* SVM lock */
 #define AMD_CPUID_SVM_NRIP_SAVE		BIT(3)  /* Next RIP is saved */
 #define AMD_CPUID_SVM_TSC_RATE		BIT(4)  /* TSC rate control. */
 #define AMD_CPUID_SVM_VMCB_CLEAN	BIT(5)  /* VMCB state caching */
 #define AMD_CPUID_SVM_FLUSH_BY_ASID	BIT(6)  /* Flush by ASID */
 #define AMD_CPUID_SVM_DECODE_ASSIST	BIT(7)  /* Decode assist */
 #define AMD_CPUID_SVM_PAUSE_INC		BIT(10) /* Pause intercept filter. */
 #define AMD_CPUID_SVM_PAUSE_FTH		BIT(12) /* Pause filter threshold */
 #define	AMD_CPUID_SVM_AVIC		BIT(13)	/* AVIC present */
 
 #define	VMCB_CACHE_DEFAULT	(VMCB_CACHE_ASID 	|	\
 				VMCB_CACHE_IOPM		|	\
 				VMCB_CACHE_I		|	\
 				VMCB_CACHE_TPR		|	\
 				VMCB_CACHE_CR2		|	\
 				VMCB_CACHE_CR		|	\
 				VMCB_CACHE_DR		|	\
 				VMCB_CACHE_DT		|	\
 				VMCB_CACHE_SEG		|	\
 				VMCB_CACHE_NP)
 
 static uint32_t vmcb_clean = VMCB_CACHE_DEFAULT;
 SYSCTL_INT(_hw_vmm_svm, OID_AUTO, vmcb_clean, CTLFLAG_RDTUN, &vmcb_clean,
     0, NULL);
 
 static MALLOC_DEFINE(M_SVM, "svm", "svm");
 static MALLOC_DEFINE(M_SVM_VLAPIC, "svm-vlapic", "svm-vlapic");
 
 static uint32_t svm_feature = ~0U;	/* AMD SVM features. */
 SYSCTL_UINT(_hw_vmm_svm, OID_AUTO, features, CTLFLAG_RDTUN, &svm_feature, 0,
     "SVM features advertised by CPUID.8000000AH:EDX");
 
 static int disable_npf_assist;
 SYSCTL_INT(_hw_vmm_svm, OID_AUTO, disable_npf_assist, CTLFLAG_RWTUN,
     &disable_npf_assist, 0, NULL);
 
 /* Maximum ASIDs supported by the processor */
 static uint32_t nasid;
 SYSCTL_UINT(_hw_vmm_svm, OID_AUTO, num_asids, CTLFLAG_RDTUN, &nasid, 0,
     "Number of ASIDs supported by this processor");
 
 /* Current ASID generation for each host cpu */
 static struct asid asid[MAXCPU];
 
 /* SVM host state saved area of size 4KB for each physical core. */
 static uint8_t *hsave;
 
 static VMM_STAT_AMD(VCPU_EXITINTINFO, "VM exits during event delivery");
 static VMM_STAT_AMD(VCPU_INTINFO_INJECTED, "Events pending at VM entry");
 static VMM_STAT_AMD(VMEXIT_VINTR, "VM exits due to interrupt window");
 
 static int svm_getdesc(void *vcpui, int reg, struct seg_desc *desc);
 static int svm_setreg(void *vcpui, int ident, uint64_t val);
 static int svm_getreg(void *vcpui, int ident, uint64_t *val);
 static __inline int
 flush_by_asid(void)
 {
 
 	return (svm_feature & AMD_CPUID_SVM_FLUSH_BY_ASID);
 }
 
 static __inline int
 decode_assist(void)
 {
 
 	return (svm_feature & AMD_CPUID_SVM_DECODE_ASSIST);
 }
 
 static void
 svm_disable(void *arg __unused)
 {
 	uint64_t efer;
 
 	efer = rdmsr(MSR_EFER);
 	efer &= ~EFER_SVM;
 	wrmsr(MSR_EFER, efer);
 }
 
 /*
  * Disable SVM on all CPUs.
  */
 static int
 svm_modcleanup(void)
 {
 
 	smp_rendezvous(NULL, svm_disable, NULL, NULL);
 
 	if (hsave != NULL)
 		kmem_free(hsave, (mp_maxid + 1) * PAGE_SIZE);
 
 	return (0);
 }
 
 /*
  * Verify that all the features required by bhyve are available.
  */
 static int
 check_svm_features(void)
 {
 	u_int regs[4];
 
 	/* CPUID Fn8000_000A is for SVM */
 	do_cpuid(0x8000000A, regs);
 	svm_feature &= regs[3];
 
 	/*
 	 * The number of ASIDs can be configured to be less than what is
 	 * supported by the hardware but not more.
 	 */
 	if (nasid == 0 || nasid > regs[1])
 		nasid = regs[1];
 	KASSERT(nasid > 1, ("Insufficient ASIDs for guests: %#x", nasid));
 
 	/* bhyve requires the Nested Paging feature */
 	if (!(svm_feature & AMD_CPUID_SVM_NP)) {
 		printf("SVM: Nested Paging feature not available.\n");
 		return (ENXIO);
 	}
 
 	/* bhyve requires the NRIP Save feature */
 	if (!(svm_feature & AMD_CPUID_SVM_NRIP_SAVE)) {
 		printf("SVM: NRIP Save feature not available.\n");
 		return (ENXIO);
 	}
 
 	return (0);
 }
 
 static void
 svm_enable(void *arg __unused)
 {
 	uint64_t efer;
 
 	efer = rdmsr(MSR_EFER);
 	efer |= EFER_SVM;
 	wrmsr(MSR_EFER, efer);
 
 	wrmsr(MSR_VM_HSAVE_PA, vtophys(&hsave[curcpu * PAGE_SIZE]));
 }
 
 /*
  * Return 1 if SVM is enabled on this processor and 0 otherwise.
  */
 static int
 svm_available(void)
 {
 	uint64_t msr;
 
 	/* Section 15.4 Enabling SVM from APM2. */
 	if ((amd_feature2 & AMDID2_SVM) == 0) {
 		printf("SVM: not available.\n");
 		return (0);
 	}
 
 	msr = rdmsr(MSR_VM_CR);
 	if ((msr & VM_CR_SVMDIS) != 0) {
 		printf("SVM: disabled by BIOS.\n");
 		return (0);
 	}
 
 	return (1);
 }
 
 static int
 svm_modinit(int ipinum)
 {
 	int error, cpu;
 
 	if (!svm_available())
 		return (ENXIO);
 
 	error = check_svm_features();
 	if (error)
 		return (error);
 
 	vmcb_clean &= VMCB_CACHE_DEFAULT;
 
 	for (cpu = 0; cpu < MAXCPU; cpu++) {
 		/*
 		 * Initialize the host ASIDs to their "highest" valid values.
 		 *
 		 * The next ASID allocation will rollover both 'gen' and 'num'
 		 * and start off the sequence at {1,1}.
 		 */
 		asid[cpu].gen = ~0UL;
 		asid[cpu].num = nasid - 1;
 	}
 
 	svm_msr_init();
 	svm_npt_init(ipinum);
 
 	/* Enable SVM on all CPUs */
 	hsave = kmem_malloc((mp_maxid + 1) * PAGE_SIZE, M_WAITOK | M_ZERO);
 	smp_rendezvous(NULL, svm_enable, NULL, NULL);
 
 	return (0);
 }
 
 static void
 svm_modresume(void)
 {
 
 	svm_enable(NULL);
 }		
 
 #ifdef BHYVE_SNAPSHOT
 void
 svm_set_tsc_offset(struct svm_vcpu *vcpu, uint64_t offset)
 {
 	struct vmcb_ctrl *ctrl;
 
 	ctrl = svm_get_vmcb_ctrl(vcpu);
 	ctrl->tsc_offset = offset;
 
 	svm_set_dirty(vcpu, VMCB_CACHE_I);
 	SVM_CTR1(vcpu, "tsc offset changed to %#lx", offset);
 
 	vm_set_tsc_offset(vcpu->vcpu, offset);
 }
 #endif
 
 /* Pentium compatible MSRs */
 #define MSR_PENTIUM_START 	0	
 #define MSR_PENTIUM_END 	0x1FFF
 /* AMD 6th generation and Intel compatible MSRs */
 #define MSR_AMD6TH_START 	0xC0000000UL	
 #define MSR_AMD6TH_END 		0xC0001FFFUL	
 /* AMD 7th and 8th generation compatible MSRs */
 #define MSR_AMD7TH_START 	0xC0010000UL	
 #define MSR_AMD7TH_END 		0xC0011FFFUL	
 
 /*
  * Get the index and bit position for a MSR in permission bitmap.
  * Two bits are used for each MSR: lower bit for read and higher bit for write.
  */
 static int
 svm_msr_index(uint64_t msr, int *index, int *bit)
 {
 	uint32_t base, off;
 
 	*index = -1;
 	*bit = (msr % 4) * 2;
 	base = 0;
 
 	if (msr >= MSR_PENTIUM_START && msr <= MSR_PENTIUM_END) {
 		*index = msr / 4;
 		return (0);
 	}
 
 	base += (MSR_PENTIUM_END - MSR_PENTIUM_START + 1); 
 	if (msr >= MSR_AMD6TH_START && msr <= MSR_AMD6TH_END) {
 		off = (msr - MSR_AMD6TH_START); 
 		*index = (off + base) / 4;
 		return (0);
 	} 
 
 	base += (MSR_AMD6TH_END - MSR_AMD6TH_START + 1);
 	if (msr >= MSR_AMD7TH_START && msr <= MSR_AMD7TH_END) {
 		off = (msr - MSR_AMD7TH_START);
 		*index = (off + base) / 4;
 		return (0);
 	}
 
 	return (EINVAL);
 }
 
 /*
  * Allow vcpu to read or write the 'msr' without trapping into the hypervisor.
  */
 static void
 svm_msr_perm(uint8_t *perm_bitmap, uint64_t msr, bool read, bool write)
 {
 	int index, bit, error __diagused;
 
 	error = svm_msr_index(msr, &index, &bit);
 	KASSERT(error == 0, ("%s: invalid msr %#lx", __func__, msr));
 	KASSERT(index >= 0 && index < SVM_MSR_BITMAP_SIZE,
 	    ("%s: invalid index %d for msr %#lx", __func__, index, msr));
 	KASSERT(bit >= 0 && bit <= 6, ("%s: invalid bit position %d "
 	    "msr %#lx", __func__, bit, msr));
 
 	if (read)
 		perm_bitmap[index] &= ~(1UL << bit);
 
 	if (write)
 		perm_bitmap[index] &= ~(2UL << bit);
 }
 
 static void
 svm_msr_rw_ok(uint8_t *perm_bitmap, uint64_t msr)
 {
 
 	svm_msr_perm(perm_bitmap, msr, true, true);
 }
 
 static void
 svm_msr_rd_ok(uint8_t *perm_bitmap, uint64_t msr)
 {
 
 	svm_msr_perm(perm_bitmap, msr, true, false);
 }
 
 static __inline int
 svm_get_intercept(struct svm_vcpu *vcpu, int idx, uint32_t bitmask)
 {
 	struct vmcb_ctrl *ctrl;
 
 	KASSERT(idx >=0 && idx < 5, ("invalid intercept index %d", idx));
 
 	ctrl = svm_get_vmcb_ctrl(vcpu);
 	return (ctrl->intercept[idx] & bitmask ? 1 : 0);
 }
 
 static __inline void
 svm_set_intercept(struct svm_vcpu *vcpu, int idx, uint32_t bitmask, int enabled)
 {
 	struct vmcb_ctrl *ctrl;
 	uint32_t oldval;
 
 	KASSERT(idx >=0 && idx < 5, ("invalid intercept index %d", idx));
 
 	ctrl = svm_get_vmcb_ctrl(vcpu);
 	oldval = ctrl->intercept[idx];
 
 	if (enabled)
 		ctrl->intercept[idx] |= bitmask;
 	else
 		ctrl->intercept[idx] &= ~bitmask;
 
 	if (ctrl->intercept[idx] != oldval) {
 		svm_set_dirty(vcpu, VMCB_CACHE_I);
 		SVM_CTR3(vcpu, "intercept[%d] modified from %#x to %#x", idx,
 		    oldval, ctrl->intercept[idx]);
 	}
 }
 
 static __inline void
 svm_disable_intercept(struct svm_vcpu *vcpu, int off, uint32_t bitmask)
 {
 
 	svm_set_intercept(vcpu, off, bitmask, 0);
 }
 
 static __inline void
 svm_enable_intercept(struct svm_vcpu *vcpu, int off, uint32_t bitmask)
 {
 
 	svm_set_intercept(vcpu, off, bitmask, 1);
 }
 
 static void
 vmcb_init(struct svm_softc *sc, struct svm_vcpu *vcpu, uint64_t iopm_base_pa,
     uint64_t msrpm_base_pa, uint64_t np_pml4)
 {
 	struct vmcb_ctrl *ctrl;
 	struct vmcb_state *state;
 	uint32_t mask;
 	int n;
 
 	ctrl = svm_get_vmcb_ctrl(vcpu);
 	state = svm_get_vmcb_state(vcpu);
 
 	ctrl->iopm_base_pa = iopm_base_pa;
 	ctrl->msrpm_base_pa = msrpm_base_pa;
 
 	/* Enable nested paging */
 	ctrl->np_enable = 1;
 	ctrl->n_cr3 = np_pml4;
 
 	/*
 	 * Intercept accesses to the control registers that are not shadowed
 	 * in the VMCB - i.e. all except cr0, cr2, cr3, cr4 and cr8.
 	 */
 	for (n = 0; n < 16; n++) {
 		mask = (BIT(n) << 16) | BIT(n);
 		if (n == 0 || n == 2 || n == 3 || n == 4 || n == 8)
 			svm_disable_intercept(vcpu, VMCB_CR_INTCPT, mask);
 		else
 			svm_enable_intercept(vcpu, VMCB_CR_INTCPT, mask);
 	}
 
 	/*
 	 * Intercept everything when tracing guest exceptions otherwise
 	 * just intercept machine check exception.
 	 */
 	if (vcpu_trace_exceptions(vcpu->vcpu)) {
 		for (n = 0; n < 32; n++) {
 			/*
 			 * Skip unimplemented vectors in the exception bitmap.
 			 */
 			if (n == 2 || n == 9) {
 				continue;
 			}
 			svm_enable_intercept(vcpu, VMCB_EXC_INTCPT, BIT(n));
 		}
 	} else {
 		svm_enable_intercept(vcpu, VMCB_EXC_INTCPT, BIT(IDT_MC));
 	}
 
 	/* Intercept various events (for e.g. I/O, MSR and CPUID accesses) */
 	svm_enable_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_IO);
 	svm_enable_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_MSR);
 	svm_enable_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_CPUID);
 	svm_enable_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_INTR);
 	svm_enable_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_INIT);
 	svm_enable_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_NMI);
 	svm_enable_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_SMI);
 	svm_enable_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_SHUTDOWN);
 	svm_enable_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_FERR_FREEZE);
 	svm_enable_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_INVD);
 	svm_enable_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_INVLPGA);
 
 	svm_enable_intercept(vcpu, VMCB_CTRL2_INTCPT, VMCB_INTCPT_MONITOR);
 	svm_enable_intercept(vcpu, VMCB_CTRL2_INTCPT, VMCB_INTCPT_MWAIT);
 
 	/*
 	 * Intercept SVM instructions since AMD enables them in guests otherwise.
 	 * Non-intercepted VMMCALL causes #UD, skip it.
 	 */
 	svm_enable_intercept(vcpu, VMCB_CTRL2_INTCPT, VMCB_INTCPT_VMLOAD);
 	svm_enable_intercept(vcpu, VMCB_CTRL2_INTCPT, VMCB_INTCPT_VMSAVE);
 	svm_enable_intercept(vcpu, VMCB_CTRL2_INTCPT, VMCB_INTCPT_STGI);
 	svm_enable_intercept(vcpu, VMCB_CTRL2_INTCPT, VMCB_INTCPT_CLGI);
 	svm_enable_intercept(vcpu, VMCB_CTRL2_INTCPT, VMCB_INTCPT_SKINIT);
 	svm_enable_intercept(vcpu, VMCB_CTRL2_INTCPT, VMCB_INTCPT_ICEBP);
 	if (vcpu_trap_wbinvd(vcpu->vcpu)) {
 		svm_enable_intercept(vcpu, VMCB_CTRL2_INTCPT,
 		    VMCB_INTCPT_WBINVD);
 	}
 
 	/*
 	 * From section "Canonicalization and Consistency Checks" in APMv2
 	 * the VMRUN intercept bit must be set to pass the consistency check.
 	 */
 	svm_enable_intercept(vcpu, VMCB_CTRL2_INTCPT, VMCB_INTCPT_VMRUN);
 
 	/*
 	 * The ASID will be set to a non-zero value just before VMRUN.
 	 */
 	ctrl->asid = 0;
 
 	/*
 	 * Section 15.21.1, Interrupt Masking in EFLAGS
 	 * Section 15.21.2, Virtualizing APIC.TPR
 	 *
 	 * This must be set for %rflag and %cr8 isolation of guest and host.
 	 */
 	ctrl->v_intr_masking = 1;
 
 	/* Enable Last Branch Record aka LBR for debugging */
 	ctrl->lbr_virt_en = 1;
 	state->dbgctl = BIT(0);
 
 	/* EFER_SVM must always be set when the guest is executing */
 	state->efer = EFER_SVM;
 
 	/* Set up the PAT to power-on state */
 	state->g_pat = PAT_VALUE(0, PAT_WRITE_BACK)	|
 	    PAT_VALUE(1, PAT_WRITE_THROUGH)	|
 	    PAT_VALUE(2, PAT_UNCACHED)		|
 	    PAT_VALUE(3, PAT_UNCACHEABLE)	|
 	    PAT_VALUE(4, PAT_WRITE_BACK)	|
 	    PAT_VALUE(5, PAT_WRITE_THROUGH)	|
 	    PAT_VALUE(6, PAT_UNCACHED)		|
 	    PAT_VALUE(7, PAT_UNCACHEABLE);
 
 	/* Set up DR6/7 to power-on state */
 	state->dr6 = DBREG_DR6_RESERVED1;
 	state->dr7 = DBREG_DR7_RESERVED1;
 }
 
 /*
  * Initialize a virtual machine.
  */
 static void *
 svm_init(struct vm *vm, pmap_t pmap)
 {
 	struct svm_softc *svm_sc;
 
 	svm_sc = malloc(sizeof (*svm_sc), M_SVM, M_WAITOK | M_ZERO);
 
 	svm_sc->msr_bitmap = contigmalloc(SVM_MSR_BITMAP_SIZE, M_SVM,
 	    M_WAITOK, 0, ~(vm_paddr_t)0, PAGE_SIZE, 0);
 	if (svm_sc->msr_bitmap == NULL)
 		panic("contigmalloc of SVM MSR bitmap failed");
 	svm_sc->iopm_bitmap = contigmalloc(SVM_IO_BITMAP_SIZE, M_SVM,
 	    M_WAITOK, 0, ~(vm_paddr_t)0, PAGE_SIZE, 0);
 	if (svm_sc->iopm_bitmap == NULL)
 		panic("contigmalloc of SVM IO bitmap failed");
 
 	svm_sc->vm = vm;
 	svm_sc->nptp = vtophys(pmap->pm_pmltop);
 
 	/*
 	 * Intercept read and write accesses to all MSRs.
 	 */
 	memset(svm_sc->msr_bitmap, 0xFF, SVM_MSR_BITMAP_SIZE);
 
 	/*
 	 * Access to the following MSRs is redirected to the VMCB when the
 	 * guest is executing. Therefore it is safe to allow the guest to
 	 * read/write these MSRs directly without hypervisor involvement.
 	 */
 	svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_GSBASE);
 	svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_FSBASE);
 	svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_KGSBASE);
 
 	svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_STAR);
 	svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_LSTAR);
 	svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_CSTAR);
 	svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_SF_MASK);
 	svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_SYSENTER_CS_MSR);
 	svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_SYSENTER_ESP_MSR);
 	svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_SYSENTER_EIP_MSR);
 	svm_msr_rw_ok(svm_sc->msr_bitmap, MSR_PAT);
 
 	svm_msr_rd_ok(svm_sc->msr_bitmap, MSR_TSC);
 
 	/*
 	 * Intercept writes to make sure that the EFER_SVM bit is not cleared.
 	 */
 	svm_msr_rd_ok(svm_sc->msr_bitmap, MSR_EFER);
 
 	/* Intercept access to all I/O ports. */
 	memset(svm_sc->iopm_bitmap, 0xFF, SVM_IO_BITMAP_SIZE);
 
 	return (svm_sc);
 }
 
 static void *
 svm_vcpu_init(void *vmi, struct vcpu *vcpu1, int vcpuid)
 {
 	struct svm_softc *sc = vmi;
 	struct svm_vcpu *vcpu;
 
 	vcpu = malloc(sizeof(*vcpu), M_SVM, M_WAITOK | M_ZERO);
 	vcpu->sc = sc;
 	vcpu->vcpu = vcpu1;
 	vcpu->vcpuid = vcpuid;
 	vcpu->vmcb = malloc_aligned(sizeof(struct vmcb), PAGE_SIZE, M_SVM,
 	    M_WAITOK | M_ZERO);
 	vcpu->nextrip = ~0;
 	vcpu->lastcpu = NOCPU;
 	vcpu->vmcb_pa = vtophys(vcpu->vmcb);
 	vmcb_init(sc, vcpu, vtophys(sc->iopm_bitmap), vtophys(sc->msr_bitmap),
 	    sc->nptp);
 	svm_msr_guest_init(sc, vcpu);
 	return (vcpu);
 }
 
 /*
  * Collateral for a generic SVM VM-exit.
  */
 static void
 vm_exit_svm(struct vm_exit *vme, uint64_t code, uint64_t info1, uint64_t info2)
 {
 
 	vme->exitcode = VM_EXITCODE_SVM;
 	vme->u.svm.exitcode = code;
 	vme->u.svm.exitinfo1 = info1;
 	vme->u.svm.exitinfo2 = info2;
 }
 
 static int
 svm_cpl(struct vmcb_state *state)
 {
 
 	/*
 	 * From APMv2:
 	 *   "Retrieve the CPL from the CPL field in the VMCB, not
 	 *    from any segment DPL"
 	 */
 	return (state->cpl);
 }
 
 static enum vm_cpu_mode
 svm_vcpu_mode(struct vmcb *vmcb)
 {
 	struct vmcb_segment seg;
 	struct vmcb_state *state;
 	int error __diagused;
 
 	state = &vmcb->state;
 
 	if (state->efer & EFER_LMA) {
 		error = vmcb_seg(vmcb, VM_REG_GUEST_CS, &seg);
 		KASSERT(error == 0, ("%s: vmcb_seg(cs) error %d", __func__,
 		    error));
 
 		/*
 		 * Section 4.8.1 for APM2, check if Code Segment has
 		 * Long attribute set in descriptor.
 		 */
 		if (seg.attrib & VMCB_CS_ATTRIB_L)
 			return (CPU_MODE_64BIT);
 		else
 			return (CPU_MODE_COMPATIBILITY);
 	} else  if (state->cr0 & CR0_PE) {
 		return (CPU_MODE_PROTECTED);
 	} else {
 		return (CPU_MODE_REAL);
 	}
 }
 
 static enum vm_paging_mode
 svm_paging_mode(uint64_t cr0, uint64_t cr4, uint64_t efer)
 {
 
 	if ((cr0 & CR0_PG) == 0)
 		return (PAGING_MODE_FLAT);
 	if ((cr4 & CR4_PAE) == 0)
 		return (PAGING_MODE_32);
 	if (efer & EFER_LME)
 		return (PAGING_MODE_64);
 	else
 		return (PAGING_MODE_PAE);
 }
 
 /*
  * ins/outs utility routines
  */
 static uint64_t
 svm_inout_str_index(struct svm_regctx *regs, int in)
 {
 	uint64_t val;
 
 	val = in ? regs->sctx_rdi : regs->sctx_rsi;
 
 	return (val);
 }
 
 static uint64_t
 svm_inout_str_count(struct svm_regctx *regs, int rep)
 {
 	uint64_t val;
 
 	val = rep ? regs->sctx_rcx : 1;
 
 	return (val);
 }
 
 static void
 svm_inout_str_seginfo(struct svm_vcpu *vcpu, int64_t info1, int in,
     struct vm_inout_str *vis)
 {
 	int error __diagused, s;
 
 	if (in) {
 		vis->seg_name = VM_REG_GUEST_ES;
 	} else {
 		/* The segment field has standard encoding */
 		s = (info1 >> 10) & 0x7;
 		vis->seg_name = vm_segment_name(s);
 	}
 
 	error = svm_getdesc(vcpu, vis->seg_name, &vis->seg_desc);
 	KASSERT(error == 0, ("%s: svm_getdesc error %d", __func__, error));
 }
 
 static int
 svm_inout_str_addrsize(uint64_t info1)
 {
         uint32_t size;
 
         size = (info1 >> 7) & 0x7;
         switch (size) {
         case 1:
                 return (2);     /* 16 bit */
         case 2:
                 return (4);     /* 32 bit */
         case 4:
                 return (8);     /* 64 bit */
         default:
                 panic("%s: invalid size encoding %d", __func__, size);
         }
 }
 
 static void
 svm_paging_info(struct vmcb *vmcb, struct vm_guest_paging *paging)
 {
 	struct vmcb_state *state;
 
 	state = &vmcb->state;
 	paging->cr3 = state->cr3;
 	paging->cpl = svm_cpl(state);
 	paging->cpu_mode = svm_vcpu_mode(vmcb);
 	paging->paging_mode = svm_paging_mode(state->cr0, state->cr4,
 	    state->efer);
 }
 
 #define	UNHANDLED 0
 
 /*
  * Handle guest I/O intercept.
  */
 static int
 svm_handle_io(struct svm_vcpu *vcpu, struct vm_exit *vmexit)
 {
 	struct vmcb_ctrl *ctrl;
 	struct vmcb_state *state;
 	struct svm_regctx *regs;
 	struct vm_inout_str *vis;
 	uint64_t info1;
 	int inout_string;
 
 	state = svm_get_vmcb_state(vcpu);
 	ctrl  = svm_get_vmcb_ctrl(vcpu);
 	regs  = svm_get_guest_regctx(vcpu);
 
 	info1 = ctrl->exitinfo1;
 	inout_string = info1 & BIT(2) ? 1 : 0;
 
 	/*
 	 * The effective segment number in EXITINFO1[12:10] is populated
 	 * only if the processor has the DecodeAssist capability.
 	 *
 	 * XXX this is not specified explicitly in APMv2 but can be verified
 	 * empirically.
 	 */
 	if (inout_string && !decode_assist())
 		return (UNHANDLED);
 
 	vmexit->exitcode 	= VM_EXITCODE_INOUT;
 	vmexit->u.inout.in 	= (info1 & BIT(0)) ? 1 : 0;
 	vmexit->u.inout.string 	= inout_string;
 	vmexit->u.inout.rep 	= (info1 & BIT(3)) ? 1 : 0;
 	vmexit->u.inout.bytes 	= (info1 >> 4) & 0x7;
 	vmexit->u.inout.port 	= (uint16_t)(info1 >> 16);
 	vmexit->u.inout.eax 	= (uint32_t)(state->rax);
 
 	if (inout_string) {
 		vmexit->exitcode = VM_EXITCODE_INOUT_STR;
 		vis = &vmexit->u.inout_str;
 		svm_paging_info(svm_get_vmcb(vcpu), &vis->paging);
 		vis->rflags = state->rflags;
 		vis->cr0 = state->cr0;
 		vis->index = svm_inout_str_index(regs, vmexit->u.inout.in);
 		vis->count = svm_inout_str_count(regs, vmexit->u.inout.rep);
 		vis->addrsize = svm_inout_str_addrsize(info1);
 		svm_inout_str_seginfo(vcpu, info1, vmexit->u.inout.in, vis);
 	}
 
 	return (UNHANDLED);
 }
 
 static int
 npf_fault_type(uint64_t exitinfo1)
 {
 
 	if (exitinfo1 & VMCB_NPF_INFO1_W)
 		return (VM_PROT_WRITE);
 	else if (exitinfo1 & VMCB_NPF_INFO1_ID)
 		return (VM_PROT_EXECUTE);
 	else
 		return (VM_PROT_READ);
 }
 
 static bool
 svm_npf_emul_fault(uint64_t exitinfo1)
 {
 
 	if (exitinfo1 & VMCB_NPF_INFO1_ID) {
 		return (false);
 	}
 
 	if (exitinfo1 & VMCB_NPF_INFO1_GPT) {
 		return (false);
 	}
 
 	if ((exitinfo1 & VMCB_NPF_INFO1_GPA) == 0) {
 		return (false);
 	}
 
 	return (true);	
 }
 
 static void
 svm_handle_inst_emul(struct vmcb *vmcb, uint64_t gpa, struct vm_exit *vmexit)
 {
 	struct vm_guest_paging *paging;
 	struct vmcb_segment seg;
 	struct vmcb_ctrl *ctrl;
 	char *inst_bytes;
 	int error __diagused, inst_len;
 
 	ctrl = &vmcb->ctrl;
 	paging = &vmexit->u.inst_emul.paging;
 
 	vmexit->exitcode = VM_EXITCODE_INST_EMUL;
 	vmexit->u.inst_emul.gpa = gpa;
 	vmexit->u.inst_emul.gla = VIE_INVALID_GLA;
 	svm_paging_info(vmcb, paging);
 
 	error = vmcb_seg(vmcb, VM_REG_GUEST_CS, &seg);
 	KASSERT(error == 0, ("%s: vmcb_seg(CS) error %d", __func__, error));
 
 	switch(paging->cpu_mode) {
 	case CPU_MODE_REAL:
 		vmexit->u.inst_emul.cs_base = seg.base;
 		vmexit->u.inst_emul.cs_d = 0;
 		break;
 	case CPU_MODE_PROTECTED:
 	case CPU_MODE_COMPATIBILITY:
 		vmexit->u.inst_emul.cs_base = seg.base;
 
 		/*
 		 * Section 4.8.1 of APM2, Default Operand Size or D bit.
 		 */
 		vmexit->u.inst_emul.cs_d = (seg.attrib & VMCB_CS_ATTRIB_D) ?
 		    1 : 0;
 		break;
 	default:
 		vmexit->u.inst_emul.cs_base = 0;
 		vmexit->u.inst_emul.cs_d = 0;
 		break;	
 	}
 
 	/*
 	 * Copy the instruction bytes into 'vie' if available.
 	 */
 	if (decode_assist() && !disable_npf_assist) {
 		inst_len = ctrl->inst_len;
 		inst_bytes = ctrl->inst_bytes;
 	} else {
 		inst_len = 0;
 		inst_bytes = NULL;
 	}
 	vie_init(&vmexit->u.inst_emul.vie, inst_bytes, inst_len);
 }
 
 #ifdef KTR
 static const char *
 intrtype_to_str(int intr_type)
 {
 	switch (intr_type) {
 	case VMCB_EVENTINJ_TYPE_INTR:
 		return ("hwintr");
 	case VMCB_EVENTINJ_TYPE_NMI:
 		return ("nmi");
 	case VMCB_EVENTINJ_TYPE_INTn:
 		return ("swintr");
 	case VMCB_EVENTINJ_TYPE_EXCEPTION:
 		return ("exception");
 	default:
 		panic("%s: unknown intr_type %d", __func__, intr_type);
 	}
 }
 #endif
 
 /*
  * Inject an event to vcpu as described in section 15.20, "Event injection".
  */
 static void
 svm_eventinject(struct svm_vcpu *vcpu, int intr_type, int vector,
     uint32_t error, bool ec_valid)
 {
 	struct vmcb_ctrl *ctrl;
 
 	ctrl = svm_get_vmcb_ctrl(vcpu);
 
 	KASSERT((ctrl->eventinj & VMCB_EVENTINJ_VALID) == 0,
 	    ("%s: event already pending %#lx", __func__, ctrl->eventinj));
 
 	KASSERT(vector >=0 && vector <= 255, ("%s: invalid vector %d",
 	    __func__, vector));
 
 	switch (intr_type) {
 	case VMCB_EVENTINJ_TYPE_INTR:
 	case VMCB_EVENTINJ_TYPE_NMI:
 	case VMCB_EVENTINJ_TYPE_INTn:
 		break;
 	case VMCB_EVENTINJ_TYPE_EXCEPTION:
 		if (vector >= 0 && vector <= 31 && vector != 2)
 			break;
 		/* FALLTHROUGH */
 	default:
 		panic("%s: invalid intr_type/vector: %d/%d", __func__,
 		    intr_type, vector);
 	}
 	ctrl->eventinj = vector | (intr_type << 8) | VMCB_EVENTINJ_VALID;
 	if (ec_valid) {
 		ctrl->eventinj |= VMCB_EVENTINJ_EC_VALID;
 		ctrl->eventinj |= (uint64_t)error << 32;
 		SVM_CTR3(vcpu, "Injecting %s at vector %d errcode %#x",
 		    intrtype_to_str(intr_type), vector, error);
 	} else {
 		SVM_CTR2(vcpu, "Injecting %s at vector %d",
 		    intrtype_to_str(intr_type), vector);
 	}
 }
 
 static void
 svm_update_virqinfo(struct svm_vcpu *vcpu)
 {
 	struct vlapic *vlapic;
 	struct vmcb_ctrl *ctrl;
 
 	vlapic = vm_lapic(vcpu->vcpu);
 	ctrl = svm_get_vmcb_ctrl(vcpu);
 
 	/* Update %cr8 in the emulated vlapic */
 	vlapic_set_cr8(vlapic, ctrl->v_tpr);
 
 	/* Virtual interrupt injection is not used. */
 	KASSERT(ctrl->v_intr_vector == 0, ("%s: invalid "
 	    "v_intr_vector %d", __func__, ctrl->v_intr_vector));
 }
 
 static void
 svm_save_intinfo(struct svm_softc *svm_sc, struct svm_vcpu *vcpu)
 {
 	struct vmcb_ctrl *ctrl;
 	uint64_t intinfo;
 
 	ctrl = svm_get_vmcb_ctrl(vcpu);
 	intinfo = ctrl->exitintinfo;	
 	if (!VMCB_EXITINTINFO_VALID(intinfo))
 		return;
 
 	/*
 	 * From APMv2, Section "Intercepts during IDT interrupt delivery"
 	 *
 	 * If a #VMEXIT happened during event delivery then record the event
 	 * that was being delivered.
 	 */
 	SVM_CTR2(vcpu, "SVM:Pending INTINFO(0x%lx), vector=%d.\n", intinfo,
 	    VMCB_EXITINTINFO_VECTOR(intinfo));
 	vmm_stat_incr(vcpu->vcpu, VCPU_EXITINTINFO, 1);
 	vm_exit_intinfo(vcpu->vcpu, intinfo);
 }
 
 #ifdef INVARIANTS
 static __inline int
 vintr_intercept_enabled(struct svm_vcpu *vcpu)
 {
 
 	return (svm_get_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_VINTR));
 }
 #endif
 
 static __inline void
 enable_intr_window_exiting(struct svm_vcpu *vcpu)
 {
 	struct vmcb_ctrl *ctrl;
 
 	ctrl = svm_get_vmcb_ctrl(vcpu);
 
 	if (ctrl->v_irq && ctrl->v_intr_vector == 0) {
 		KASSERT(ctrl->v_ign_tpr, ("%s: invalid v_ign_tpr", __func__));
 		KASSERT(vintr_intercept_enabled(vcpu),
 		    ("%s: vintr intercept should be enabled", __func__));
 		return;
 	}
 
 	SVM_CTR0(vcpu, "Enable intr window exiting");
 	ctrl->v_irq = 1;
 	ctrl->v_ign_tpr = 1;
 	ctrl->v_intr_vector = 0;
 	svm_set_dirty(vcpu, VMCB_CACHE_TPR);
 	svm_enable_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_VINTR);
 }
 
 static __inline void
 disable_intr_window_exiting(struct svm_vcpu *vcpu)
 {
 	struct vmcb_ctrl *ctrl;
 
 	ctrl = svm_get_vmcb_ctrl(vcpu);
 
 	if (!ctrl->v_irq && ctrl->v_intr_vector == 0) {
 		KASSERT(!vintr_intercept_enabled(vcpu),
 		    ("%s: vintr intercept should be disabled", __func__));
 		return;
 	}
 
 	SVM_CTR0(vcpu, "Disable intr window exiting");
 	ctrl->v_irq = 0;
 	ctrl->v_intr_vector = 0;
 	svm_set_dirty(vcpu, VMCB_CACHE_TPR);
 	svm_disable_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_VINTR);
 }
 
 static int
 svm_modify_intr_shadow(struct svm_vcpu *vcpu, uint64_t val)
 {
 	struct vmcb_ctrl *ctrl;
 	int oldval, newval;
 
 	ctrl = svm_get_vmcb_ctrl(vcpu);
 	oldval = ctrl->intr_shadow;
 	newval = val ? 1 : 0;
 	if (newval != oldval) {
 		ctrl->intr_shadow = newval;
 		SVM_CTR1(vcpu, "Setting intr_shadow to %d", newval);
 	}
 	return (0);
 }
 
 static int
 svm_get_intr_shadow(struct svm_vcpu *vcpu, uint64_t *val)
 {
 	struct vmcb_ctrl *ctrl;
 
 	ctrl = svm_get_vmcb_ctrl(vcpu);
 	*val = ctrl->intr_shadow;
 	return (0);
 }
 
 /*
  * Once an NMI is injected it blocks delivery of further NMIs until the handler
  * executes an IRET. The IRET intercept is enabled when an NMI is injected to
  * to track when the vcpu is done handling the NMI.
  */
 static int
 nmi_blocked(struct svm_vcpu *vcpu)
 {
 	int blocked;
 
 	blocked = svm_get_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_IRET);
 	return (blocked);
 }
 
 static void
 enable_nmi_blocking(struct svm_vcpu *vcpu)
 {
 
 	KASSERT(!nmi_blocked(vcpu), ("vNMI already blocked"));
 	SVM_CTR0(vcpu, "vNMI blocking enabled");
 	svm_enable_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_IRET);
 }
 
 static void
 clear_nmi_blocking(struct svm_vcpu *vcpu)
 {
 	int error __diagused;
 
 	KASSERT(nmi_blocked(vcpu), ("vNMI already unblocked"));
 	SVM_CTR0(vcpu, "vNMI blocking cleared");
 	/*
 	 * When the IRET intercept is cleared the vcpu will attempt to execute
 	 * the "iret" when it runs next. However, it is possible to inject
 	 * another NMI into the vcpu before the "iret" has actually executed.
 	 *
 	 * For e.g. if the "iret" encounters a #NPF when accessing the stack
 	 * it will trap back into the hypervisor. If an NMI is pending for
 	 * the vcpu it will be injected into the guest.
 	 *
 	 * XXX this needs to be fixed
 	 */
 	svm_disable_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_IRET);
 
 	/*
 	 * Set 'intr_shadow' to prevent an NMI from being injected on the
 	 * immediate VMRUN.
 	 */
 	error = svm_modify_intr_shadow(vcpu, 1);
 	KASSERT(!error, ("%s: error %d setting intr_shadow", __func__, error));
 }
 
 #define	EFER_MBZ_BITS	0xFFFFFFFFFFFF0200UL
 
 static int
 svm_write_efer(struct svm_softc *sc, struct svm_vcpu *vcpu, uint64_t newval,
     bool *retu)
 {
 	struct vm_exit *vme;
 	struct vmcb_state *state;
 	uint64_t changed, lma, oldval;
 	int error __diagused;
 
 	state = svm_get_vmcb_state(vcpu);
 
 	oldval = state->efer;
 	SVM_CTR2(vcpu, "wrmsr(efer) %#lx/%#lx", oldval, newval);
 
 	newval &= ~0xFE;		/* clear the Read-As-Zero (RAZ) bits */
 	changed = oldval ^ newval;
 
 	if (newval & EFER_MBZ_BITS)
 		goto gpf;
 
 	/* APMv2 Table 14-5 "Long-Mode Consistency Checks" */
 	if (changed & EFER_LME) {
 		if (state->cr0 & CR0_PG)
 			goto gpf;
 	}
 
 	/* EFER.LMA = EFER.LME & CR0.PG */
 	if ((newval & EFER_LME) != 0 && (state->cr0 & CR0_PG) != 0)
 		lma = EFER_LMA;
 	else
 		lma = 0;
 
 	if ((newval & EFER_LMA) != lma)
 		goto gpf;
 
 	if (newval & EFER_NXE) {
 		if (!vm_cpuid_capability(vcpu->vcpu, VCC_NO_EXECUTE))
 			goto gpf;
 	}
 
 	/*
 	 * XXX bhyve does not enforce segment limits in 64-bit mode. Until
 	 * this is fixed flag guest attempt to set EFER_LMSLE as an error.
 	 */
 	if (newval & EFER_LMSLE) {
 		vme = vm_exitinfo(vcpu->vcpu);
 		vm_exit_svm(vme, VMCB_EXIT_MSR, 1, 0);
 		*retu = true;
 		return (0);
 	}
 
 	if (newval & EFER_FFXSR) {
 		if (!vm_cpuid_capability(vcpu->vcpu, VCC_FFXSR))
 			goto gpf;
 	}
 
 	if (newval & EFER_TCE) {
 		if (!vm_cpuid_capability(vcpu->vcpu, VCC_TCE))
 			goto gpf;
 	}
 
 	error = svm_setreg(vcpu, VM_REG_GUEST_EFER, newval);
 	KASSERT(error == 0, ("%s: error %d updating efer", __func__, error));
 	return (0);
 gpf:
 	vm_inject_gp(vcpu->vcpu);
 	return (0);
 }
 
 static int
 emulate_wrmsr(struct svm_softc *sc, struct svm_vcpu *vcpu, u_int num,
     uint64_t val, bool *retu)
 {
 	int error;
 
 	if (lapic_msr(num))
 		error = lapic_wrmsr(vcpu->vcpu, num, val, retu);
 	else if (num == MSR_EFER)
 		error = svm_write_efer(sc, vcpu, val, retu);
 	else
 		error = svm_wrmsr(vcpu, num, val, retu);
 
 	return (error);
 }
 
 static int
 emulate_rdmsr(struct svm_vcpu *vcpu, u_int num, bool *retu)
 {
 	struct vmcb_state *state;
 	struct svm_regctx *ctx;
 	uint64_t result;
 	int error;
 
 	if (lapic_msr(num))
 		error = lapic_rdmsr(vcpu->vcpu, num, &result, retu);
 	else
 		error = svm_rdmsr(vcpu, num, &result, retu);
 
 	if (error == 0) {
 		state = svm_get_vmcb_state(vcpu);
 		ctx = svm_get_guest_regctx(vcpu);
 		state->rax = result & 0xffffffff;
 		ctx->sctx_rdx = result >> 32;
 	}
 
 	return (error);
 }
 
 #ifdef KTR
 static const char *
 exit_reason_to_str(uint64_t reason)
 {
 	int i;
 	static char reasonbuf[32];
 	static const struct {
 		int reason;
 		const char *str;
 	} reasons[] = {
 		{ .reason = VMCB_EXIT_INVALID,	.str = "invalvmcb" },
 		{ .reason = VMCB_EXIT_SHUTDOWN,	.str = "shutdown" },
 		{ .reason = VMCB_EXIT_NPF, 	.str = "nptfault" },
 		{ .reason = VMCB_EXIT_PAUSE,	.str = "pause" },
 		{ .reason = VMCB_EXIT_HLT,	.str = "hlt" },
 		{ .reason = VMCB_EXIT_CPUID,	.str = "cpuid" },
 		{ .reason = VMCB_EXIT_IO,	.str = "inout" },
 		{ .reason = VMCB_EXIT_MC,	.str = "mchk" },
 		{ .reason = VMCB_EXIT_INTR,	.str = "extintr" },
 		{ .reason = VMCB_EXIT_NMI,	.str = "nmi" },
 		{ .reason = VMCB_EXIT_VINTR,	.str = "vintr" },
 		{ .reason = VMCB_EXIT_MSR,	.str = "msr" },
 		{ .reason = VMCB_EXIT_IRET,	.str = "iret" },
 		{ .reason = VMCB_EXIT_MONITOR,	.str = "monitor" },
 		{ .reason = VMCB_EXIT_MWAIT,	.str = "mwait" },
 		{ .reason = VMCB_EXIT_VMRUN,	.str = "vmrun" },
 		{ .reason = VMCB_EXIT_VMMCALL,	.str = "vmmcall" },
 		{ .reason = VMCB_EXIT_VMLOAD,	.str = "vmload" },
 		{ .reason = VMCB_EXIT_VMSAVE,	.str = "vmsave" },
 		{ .reason = VMCB_EXIT_STGI,	.str = "stgi" },
 		{ .reason = VMCB_EXIT_CLGI,	.str = "clgi" },
 		{ .reason = VMCB_EXIT_SKINIT,	.str = "skinit" },
 		{ .reason = VMCB_EXIT_ICEBP,	.str = "icebp" },
 		{ .reason = VMCB_EXIT_INVD,	.str = "invd" },
 		{ .reason = VMCB_EXIT_INVLPGA,	.str = "invlpga" },
 		{ .reason = VMCB_EXIT_POPF,	.str = "popf" },
 		{ .reason = VMCB_EXIT_PUSHF,	.str = "pushf" },
 	};
 
 	for (i = 0; i < nitems(reasons); i++) {
 		if (reasons[i].reason == reason)
 			return (reasons[i].str);
 	}
 	snprintf(reasonbuf, sizeof(reasonbuf), "%#lx", reason);
 	return (reasonbuf);
 }
 #endif	/* KTR */
 
 /*
  * From section "State Saved on Exit" in APMv2: nRIP is saved for all #VMEXITs
  * that are due to instruction intercepts as well as MSR and IOIO intercepts
  * and exceptions caused by INT3, INTO and BOUND instructions.
  *
  * Return 1 if the nRIP is valid and 0 otherwise.
  */
 static int
 nrip_valid(uint64_t exitcode)
 {
 	switch (exitcode) {
 	case 0x00 ... 0x0F:	/* read of CR0 through CR15 */
 	case 0x10 ... 0x1F:	/* write of CR0 through CR15 */
 	case 0x20 ... 0x2F:	/* read of DR0 through DR15 */
 	case 0x30 ... 0x3F:	/* write of DR0 through DR15 */
 	case 0x43:		/* INT3 */
 	case 0x44:		/* INTO */
 	case 0x45:		/* BOUND */
 	case 0x65 ... 0x7C:	/* VMEXIT_CR0_SEL_WRITE ... VMEXIT_MSR */
 	case 0x80 ... 0x8D:	/* VMEXIT_VMRUN ... VMEXIT_XSETBV */
 		return (1);
 	default:
 		return (0);
 	}
 }
 
 static int
 svm_vmexit(struct svm_softc *svm_sc, struct svm_vcpu *vcpu,
     struct vm_exit *vmexit)
 {
 	struct vmcb *vmcb;
 	struct vmcb_state *state;
 	struct vmcb_ctrl *ctrl;
 	struct svm_regctx *ctx;
 	uint64_t code, info1, info2, val;
 	uint32_t eax, ecx, edx;
 	int error __diagused, errcode_valid, handled, idtvec, reflect;
 	bool retu;
 
 	ctx = svm_get_guest_regctx(vcpu);
 	vmcb = svm_get_vmcb(vcpu);
 	state = &vmcb->state;
 	ctrl = &vmcb->ctrl;
 
 	handled = 0;
 	code = ctrl->exitcode;
 	info1 = ctrl->exitinfo1;
 	info2 = ctrl->exitinfo2;
 
 	vmexit->exitcode = VM_EXITCODE_BOGUS;
 	vmexit->rip = state->rip;
 	vmexit->inst_length = nrip_valid(code) ? ctrl->nrip - state->rip : 0;
 
 	vmm_stat_incr(vcpu->vcpu, VMEXIT_COUNT, 1);
 
 	/*
 	 * #VMEXIT(INVALID) needs to be handled early because the VMCB is
 	 * in an inconsistent state and can trigger assertions that would
 	 * never happen otherwise.
 	 */
 	if (code == VMCB_EXIT_INVALID) {
 		vm_exit_svm(vmexit, code, info1, info2);
 		return (0);
 	}
 
 	KASSERT((ctrl->eventinj & VMCB_EVENTINJ_VALID) == 0, ("%s: event "
 	    "injection valid bit is set %#lx", __func__, ctrl->eventinj));
 
 	KASSERT(vmexit->inst_length >= 0 && vmexit->inst_length <= 15,
 	    ("invalid inst_length %d: code (%#lx), info1 (%#lx), info2 (%#lx)",
 	    vmexit->inst_length, code, info1, info2));
 
 	svm_update_virqinfo(vcpu);
 	svm_save_intinfo(svm_sc, vcpu);
 
 	switch (code) {
 	case VMCB_EXIT_IRET:
 		/*
 		 * Restart execution at "iret" but with the intercept cleared.
 		 */
 		vmexit->inst_length = 0;
 		clear_nmi_blocking(vcpu);
 		handled = 1;
 		break;
 	case VMCB_EXIT_VINTR:	/* interrupt window exiting */
 		vmm_stat_incr(vcpu->vcpu, VMEXIT_VINTR, 1);
 		handled = 1;
 		break;
 	case VMCB_EXIT_INTR:	/* external interrupt */
 		vmm_stat_incr(vcpu->vcpu, VMEXIT_EXTINT, 1);
 		handled = 1;
 		break;
 	case VMCB_EXIT_NMI:	/* external NMI */
 		handled = 1;
 		break;
 	case 0x40 ... 0x5F:
 		vmm_stat_incr(vcpu->vcpu, VMEXIT_EXCEPTION, 1);
 		reflect = 1;
 		idtvec = code - 0x40;
 		switch (idtvec) {
 		case IDT_MC:
 			/*
 			 * Call the machine check handler by hand. Also don't
 			 * reflect the machine check back into the guest.
 			 */
 			reflect = 0;
 			SVM_CTR0(vcpu, "Vectoring to MCE handler");
 			__asm __volatile("int $18");
 			break;
 		case IDT_PF:
 			error = svm_setreg(vcpu, VM_REG_GUEST_CR2, info2);
 			KASSERT(error == 0, ("%s: error %d updating cr2",
 			    __func__, error));
 			/* fallthru */
 		case IDT_NP:
 		case IDT_SS:
 		case IDT_GP:
 		case IDT_AC:
 		case IDT_TS:
 			errcode_valid = 1;
 			break;
 
 		case IDT_DF:
 			errcode_valid = 1;
 			info1 = 0;
 			break;
 		case IDT_DB: {
 			/*
 			 * Check if we are being stepped (RFLAGS.TF)
 			 * and bounce vmexit to userland.
 			 */
 			bool stepped = 0;
 			uint64_t dr6 = 0;
 
 			svm_getreg(vcpu, VM_REG_GUEST_DR6, &dr6);
 			stepped = !!(dr6 & DBREG_DR6_BS);
 			if (stepped && (vcpu->caps & (1 << VM_CAP_RFLAGS_TF))) {
 				vmexit->exitcode = VM_EXITCODE_DB;
 				vmexit->u.dbg.trace_trap = 1;
 				vmexit->u.dbg.pushf_intercept = 0;
 
 				if (vcpu->dbg.popf_sstep) {
 					/*
 					 * DB# exit was caused by stepping over
 					 * popf.
 					 */
 					uint64_t rflags;
 
 					vcpu->dbg.popf_sstep = 0;
 
 					/*
 					 * Update shadowed TF bit so the next
 					 * setcap(..., RFLAGS_SSTEP, 0) restores
 					 * the correct value
 					 */
 					svm_getreg(vcpu, VM_REG_GUEST_RFLAGS,
 					    &rflags);
 					vcpu->dbg.rflags_tf = rflags & PSL_T;
 				} else if (vcpu->dbg.pushf_sstep) {
 					/*
 					 * DB# exit was caused by stepping over
 					 * pushf.
 					 */
 					vcpu->dbg.pushf_sstep = 0;
 
 					/*
 					 * Adjusting the pushed rflags after a
 					 * restarted pushf instruction must be
 					 * handled outside of svm.c due to the
 					 * critical_enter() lock being held.
 					 */
 					vmexit->u.dbg.pushf_intercept = 1;
 					vmexit->u.dbg.tf_shadow_val =
 					    vcpu->dbg.rflags_tf;
 					svm_paging_info(svm_get_vmcb(vcpu),
 					    &vmexit->u.dbg.paging);
 				}
 
 				/* Clear DR6 "single-step" bit. */
 				dr6 &= ~DBREG_DR6_BS;
 				error = svm_setreg(vcpu, VM_REG_GUEST_DR6, dr6);
 				KASSERT(error == 0,
 				    ("%s: error %d updating DR6\r\n", __func__,
 					error));
 
 				reflect = 0;
 			}
 			break;
 		}
 		case IDT_BP:
 			vmexit->exitcode = VM_EXITCODE_BPT;
 			vmexit->u.bpt.inst_length = vmexit->inst_length;
 			vmexit->inst_length = 0;
 
 			reflect = 0;
 			break;
 		case IDT_OF:
 		case IDT_BR:
 			/*
 			 * The 'nrip' field is populated for INT3, INTO and
 			 * BOUND exceptions and this also implies that
 			 * 'inst_length' is non-zero.
 			 *
 			 * Reset 'inst_length' to zero so the guest %rip at
 			 * event injection is identical to what it was when
 			 * the exception originally happened.
 			 */
 			SVM_CTR2(vcpu, "Reset inst_length from %d "
 			    "to zero before injecting exception %d",
 			    vmexit->inst_length, idtvec);
 			vmexit->inst_length = 0;
 			/* fallthru */
 		default:
 			errcode_valid = 0;
 			info1 = 0;
 			break;
 		}
 
 		if (reflect) {
 			KASSERT(vmexit->inst_length == 0,
 			    ("invalid inst_length (%d) "
 			     "when reflecting exception %d into guest",
 				vmexit->inst_length, idtvec));
 			/* Reflect the exception back into the guest */
 			SVM_CTR2(vcpu, "Reflecting exception "
 			    "%d/%#x into the guest", idtvec, (int)info1);
 			error = vm_inject_exception(vcpu->vcpu, idtvec,
 			    errcode_valid, info1, 0);
 			KASSERT(error == 0, ("%s: vm_inject_exception error %d",
 			    __func__, error));
 			handled = 1;
 		}
 		break;
 	case VMCB_EXIT_MSR:	/* MSR access. */
 		eax = state->rax;
 		ecx = ctx->sctx_rcx;
 		edx = ctx->sctx_rdx;
 		retu = false;	
 
 		if (info1) {
 			vmm_stat_incr(vcpu->vcpu, VMEXIT_WRMSR, 1);
 			val = (uint64_t)edx << 32 | eax;
 			SVM_CTR2(vcpu, "wrmsr %#x val %#lx", ecx, val);
 			if (emulate_wrmsr(svm_sc, vcpu, ecx, val, &retu)) {
 				vmexit->exitcode = VM_EXITCODE_WRMSR;
 				vmexit->u.msr.code = ecx;
 				vmexit->u.msr.wval = val;
 			} else if (!retu) {
 				handled = 1;
 			} else {
 				KASSERT(vmexit->exitcode != VM_EXITCODE_BOGUS,
 				    ("emulate_wrmsr retu with bogus exitcode"));
 			}
 		} else {
 			SVM_CTR1(vcpu, "rdmsr %#x", ecx);
 			vmm_stat_incr(vcpu->vcpu, VMEXIT_RDMSR, 1);
 			if (emulate_rdmsr(vcpu, ecx, &retu)) {
 				vmexit->exitcode = VM_EXITCODE_RDMSR;
 				vmexit->u.msr.code = ecx;
 			} else if (!retu) {
 				handled = 1;
 			} else {
 				KASSERT(vmexit->exitcode != VM_EXITCODE_BOGUS,
 				    ("emulate_rdmsr retu with bogus exitcode"));
 			}
 		}
 		break;
 	case VMCB_EXIT_IO:
 		handled = svm_handle_io(vcpu, vmexit);
 		vmm_stat_incr(vcpu->vcpu, VMEXIT_INOUT, 1);
 		break;
 	case VMCB_EXIT_CPUID:
 		vmm_stat_incr(vcpu->vcpu, VMEXIT_CPUID, 1);
 		handled = x86_emulate_cpuid(vcpu->vcpu,
 		    &state->rax, &ctx->sctx_rbx, &ctx->sctx_rcx,
 		    &ctx->sctx_rdx);
 		break;
 	case VMCB_EXIT_HLT:
 		vmm_stat_incr(vcpu->vcpu, VMEXIT_HLT, 1);
 		vmexit->exitcode = VM_EXITCODE_HLT;
 		vmexit->u.hlt.rflags = state->rflags;
 		break;
 	case VMCB_EXIT_PAUSE:
 		vmexit->exitcode = VM_EXITCODE_PAUSE;
 		vmm_stat_incr(vcpu->vcpu, VMEXIT_PAUSE, 1);
 		break;
 	case VMCB_EXIT_NPF:
 		/* EXITINFO2 contains the faulting guest physical address */
 		if (info1 & VMCB_NPF_INFO1_RSV) {
 			SVM_CTR2(vcpu, "nested page fault with "
 			    "reserved bits set: info1(%#lx) info2(%#lx)",
 			    info1, info2);
 		} else if (vm_mem_allocated(vcpu->vcpu, info2)) {
 			vmexit->exitcode = VM_EXITCODE_PAGING;
 			vmexit->u.paging.gpa = info2;
 			vmexit->u.paging.fault_type = npf_fault_type(info1);
 			vmm_stat_incr(vcpu->vcpu, VMEXIT_NESTED_FAULT, 1);
 			SVM_CTR3(vcpu, "nested page fault "
 			    "on gpa %#lx/%#lx at rip %#lx",
 			    info2, info1, state->rip);
 		} else if (svm_npf_emul_fault(info1)) {
 			svm_handle_inst_emul(vmcb, info2, vmexit);
 			vmm_stat_incr(vcpu->vcpu, VMEXIT_INST_EMUL, 1);
 			SVM_CTR3(vcpu, "inst_emul fault "
 			    "for gpa %#lx/%#lx at rip %#lx",
 			    info2, info1, state->rip);
 		}
 		break;
 	case VMCB_EXIT_MONITOR:
 		vmexit->exitcode = VM_EXITCODE_MONITOR;
 		break;
 	case VMCB_EXIT_MWAIT:
 		vmexit->exitcode = VM_EXITCODE_MWAIT;
 		break;
 	case VMCB_EXIT_PUSHF: {
 		if (vcpu->caps & (1 << VM_CAP_RFLAGS_TF)) {
 			uint64_t rflags;
 
 			svm_getreg(vcpu, VM_REG_GUEST_RFLAGS, &rflags);
 			/* Restart this instruction. */
 			vmexit->inst_length = 0;
 			/* Disable PUSHF intercepts - avoid a loop. */
 			svm_set_intercept(vcpu, VMCB_CTRL1_INTCPT,
 			    VMCB_INTCPT_PUSHF, 0);
 			/* Trace restarted instruction. */
 			svm_setreg(vcpu, VM_REG_GUEST_RFLAGS, (rflags | PSL_T));
 			/* Let the IDT_DB handler know that pushf was stepped.
 			 */
 			vcpu->dbg.pushf_sstep = 1;
 			handled = 1;
 		}
 		break;
 	}
 	case VMCB_EXIT_POPF: {
 		if (vcpu->caps & (1 << VM_CAP_RFLAGS_TF)) {
 			uint64_t rflags;
 
 			svm_getreg(vcpu, VM_REG_GUEST_RFLAGS, &rflags);
 			/* Restart this instruction */
 			vmexit->inst_length = 0;
 			/* Disable POPF intercepts - avoid a loop*/
 			svm_set_intercept(vcpu, VMCB_CTRL1_INTCPT,
 			    VMCB_INTCPT_POPF, 0);
 			/* Trace restarted instruction */
 			svm_setreg(vcpu, VM_REG_GUEST_RFLAGS, (rflags | PSL_T));
 			vcpu->dbg.popf_sstep = 1;
 			handled = 1;
 		}
 		break;
 	}
 	case VMCB_EXIT_SHUTDOWN:
 	case VMCB_EXIT_VMRUN:
 	case VMCB_EXIT_VMMCALL:
 	case VMCB_EXIT_VMLOAD:
 	case VMCB_EXIT_VMSAVE:
 	case VMCB_EXIT_STGI:
 	case VMCB_EXIT_CLGI:
 	case VMCB_EXIT_SKINIT:
 	case VMCB_EXIT_ICEBP:
 	case VMCB_EXIT_INVLPGA:
 		vm_inject_ud(vcpu->vcpu);
 		handled = 1;
 		break;
 	case VMCB_EXIT_INVD:
 	case VMCB_EXIT_WBINVD:
 		/* ignore exit */
 		handled = 1;
 		break;
 	default:
 		vmm_stat_incr(vcpu->vcpu, VMEXIT_UNKNOWN, 1);
 		break;
 	}	
 
 	SVM_CTR4(vcpu, "%s %s vmexit at %#lx/%d",
 	    handled ? "handled" : "unhandled", exit_reason_to_str(code),
 	    vmexit->rip, vmexit->inst_length);
 
 	if (handled) {
 		vmexit->rip += vmexit->inst_length;
 		vmexit->inst_length = 0;
 		state->rip = vmexit->rip;
 	} else {
 		if (vmexit->exitcode == VM_EXITCODE_BOGUS) {
 			/*
 			 * If this VM exit was not claimed by anybody then
 			 * treat it as a generic SVM exit.
 			 */
 			vm_exit_svm(vmexit, code, info1, info2);
 		} else {
 			/*
 			 * The exitcode and collateral have been populated.
 			 * The VM exit will be processed further in userland.
 			 */
 		}
 	}
 	return (handled);
 }
 
 static void
 svm_inj_intinfo(struct svm_softc *svm_sc, struct svm_vcpu *vcpu)
 {
 	uint64_t intinfo;
 
 	if (!vm_entry_intinfo(vcpu->vcpu, &intinfo))
 		return;
 
 	KASSERT(VMCB_EXITINTINFO_VALID(intinfo), ("%s: entry intinfo is not "
 	    "valid: %#lx", __func__, intinfo));
 
 	svm_eventinject(vcpu, VMCB_EXITINTINFO_TYPE(intinfo),
 		VMCB_EXITINTINFO_VECTOR(intinfo),
 		VMCB_EXITINTINFO_EC(intinfo),
 		VMCB_EXITINTINFO_EC_VALID(intinfo));
 	vmm_stat_incr(vcpu->vcpu, VCPU_INTINFO_INJECTED, 1);
 	SVM_CTR1(vcpu, "Injected entry intinfo: %#lx", intinfo);
 }
 
 /*
  * Inject event to virtual cpu.
  */
 static void
 svm_inj_interrupts(struct svm_softc *sc, struct svm_vcpu *vcpu,
     struct vlapic *vlapic)
 {
 	struct vmcb_ctrl *ctrl;
 	struct vmcb_state *state;
 	uint8_t v_tpr;
 	int vector, need_intr_window;
 	int extint_pending;
 
 	if (vcpu->caps & (1 << VM_CAP_MASK_HWINTR)) {
 		return;
 	}
 
 	state = svm_get_vmcb_state(vcpu);
 	ctrl  = svm_get_vmcb_ctrl(vcpu);
 
 	need_intr_window = 0;
 
 	if (vcpu->nextrip != state->rip) {
 		ctrl->intr_shadow = 0;
 		SVM_CTR2(vcpu, "Guest interrupt blocking "
 		    "cleared due to rip change: %#lx/%#lx",
 		    vcpu->nextrip, state->rip);
 	}
 
 	/*
 	 * Inject pending events or exceptions for this vcpu.
 	 *
 	 * An event might be pending because the previous #VMEXIT happened
 	 * during event delivery (i.e. ctrl->exitintinfo).
 	 *
 	 * An event might also be pending because an exception was injected
 	 * by the hypervisor (e.g. #PF during instruction emulation).
 	 */
 	svm_inj_intinfo(sc, vcpu);
 
 	/* NMI event has priority over interrupts. */
 	if (vm_nmi_pending(vcpu->vcpu)) {
 		if (nmi_blocked(vcpu)) {
 			/*
 			 * Can't inject another NMI if the guest has not
 			 * yet executed an "iret" after the last NMI.
 			 */
 			SVM_CTR0(vcpu, "Cannot inject NMI due "
 			    "to NMI-blocking");
 		} else if (ctrl->intr_shadow) {
 			/*
 			 * Can't inject an NMI if the vcpu is in an intr_shadow.
 			 */
 			SVM_CTR0(vcpu, "Cannot inject NMI due to "
 			    "interrupt shadow");
 			need_intr_window = 1;
 			goto done;
 		} else if (ctrl->eventinj & VMCB_EVENTINJ_VALID) {
 			/*
 			 * If there is already an exception/interrupt pending
 			 * then defer the NMI until after that.
 			 */
 			SVM_CTR1(vcpu, "Cannot inject NMI due to "
 			    "eventinj %#lx", ctrl->eventinj);
 
 			/*
 			 * Use self-IPI to trigger a VM-exit as soon as
 			 * possible after the event injection is completed.
 			 *
 			 * This works only if the external interrupt exiting
 			 * is at a lower priority than the event injection.
 			 *
 			 * Although not explicitly specified in APMv2 the
 			 * relative priorities were verified empirically.
 			 */
 			ipi_cpu(curcpu, IPI_AST);	/* XXX vmm_ipinum? */
 		} else {
 			vm_nmi_clear(vcpu->vcpu);
 
 			/* Inject NMI, vector number is not used */
 			svm_eventinject(vcpu, VMCB_EVENTINJ_TYPE_NMI,
 			    IDT_NMI, 0, false);
 
 			/* virtual NMI blocking is now in effect */
 			enable_nmi_blocking(vcpu);
 
 			SVM_CTR0(vcpu, "Injecting vNMI");
 		}
 	}
 
 	extint_pending = vm_extint_pending(vcpu->vcpu);
 	if (!extint_pending) {
 		if (!vlapic_pending_intr(vlapic, &vector))
 			goto done;
 		KASSERT(vector >= 16 && vector <= 255,
 		    ("invalid vector %d from local APIC", vector));
 	} else {
 		/* Ask the legacy pic for a vector to inject */
 		vatpic_pending_intr(sc->vm, &vector);
 		KASSERT(vector >= 0 && vector <= 255,
 		    ("invalid vector %d from INTR", vector));
 	}
 
 	/*
 	 * If the guest has disabled interrupts or is in an interrupt shadow
 	 * then we cannot inject the pending interrupt.
 	 */
 	if ((state->rflags & PSL_I) == 0) {
 		SVM_CTR2(vcpu, "Cannot inject vector %d due to "
 		    "rflags %#lx", vector, state->rflags);
 		need_intr_window = 1;
 		goto done;
 	}
 
 	if (ctrl->intr_shadow) {
 		SVM_CTR1(vcpu, "Cannot inject vector %d due to "
 		    "interrupt shadow", vector);
 		need_intr_window = 1;
 		goto done;
 	}
 
 	if (ctrl->eventinj & VMCB_EVENTINJ_VALID) {
 		SVM_CTR2(vcpu, "Cannot inject vector %d due to "
 		    "eventinj %#lx", vector, ctrl->eventinj);
 		need_intr_window = 1;
 		goto done;
 	}
 
 	svm_eventinject(vcpu, VMCB_EVENTINJ_TYPE_INTR, vector, 0, false);
 
 	if (!extint_pending) {
 		vlapic_intr_accepted(vlapic, vector);
 	} else {
 		vm_extint_clear(vcpu->vcpu);
 		vatpic_intr_accepted(sc->vm, vector);
 	}
 
 	/*
 	 * Force a VM-exit as soon as the vcpu is ready to accept another
 	 * interrupt. This is done because the PIC might have another vector
 	 * that it wants to inject. Also, if the APIC has a pending interrupt
 	 * that was preempted by the ExtInt then it allows us to inject the
 	 * APIC vector as soon as possible.
 	 */
 	need_intr_window = 1;
 done:
 	/*
 	 * The guest can modify the TPR by writing to %CR8. In guest mode
 	 * the processor reflects this write to V_TPR without hypervisor
 	 * intervention.
 	 *
 	 * The guest can also modify the TPR by writing to it via the memory
 	 * mapped APIC page. In this case, the write will be emulated by the
 	 * hypervisor. For this reason V_TPR must be updated before every
 	 * VMRUN.
 	 */
 	v_tpr = vlapic_get_cr8(vlapic);
 	KASSERT(v_tpr <= 15, ("invalid v_tpr %#x", v_tpr));
 	if (ctrl->v_tpr != v_tpr) {
 		SVM_CTR2(vcpu, "VMCB V_TPR changed from %#x to %#x",
 		    ctrl->v_tpr, v_tpr);
 		ctrl->v_tpr = v_tpr;
 		svm_set_dirty(vcpu, VMCB_CACHE_TPR);
 	}
 
 	if (need_intr_window) {
 		/*
 		 * We use V_IRQ in conjunction with the VINTR intercept to
 		 * trap into the hypervisor as soon as a virtual interrupt
 		 * can be delivered.
 		 *
 		 * Since injected events are not subject to intercept checks
 		 * we need to ensure that the V_IRQ is not actually going to
 		 * be delivered on VM entry. The KASSERT below enforces this.
 		 */
 		KASSERT((ctrl->eventinj & VMCB_EVENTINJ_VALID) != 0 ||
 		    (state->rflags & PSL_I) == 0 || ctrl->intr_shadow,
 		    ("Bogus intr_window_exiting: eventinj (%#lx), "
 		    "intr_shadow (%u), rflags (%#lx)",
 		    ctrl->eventinj, ctrl->intr_shadow, state->rflags));
 		enable_intr_window_exiting(vcpu);
 	} else {
 		disable_intr_window_exiting(vcpu);
 	}
 }
 
 static __inline void
 restore_host_tss(void)
 {
 	struct system_segment_descriptor *tss_sd;
 
 	/*
 	 * The TSS descriptor was in use prior to launching the guest so it
 	 * has been marked busy.
 	 *
 	 * 'ltr' requires the descriptor to be marked available so change the
 	 * type to "64-bit available TSS".
 	 */
 	tss_sd = PCPU_GET(tss);
 	tss_sd->sd_type = SDT_SYSTSS;
 	ltr(GSEL(GPROC0_SEL, SEL_KPL));
 }
 
 static void
 svm_pmap_activate(struct svm_vcpu *vcpu, pmap_t pmap)
 {
 	struct vmcb_ctrl *ctrl;
 	long eptgen;
 	int cpu;
 	bool alloc_asid;
 
 	cpu = curcpu;
 	CPU_SET_ATOMIC(cpu, &pmap->pm_active);
 	smr_enter(pmap->pm_eptsmr);
 
 	ctrl = svm_get_vmcb_ctrl(vcpu);
 
 	/*
 	 * The TLB entries associated with the vcpu's ASID are not valid
 	 * if either of the following conditions is true:
 	 *
 	 * 1. The vcpu's ASID generation is different than the host cpu's
 	 *    ASID generation. This happens when the vcpu migrates to a new
 	 *    host cpu. It can also happen when the number of vcpus executing
 	 *    on a host cpu is greater than the number of ASIDs available.
 	 *
 	 * 2. The pmap generation number is different than the value cached in
 	 *    the 'vcpustate'. This happens when the host invalidates pages
 	 *    belonging to the guest.
 	 *
 	 *	asidgen		eptgen	      Action
 	 *	mismatch	mismatch
 	 *	   0		   0		(a)
 	 *	   0		   1		(b1) or (b2)
 	 *	   1		   0		(c)
 	 *	   1		   1		(d)
 	 *
 	 * (a) There is no mismatch in eptgen or ASID generation and therefore
 	 *     no further action is needed.
 	 *
 	 * (b1) If the cpu supports FlushByAsid then the vcpu's ASID is
 	 *      retained and the TLB entries associated with this ASID
 	 *      are flushed by VMRUN.
 	 *
 	 * (b2) If the cpu does not support FlushByAsid then a new ASID is
 	 *      allocated.
 	 *
 	 * (c) A new ASID is allocated.
 	 *
 	 * (d) A new ASID is allocated.
 	 */
 
 	alloc_asid = false;
 	eptgen = atomic_load_long(&pmap->pm_eptgen);
 	ctrl->tlb_ctrl = VMCB_TLB_FLUSH_NOTHING;
 
 	if (vcpu->asid.gen != asid[cpu].gen) {
 		alloc_asid = true;	/* (c) and (d) */
 	} else if (vcpu->eptgen != eptgen) {
 		if (flush_by_asid())
 			ctrl->tlb_ctrl = VMCB_TLB_FLUSH_GUEST;	/* (b1) */
 		else
 			alloc_asid = true;			/* (b2) */
 	} else {
 		/*
 		 * This is the common case (a).
 		 */
 		KASSERT(!alloc_asid, ("ASID allocation not necessary"));
 		KASSERT(ctrl->tlb_ctrl == VMCB_TLB_FLUSH_NOTHING,
 		    ("Invalid VMCB tlb_ctrl: %#x", ctrl->tlb_ctrl));
 	}
 
 	if (alloc_asid) {
 		if (++asid[cpu].num >= nasid) {
 			asid[cpu].num = 1;
 			if (++asid[cpu].gen == 0)
 				asid[cpu].gen = 1;
 			/*
 			 * If this cpu does not support "flush-by-asid"
 			 * then flush the entire TLB on a generation
 			 * bump. Subsequent ASID allocation in this
 			 * generation can be done without a TLB flush.
 			 */
 			if (!flush_by_asid())
 				ctrl->tlb_ctrl = VMCB_TLB_FLUSH_ALL;
 		}
 		vcpu->asid.gen = asid[cpu].gen;
 		vcpu->asid.num = asid[cpu].num;
 
 		ctrl->asid = vcpu->asid.num;
 		svm_set_dirty(vcpu, VMCB_CACHE_ASID);
 		/*
 		 * If this cpu supports "flush-by-asid" then the TLB
 		 * was not flushed after the generation bump. The TLB
 		 * is flushed selectively after every new ASID allocation.
 		 */
 		if (flush_by_asid())
 			ctrl->tlb_ctrl = VMCB_TLB_FLUSH_GUEST;
 	}
 	vcpu->eptgen = eptgen;
 
 	KASSERT(ctrl->asid != 0, ("Guest ASID must be non-zero"));
 	KASSERT(ctrl->asid == vcpu->asid.num,
 	    ("ASID mismatch: %u/%u", ctrl->asid, vcpu->asid.num));
 }
 
 static void
 svm_pmap_deactivate(pmap_t pmap)
 {
 	smr_exit(pmap->pm_eptsmr);
 	CPU_CLR_ATOMIC(curcpu, &pmap->pm_active);
 }
 
 static __inline void
 disable_gintr(void)
 {
 
 	__asm __volatile("clgi");
 }
 
 static __inline void
 enable_gintr(void)
 {
 
         __asm __volatile("stgi");
 }
 
 static __inline void
 svm_dr_enter_guest(struct svm_regctx *gctx)
 {
 
 	/* Save host control debug registers. */
 	gctx->host_dr7 = rdr7();
 	gctx->host_debugctl = rdmsr(MSR_DEBUGCTLMSR);
 
 	/*
 	 * Disable debugging in DR7 and DEBUGCTL to avoid triggering
 	 * exceptions in the host based on the guest DRx values.  The
 	 * guest DR6, DR7, and DEBUGCTL are saved/restored in the
 	 * VMCB.
 	 */
 	load_dr7(0);
 	wrmsr(MSR_DEBUGCTLMSR, 0);
 
 	/* Save host debug registers. */
 	gctx->host_dr0 = rdr0();
 	gctx->host_dr1 = rdr1();
 	gctx->host_dr2 = rdr2();
 	gctx->host_dr3 = rdr3();
 	gctx->host_dr6 = rdr6();
 
 	/* Restore guest debug registers. */
 	load_dr0(gctx->sctx_dr0);
 	load_dr1(gctx->sctx_dr1);
 	load_dr2(gctx->sctx_dr2);
 	load_dr3(gctx->sctx_dr3);
 }
 
 static __inline void
 svm_dr_leave_guest(struct svm_regctx *gctx)
 {
 
 	/* Save guest debug registers. */
 	gctx->sctx_dr0 = rdr0();
 	gctx->sctx_dr1 = rdr1();
 	gctx->sctx_dr2 = rdr2();
 	gctx->sctx_dr3 = rdr3();
 
 	/*
 	 * Restore host debug registers.  Restore DR7 and DEBUGCTL
 	 * last.
 	 */
 	load_dr0(gctx->host_dr0);
 	load_dr1(gctx->host_dr1);
 	load_dr2(gctx->host_dr2);
 	load_dr3(gctx->host_dr3);
 	load_dr6(gctx->host_dr6);
 	wrmsr(MSR_DEBUGCTLMSR, gctx->host_debugctl);
 	load_dr7(gctx->host_dr7);
 }
 
 /*
  * Start vcpu with specified RIP.
  */
 static int
 svm_run(void *vcpui, register_t rip, pmap_t pmap, struct vm_eventinfo *evinfo)
 {
 	struct svm_regctx *gctx;
 	struct svm_softc *svm_sc;
 	struct svm_vcpu *vcpu;
 	struct vmcb_state *state;
 	struct vmcb_ctrl *ctrl;
 	struct vm_exit *vmexit;
 	struct vlapic *vlapic;
 	uint64_t vmcb_pa;
 	int handled;
 	uint16_t ldt_sel;
 
 	vcpu = vcpui;
 	svm_sc = vcpu->sc;
 	state = svm_get_vmcb_state(vcpu);
 	ctrl = svm_get_vmcb_ctrl(vcpu);
 	vmexit = vm_exitinfo(vcpu->vcpu);
 	vlapic = vm_lapic(vcpu->vcpu);
 
 	gctx = svm_get_guest_regctx(vcpu);
 	vmcb_pa = vcpu->vmcb_pa;
 
 	if (vcpu->lastcpu != curcpu) {
 		/*
 		 * Force new ASID allocation by invalidating the generation.
 		 */
 		vcpu->asid.gen = 0;
 
 		/*
 		 * Invalidate the VMCB state cache by marking all fields dirty.
 		 */
 		svm_set_dirty(vcpu, 0xffffffff);
 
 		/*
 		 * XXX
 		 * Setting 'vcpu->lastcpu' here is bit premature because
 		 * we may return from this function without actually executing
 		 * the VMRUN  instruction. This could happen if a rendezvous
 		 * or an AST is pending on the first time through the loop.
 		 *
 		 * This works for now but any new side-effects of vcpu
 		 * migration should take this case into account.
 		 */
 		vcpu->lastcpu = curcpu;
 		vmm_stat_incr(vcpu->vcpu, VCPU_MIGRATIONS, 1);
 	}
 
 	svm_msr_guest_enter(vcpu);
 
 	/* Update Guest RIP */
 	state->rip = rip;
 
 	do {
 		/*
 		 * Disable global interrupts to guarantee atomicity during
 		 * loading of guest state. This includes not only the state
 		 * loaded by the "vmrun" instruction but also software state
 		 * maintained by the hypervisor: suspended and rendezvous
 		 * state, NPT generation number, vlapic interrupts etc.
 		 */
 		disable_gintr();
 
 		if (vcpu_suspended(evinfo)) {
 			enable_gintr();
 			vm_exit_suspended(vcpu->vcpu, state->rip);
 			break;
 		}
 
 		if (vcpu_rendezvous_pending(vcpu->vcpu, evinfo)) {
 			enable_gintr();
 			vm_exit_rendezvous(vcpu->vcpu, state->rip);
 			break;
 		}
 
 		if (vcpu_reqidle(evinfo)) {
 			enable_gintr();
 			vm_exit_reqidle(vcpu->vcpu, state->rip);
 			break;
 		}
 
 		/* We are asked to give the cpu by scheduler. */
 		if (vcpu_should_yield(vcpu->vcpu)) {
 			enable_gintr();
 			vm_exit_astpending(vcpu->vcpu, state->rip);
 			break;
 		}
 
 		if (vcpu_debugged(vcpu->vcpu)) {
 			enable_gintr();
 			vm_exit_debug(vcpu->vcpu, state->rip);
 			break;
 		}
 
 		/*
 		 * #VMEXIT resumes the host with the guest LDTR, so
 		 * save the current LDT selector so it can be restored
 		 * after an exit.  The userspace hypervisor probably
 		 * doesn't use a LDT, but save and restore it to be
 		 * safe.
 		 */
 		ldt_sel = sldt();
 
 		svm_inj_interrupts(svm_sc, vcpu, vlapic);
 
 		/*
 		 * Check the pmap generation and the ASID generation to
 		 * ensure that the vcpu does not use stale TLB mappings.
 		 */
 		svm_pmap_activate(vcpu, pmap);
 
 		ctrl->vmcb_clean = vmcb_clean & ~vcpu->dirty;
 		vcpu->dirty = 0;
 		SVM_CTR1(vcpu, "vmcb clean %#x", ctrl->vmcb_clean);
 
 		/* Launch Virtual Machine. */
 		SVM_CTR1(vcpu, "Resume execution at %#lx", state->rip);
 		svm_dr_enter_guest(gctx);
 		svm_launch(vmcb_pa, gctx, get_pcpu());
 		svm_dr_leave_guest(gctx);
 
 		svm_pmap_deactivate(pmap);
 
 		/*
 		 * The host GDTR and IDTR is saved by VMRUN and restored
 		 * automatically on #VMEXIT. However, the host TSS needs
 		 * to be restored explicitly.
 		 */
 		restore_host_tss();
 
 		/* Restore host LDTR. */
 		lldt(ldt_sel);
 
 		/* #VMEXIT disables interrupts so re-enable them here. */ 
 		enable_gintr();
 
 		/* Update 'nextrip' */
 		vcpu->nextrip = state->rip;
 
 		/* Handle #VMEXIT and if required return to user space. */
 		handled = svm_vmexit(svm_sc, vcpu, vmexit);
 	} while (handled);
 
 	svm_msr_guest_exit(vcpu);
 
 	return (0);
 }
 
 static void
 svm_vcpu_cleanup(void *vcpui)
 {
 	struct svm_vcpu *vcpu = vcpui;
 
 	free(vcpu->vmcb, M_SVM);
 	free(vcpu, M_SVM);
 }
 
 static void
 svm_cleanup(void *vmi)
 {
 	struct svm_softc *sc = vmi;
 
-	contigfree(sc->iopm_bitmap, SVM_IO_BITMAP_SIZE, M_SVM);
-	contigfree(sc->msr_bitmap, SVM_MSR_BITMAP_SIZE, M_SVM);
+	free(sc->iopm_bitmap, M_SVM);
+	free(sc->msr_bitmap, M_SVM);
 	free(sc, M_SVM);
 }
 
 static register_t *
 swctx_regptr(struct svm_regctx *regctx, int reg)
 {
 
 	switch (reg) {
 	case VM_REG_GUEST_RBX:
 		return (&regctx->sctx_rbx);
 	case VM_REG_GUEST_RCX:
 		return (&regctx->sctx_rcx);
 	case VM_REG_GUEST_RDX:
 		return (&regctx->sctx_rdx);
 	case VM_REG_GUEST_RDI:
 		return (&regctx->sctx_rdi);
 	case VM_REG_GUEST_RSI:
 		return (&regctx->sctx_rsi);
 	case VM_REG_GUEST_RBP:
 		return (&regctx->sctx_rbp);
 	case VM_REG_GUEST_R8:
 		return (&regctx->sctx_r8);
 	case VM_REG_GUEST_R9:
 		return (&regctx->sctx_r9);
 	case VM_REG_GUEST_R10:
 		return (&regctx->sctx_r10);
 	case VM_REG_GUEST_R11:
 		return (&regctx->sctx_r11);
 	case VM_REG_GUEST_R12:
 		return (&regctx->sctx_r12);
 	case VM_REG_GUEST_R13:
 		return (&regctx->sctx_r13);
 	case VM_REG_GUEST_R14:
 		return (&regctx->sctx_r14);
 	case VM_REG_GUEST_R15:
 		return (&regctx->sctx_r15);
 	case VM_REG_GUEST_DR0:
 		return (&regctx->sctx_dr0);
 	case VM_REG_GUEST_DR1:
 		return (&regctx->sctx_dr1);
 	case VM_REG_GUEST_DR2:
 		return (&regctx->sctx_dr2);
 	case VM_REG_GUEST_DR3:
 		return (&regctx->sctx_dr3);
 	default:
 		return (NULL);
 	}
 }
 
 static int
 svm_getreg(void *vcpui, int ident, uint64_t *val)
 {
 	struct svm_vcpu *vcpu;
 	register_t *reg;
 
 	vcpu = vcpui;
 
 	if (ident == VM_REG_GUEST_INTR_SHADOW) {
 		return (svm_get_intr_shadow(vcpu, val));
 	}
 
 	if (vmcb_read(vcpu, ident, val) == 0) {
 		return (0);
 	}
 
 	reg = swctx_regptr(svm_get_guest_regctx(vcpu), ident);
 
 	if (reg != NULL) {
 		*val = *reg;
 		return (0);
 	}
 
 	SVM_CTR1(vcpu, "svm_getreg: unknown register %#x", ident);
 	return (EINVAL);
 }
 
 static int
 svm_setreg(void *vcpui, int ident, uint64_t val)
 {
 	struct svm_vcpu *vcpu;
 	register_t *reg;
 
 	vcpu = vcpui;
 
 	if (ident == VM_REG_GUEST_INTR_SHADOW) {
 		return (svm_modify_intr_shadow(vcpu, val));
 	}
 
 	/* Do not permit user write access to VMCB fields by offset. */
 	if (!VMCB_ACCESS_OK(ident)) {
 		if (vmcb_write(vcpu, ident, val) == 0) {
 			return (0);
 		}
 	}
 
 	reg = swctx_regptr(svm_get_guest_regctx(vcpu), ident);
 
 	if (reg != NULL) {
 		*reg = val;
 		return (0);
 	}
 
 	if (ident == VM_REG_GUEST_ENTRY_INST_LENGTH) {
 		/* Ignore. */
 		return (0);
 	}
 
 	/*
 	 * XXX deal with CR3 and invalidate TLB entries tagged with the
 	 * vcpu's ASID. This needs to be treated differently depending on
 	 * whether 'running' is true/false.
 	 */
 
 	SVM_CTR1(vcpu, "svm_setreg: unknown register %#x", ident);
 	return (EINVAL);
 }
 
 static int
 svm_getdesc(void *vcpui, int reg, struct seg_desc *desc)
 {
 	return (vmcb_getdesc(vcpui, reg, desc));
 }
 
 static int
 svm_setdesc(void *vcpui, int reg, struct seg_desc *desc)
 {
 	return (vmcb_setdesc(vcpui, reg, desc));
 }
 
 #ifdef BHYVE_SNAPSHOT
 static int
 svm_snapshot_reg(void *vcpui, int ident, struct vm_snapshot_meta *meta)
 {
 	int ret;
 	uint64_t val;
 
 	if (meta->op == VM_SNAPSHOT_SAVE) {
 		ret = svm_getreg(vcpui, ident, &val);
 		if (ret != 0)
 			goto done;
 
 		SNAPSHOT_VAR_OR_LEAVE(val, meta, ret, done);
 	} else if (meta->op == VM_SNAPSHOT_RESTORE) {
 		SNAPSHOT_VAR_OR_LEAVE(val, meta, ret, done);
 
 		ret = svm_setreg(vcpui, ident, val);
 		if (ret != 0)
 			goto done;
 	} else {
 		ret = EINVAL;
 		goto done;
 	}
 
 done:
 	return (ret);
 }
 #endif
 
 static int
 svm_setcap(void *vcpui, int type, int val)
 {
 	struct svm_vcpu *vcpu;
 	struct vlapic *vlapic;
 	int error;
 
 	vcpu = vcpui;
 	error = 0;
 
 	switch (type) {
 	case VM_CAP_HALT_EXIT:
 		svm_set_intercept(vcpu, VMCB_CTRL1_INTCPT,
 		    VMCB_INTCPT_HLT, val);
 		break;
 	case VM_CAP_PAUSE_EXIT:
 		svm_set_intercept(vcpu, VMCB_CTRL1_INTCPT,
 		    VMCB_INTCPT_PAUSE, val);
 		break;
 	case VM_CAP_UNRESTRICTED_GUEST:
 		/* Unrestricted guest execution cannot be disabled in SVM */
 		if (val == 0)
 			error = EINVAL;
 		break;
 	case VM_CAP_BPT_EXIT:
 		svm_set_intercept(vcpu, VMCB_EXC_INTCPT, BIT(IDT_BP), val);
 		break;
 	case VM_CAP_IPI_EXIT:
 		vlapic = vm_lapic(vcpu->vcpu);
 		vlapic->ipi_exit = val;
 		break;
 	case VM_CAP_MASK_HWINTR:
 		vcpu->caps &= ~(1 << VM_CAP_MASK_HWINTR);
 		vcpu->caps |= (val << VM_CAP_MASK_HWINTR);
 		break;
 	case VM_CAP_RFLAGS_TF: {
 		uint64_t rflags;
 
 		/* Fetch RFLAGS. */
 		if (svm_getreg(vcpu, VM_REG_GUEST_RFLAGS, &rflags)) {
 			error = (EINVAL);
 			break;
 		}
 		if (val) {
 			/* Save current TF bit. */
 			vcpu->dbg.rflags_tf = rflags & PSL_T;
 			/* Trace next instruction. */
 			if (svm_setreg(vcpu, VM_REG_GUEST_RFLAGS,
 				(rflags | PSL_T))) {
 				error = (EINVAL);
 				break;
 			}
 			vcpu->caps |= (1 << VM_CAP_RFLAGS_TF);
 		} else {
 			/*
 			 * Restore shadowed RFLAGS.TF only if vCPU was
 			 * previously stepped
 			 */
 			if (vcpu->caps & (1 << VM_CAP_RFLAGS_TF)) {
 				rflags &= ~PSL_T;
 				rflags |= vcpu->dbg.rflags_tf;
 				vcpu->dbg.rflags_tf = 0;
 
 				if (svm_setreg(vcpu, VM_REG_GUEST_RFLAGS,
 					rflags)) {
 					error = (EINVAL);
 					break;
 				}
 				vcpu->caps &= ~(1 << VM_CAP_RFLAGS_TF);
 			}
 		}
 
 		svm_set_intercept(vcpu, VMCB_EXC_INTCPT, BIT(IDT_DB), val);
 		svm_set_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_POPF,
 		    val);
 		svm_set_intercept(vcpu, VMCB_CTRL1_INTCPT, VMCB_INTCPT_PUSHF,
 		    val);
 		break;
 	}
 	default:
 		error = ENOENT;
 		break;
 	}
 	return (error);
 }
 
 static int
 svm_getcap(void *vcpui, int type, int *retval)
 {
 	struct svm_vcpu *vcpu;
 	struct vlapic *vlapic;
 	int error;
 
 	vcpu = vcpui;
 	error = 0;
 
 	switch (type) {
 	case VM_CAP_HALT_EXIT:
 		*retval = svm_get_intercept(vcpu, VMCB_CTRL1_INTCPT,
 		    VMCB_INTCPT_HLT);
 		break;
 	case VM_CAP_PAUSE_EXIT:
 		*retval = svm_get_intercept(vcpu, VMCB_CTRL1_INTCPT,
 		    VMCB_INTCPT_PAUSE);
 		break;
 	case VM_CAP_UNRESTRICTED_GUEST:
 		*retval = 1;	/* unrestricted guest is always enabled */
 		break;
 	case VM_CAP_BPT_EXIT:
 		*retval = svm_get_intercept(vcpu, VMCB_EXC_INTCPT, BIT(IDT_BP));
 		break;
 	case VM_CAP_IPI_EXIT:
 		vlapic = vm_lapic(vcpu->vcpu);
 		*retval = vlapic->ipi_exit;
 		break;
 	case VM_CAP_RFLAGS_TF:
 		*retval = !!(vcpu->caps & (1 << VM_CAP_RFLAGS_TF));
 		break;
 	case VM_CAP_MASK_HWINTR:
 		*retval = !!(vcpu->caps & (1 << VM_CAP_MASK_HWINTR));
 		break;
 	default:
 		error = ENOENT;
 		break;
 	}
 	return (error);
 }
 
 static struct vmspace *
 svm_vmspace_alloc(vm_offset_t min, vm_offset_t max)
 {
 	return (svm_npt_alloc(min, max));
 }
 
 static void
 svm_vmspace_free(struct vmspace *vmspace)
 {
 	svm_npt_free(vmspace);
 }
 
 static struct vlapic *
 svm_vlapic_init(void *vcpui)
 {
 	struct svm_vcpu *vcpu;
 	struct vlapic *vlapic;
 
 	vcpu = vcpui;
 	vlapic = malloc(sizeof(struct vlapic), M_SVM_VLAPIC, M_WAITOK | M_ZERO);
 	vlapic->vm = vcpu->sc->vm;
 	vlapic->vcpu = vcpu->vcpu;
 	vlapic->vcpuid = vcpu->vcpuid;
 	vlapic->apic_page = malloc_aligned(PAGE_SIZE, PAGE_SIZE, M_SVM_VLAPIC,
 	    M_WAITOK | M_ZERO);
 
 	vlapic_init(vlapic);
 
 	return (vlapic);
 }
 
 static void
 svm_vlapic_cleanup(struct vlapic *vlapic)
 {
 
         vlapic_cleanup(vlapic);
 	free(vlapic->apic_page, M_SVM_VLAPIC);
         free(vlapic, M_SVM_VLAPIC);
 }
 
 #ifdef BHYVE_SNAPSHOT
 static int
 svm_vcpu_snapshot(void *vcpui, struct vm_snapshot_meta *meta)
 {
 	struct svm_vcpu *vcpu;
 	int err, running, hostcpu;
 
 	vcpu = vcpui;
 	err = 0;
 
 	running = vcpu_is_running(vcpu->vcpu, &hostcpu);
 	if (running && hostcpu != curcpu) {
 		printf("%s: %s%d is running", __func__, vm_name(vcpu->sc->vm),
 		    vcpu->vcpuid);
 		return (EINVAL);
 	}
 
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_CR0, meta);
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_CR2, meta);
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_CR3, meta);
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_CR4, meta);
 
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_DR6, meta);
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_DR7, meta);
 
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_RAX, meta);
 
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_RSP, meta);
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_RIP, meta);
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_RFLAGS, meta);
 
 	/* Guest segments */
 	/* ES */
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_ES, meta);
 	err += vmcb_snapshot_desc(vcpu, VM_REG_GUEST_ES, meta);
 
 	/* CS */
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_CS, meta);
 	err += vmcb_snapshot_desc(vcpu, VM_REG_GUEST_CS, meta);
 
 	/* SS */
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_SS, meta);
 	err += vmcb_snapshot_desc(vcpu, VM_REG_GUEST_SS, meta);
 
 	/* DS */
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_DS, meta);
 	err += vmcb_snapshot_desc(vcpu, VM_REG_GUEST_DS, meta);
 
 	/* FS */
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_FS, meta);
 	err += vmcb_snapshot_desc(vcpu, VM_REG_GUEST_FS, meta);
 
 	/* GS */
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_GS, meta);
 	err += vmcb_snapshot_desc(vcpu, VM_REG_GUEST_GS, meta);
 
 	/* TR */
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_TR, meta);
 	err += vmcb_snapshot_desc(vcpu, VM_REG_GUEST_TR, meta);
 
 	/* LDTR */
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_LDTR, meta);
 	err += vmcb_snapshot_desc(vcpu, VM_REG_GUEST_LDTR, meta);
 
 	/* EFER */
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_EFER, meta);
 
 	/* IDTR and GDTR */
 	err += vmcb_snapshot_desc(vcpu, VM_REG_GUEST_IDTR, meta);
 	err += vmcb_snapshot_desc(vcpu, VM_REG_GUEST_GDTR, meta);
 
 	/* Specific AMD registers */
 	err += svm_snapshot_reg(vcpu, VM_REG_GUEST_INTR_SHADOW, meta);
 
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_CR_INTERCEPT, 4), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_DR_INTERCEPT, 4), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_EXC_INTERCEPT, 4), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_INST1_INTERCEPT, 4), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_INST2_INTERCEPT, 4), meta);
 
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_PAUSE_FILTHRESH, 2), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_PAUSE_FILCNT, 2), meta);
 
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_ASID, 4), meta);
 
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_TLB_CTRL, 4), meta);
 
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_VIRQ, 8), meta);
 
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_EXIT_REASON, 8), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_EXITINFO1, 8), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_EXITINFO2, 8), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_EXITINTINFO, 8), meta);
 
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_NP_ENABLE, 1), meta);
 
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_AVIC_BAR, 8), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_AVIC_PAGE, 8), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_AVIC_LT, 8), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_AVIC_PT, 8), meta);
 
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_CPL, 1), meta);
 
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_STAR, 8), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_LSTAR, 8), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_CSTAR, 8), meta);
 
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_SFMASK, 8), meta);
 
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_KERNELGBASE, 8), meta);
 
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_SYSENTER_CS, 8), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_SYSENTER_ESP, 8), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_SYSENTER_EIP, 8), meta);
 
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_GUEST_PAT, 8), meta);
 
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_DBGCTL, 8), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_BR_FROM, 8), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_BR_TO, 8), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_INT_FROM, 8), meta);
 	err += vmcb_snapshot_any(vcpu,
 				VMCB_ACCESS(VMCB_OFF_INT_TO, 8), meta);
 	if (err != 0)
 		goto done;
 
 	/* Snapshot swctx for virtual cpu */
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_rbp, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_rbx, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_rcx, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_rdx, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_rdi, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_rsi, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_r8, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_r9, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_r10, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_r11, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_r12, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_r13, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_r14, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_r15, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_dr0, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_dr1, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_dr2, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->swctx.sctx_dr3, meta, err, done);
 
 	/* Restore other svm_vcpu struct fields */
 
 	/* Restore NEXTRIP field */
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->nextrip, meta, err, done);
 
 	/* Restore lastcpu field */
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->lastcpu, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->dirty, meta, err, done);
 
 	/* Restore EPTGEN field - EPT is Extended Page Table */
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->eptgen, meta, err, done);
 
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->asid.gen, meta, err, done);
 	SNAPSHOT_VAR_OR_LEAVE(vcpu->asid.num, meta, err, done);
 
 	SNAPSHOT_BUF_OR_LEAVE(&vcpu->mtrr, sizeof(vcpu->mtrr), meta, err, done);
 
 	/* Set all caches dirty */
 	if (meta->op == VM_SNAPSHOT_RESTORE)
 		svm_set_dirty(vcpu, 0xffffffff);
 
 done:
 	return (err);
 }
 
 static int
 svm_restore_tsc(void *vcpui, uint64_t offset)
 {
 	struct svm_vcpu *vcpu = vcpui;
 
 	svm_set_tsc_offset(vcpu, offset);
 
 	return (0);
 }
 #endif
 
 const struct vmm_ops vmm_ops_amd = {
 	.modinit	= svm_modinit,
 	.modcleanup	= svm_modcleanup,
 	.modresume	= svm_modresume,
 	.init		= svm_init,
 	.run		= svm_run,
 	.cleanup	= svm_cleanup,
 	.vcpu_init	= svm_vcpu_init,
 	.vcpu_cleanup	= svm_vcpu_cleanup,
 	.getreg		= svm_getreg,
 	.setreg		= svm_setreg,
 	.getdesc	= svm_getdesc,
 	.setdesc	= svm_setdesc,
 	.getcap		= svm_getcap,
 	.setcap		= svm_setcap,
 	.vmspace_alloc	= svm_vmspace_alloc,
 	.vmspace_free	= svm_vmspace_free,
 	.vlapic_init	= svm_vlapic_init,
 	.vlapic_cleanup	= svm_vlapic_cleanup,
 #ifdef BHYVE_SNAPSHOT
 	.vcpu_snapshot	= svm_vcpu_snapshot,
 	.restore_tsc	= svm_restore_tsc,
 #endif
 };
diff --git a/sys/arm64/arm64/busdma_bounce.c b/sys/arm64/arm64/busdma_bounce.c
index 3836f8c74b45..da605d4e21f5 100644
--- a/sys/arm64/arm64/busdma_bounce.c
+++ b/sys/arm64/arm64/busdma_bounce.c
@@ -1,1149 +1,1149 @@
 /*-
  * Copyright (c) 1997, 1998 Justin T. Gibbs.
  * Copyright (c) 2015-2016 The FreeBSD Foundation
  * All rights reserved.
  *
  * Portions of this software were developed by Andrew Turner
  * under sponsorship of the FreeBSD Foundation.
  *
  * Portions of this software were developed by Semihalf
  * under sponsorship of the FreeBSD Foundation.
  *
  * 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,
  *    without modification, immediately at the beginning of the file.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
  * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/domainset.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/memdesc.h>
 #include <sys/msan.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/uio.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 
 #include <machine/atomic.h>
 #include <machine/bus.h>
 #include <machine/md_var.h>
 #include <arm64/include/bus_dma_impl.h>
 
 #define MAX_BPAGES 4096
 
 enum {
 	BF_COULD_BOUNCE		= 0x01,
 	BF_MIN_ALLOC_COMP	= 0x02,
 	BF_KMEM_ALLOC		= 0x04,
 	BF_COHERENT		= 0x10,
 };
 
 struct bounce_page;
 struct bounce_zone;
 
 struct bus_dma_tag {
 	struct bus_dma_tag_common common;
 	size_t			alloc_size;
 	size_t			alloc_alignment;
 	int			map_count;
 	int			bounce_flags;
 	bus_dma_segment_t	*segments;
 	struct bounce_zone	*bounce_zone;
 };
 
 static SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
     "Busdma parameters");
 
 struct sync_list {
 	vm_offset_t	vaddr;		/* kva of client data */
 	bus_addr_t	paddr;		/* physical address */
 	vm_page_t	pages;		/* starting page of client data */
 	bus_size_t	datacount;	/* client data count */
 };
 
 struct bus_dmamap {
 	STAILQ_HEAD(, bounce_page) bpages;
 	int		       pagesneeded;
 	int		       pagesreserved;
 	bus_dma_tag_t	       dmat;
 	struct memdesc	       mem;
 	bus_dmamap_callback_t *callback;
 	void		      *callback_arg;
 	__sbintime_t	       queued_time;
 	STAILQ_ENTRY(bus_dmamap) links;
 	u_int			flags;
 #define	DMAMAP_COHERENT		(1 << 0)
 #define	DMAMAP_FROM_DMAMEM	(1 << 1)
 #define	DMAMAP_MBUF		(1 << 2)
 	int			sync_count;
 #ifdef KMSAN
 	struct memdesc	       kmsan_mem;
 #endif
 	struct sync_list	slist[];
 };
 
 static bool _bus_dmamap_pagesneeded(bus_dma_tag_t dmat, bus_dmamap_t map,
     vm_paddr_t buf, bus_size_t buflen, int *pagesneeded);
 static void _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
     pmap_t pmap, void *buf, bus_size_t buflen, int flags);
 static void _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map,
     vm_paddr_t buf, bus_size_t buflen, int flags);
 
 static MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata");
 
 #define	dmat_alignment(dmat)	((dmat)->common.alignment)
 #define	dmat_bounce_flags(dmat)	((dmat)->bounce_flags)
 #define	dmat_boundary(dmat)	((dmat)->common.boundary)
 #define	dmat_domain(dmat)	((dmat)->common.domain)
 #define	dmat_flags(dmat)	((dmat)->common.flags)
 #define	dmat_highaddr(dmat)	((dmat)->common.highaddr)
 #define	dmat_lowaddr(dmat)	((dmat)->common.lowaddr)
 #define	dmat_lockfunc(dmat)	((dmat)->common.lockfunc)
 #define	dmat_lockfuncarg(dmat)	((dmat)->common.lockfuncarg)
 #define	dmat_maxsegsz(dmat)	((dmat)->common.maxsegsz)
 #define	dmat_nsegments(dmat)	((dmat)->common.nsegments)
 
 #include "../../kern/subr_busdma_bounce.c"
 
 static int
 bounce_bus_dma_zone_setup(bus_dma_tag_t dmat)
 {
 	struct bounce_zone *bz;
 	bus_size_t maxsize;
 	int error;
 
 	/*
 	 * Round size up to a full page, and add one more page because
 	 * there can always be one more boundary crossing than the
 	 * number of pages in a transfer.
 	 */
 	maxsize = roundup2(dmat->common.maxsize, PAGE_SIZE) + PAGE_SIZE;
 
 	/* Must bounce */
 	if ((error = alloc_bounce_zone(dmat)) != 0)
 		return (error);
 	bz = dmat->bounce_zone;
 
 	if (ptoa(bz->total_bpages) < maxsize) {
 		int pages;
 
 		pages = atop(maxsize) + 1 - bz->total_bpages;
 
 		/* Add pages to our bounce pool */
 		if (alloc_bounce_pages(dmat, pages) < pages)
 			return (ENOMEM);
 	}
 	/* Performed initial allocation */
 	dmat->bounce_flags |= BF_MIN_ALLOC_COMP;
 
 	return (error);
 }
 
 /*
  * Return true if the DMA should bounce because the start or end does not fall
  * on a cacheline boundary (which would require a partial cacheline flush).
  * COHERENT memory doesn't trigger cacheline flushes.  Memory allocated by
  * bus_dmamem_alloc() is always aligned to cacheline boundaries, and there's a
  * strict rule that such memory cannot be accessed by the CPU while DMA is in
  * progress (or by multiple DMA engines at once), so that it's always safe to do
  * full cacheline flushes even if that affects memory outside the range of a
  * given DMA operation that doesn't involve the full allocated buffer.  If we're
  * mapping an mbuf, that follows the same rules as a buffer we allocated.
  */
 static bool
 cacheline_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr,
     bus_size_t size)
 {
 
 #define	DMAMAP_CACHELINE_FLAGS						\
     (DMAMAP_FROM_DMAMEM | DMAMAP_COHERENT | DMAMAP_MBUF)
 	if ((dmat->bounce_flags & BF_COHERENT) != 0)
 		return (false);
 	if (map != NULL && (map->flags & DMAMAP_CACHELINE_FLAGS) != 0)
 		return (false);
 	return (((paddr | size) & (dcache_line_size - 1)) != 0);
 #undef DMAMAP_CACHELINE_FLAGS
 }
 
 /*
  * Return true if the given address does not fall on the alignment boundary.
  */
 static bool
 alignment_bounce(bus_dma_tag_t dmat, bus_addr_t addr)
 {
 
 	return (!vm_addr_align_ok(addr, dmat->common.alignment));
 }
 
 static bool
 might_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr,
     bus_size_t size)
 {
 
 	/* Memory allocated by bounce_bus_dmamem_alloc won't bounce */
 	if (map && (map->flags & DMAMAP_FROM_DMAMEM) != 0)
 		return (false);
 
 	if ((dmat->bounce_flags & BF_COULD_BOUNCE) != 0)
 		return (true);
 
 	if (cacheline_bounce(dmat, map, paddr, size))
 		return (true);
 
 	if (alignment_bounce(dmat, paddr))
 		return (true);
 
 	return (false);
 }
 
 static bool
 must_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr,
     bus_size_t size)
 {
 
 	if (cacheline_bounce(dmat, map, paddr, size))
 		return (true);
 
 	if ((dmat->bounce_flags & BF_COULD_BOUNCE) != 0 &&
 	    addr_needs_bounce(dmat, paddr))
 		return (true);
 
 	return (false);
 }
 
 /*
  * Allocate a device specific dma_tag.
  */
 static int
 bounce_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
     bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr,
     bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags,
     bus_dma_lock_t *lockfunc, void *lockfuncarg, bus_dma_tag_t *dmat)
 {
 	bus_dma_tag_t newtag;
 	int error;
 
 	*dmat = NULL;
 	error = common_bus_dma_tag_create(parent != NULL ? &parent->common :
 	    NULL, alignment, boundary, lowaddr, highaddr, maxsize, nsegments,
 	    maxsegsz, flags, lockfunc, lockfuncarg,
 	    sizeof (struct bus_dma_tag), (void **)&newtag);
 	if (error != 0)
 		return (error);
 
 	newtag->common.impl = &bus_dma_bounce_impl;
 	newtag->map_count = 0;
 	newtag->segments = NULL;
 
 	if ((flags & BUS_DMA_COHERENT) != 0) {
 		newtag->bounce_flags |= BF_COHERENT;
 	}
 
 	if (parent != NULL) {
 		if ((parent->bounce_flags & BF_COULD_BOUNCE) != 0)
 			newtag->bounce_flags |= BF_COULD_BOUNCE;
 
 		/* Copy some flags from the parent */
 		newtag->bounce_flags |= parent->bounce_flags & BF_COHERENT;
 	}
 
 	if ((newtag->bounce_flags & BF_COHERENT) != 0) {
 		newtag->alloc_alignment = newtag->common.alignment;
 		newtag->alloc_size = newtag->common.maxsize;
 	} else {
 		/*
 		 * Ensure the buffer is aligned to a cacheline when allocating
 		 * a non-coherent buffer. This is so we don't have any data
 		 * that another CPU may be accessing around DMA buffer
 		 * causing the cache to become dirty.
 		 */
 		newtag->alloc_alignment = MAX(newtag->common.alignment,
 		    dcache_line_size);
 		newtag->alloc_size = roundup2(newtag->common.maxsize,
 		    dcache_line_size);
 	}
 
 	if (newtag->common.lowaddr < ptoa((vm_paddr_t)Maxmem) ||
 	    newtag->common.alignment > 1)
 		newtag->bounce_flags |= BF_COULD_BOUNCE;
 
 	if ((flags & BUS_DMA_ALLOCNOW) != 0)
 		error = bounce_bus_dma_zone_setup(newtag);
 	else
 		error = 0;
 
 	if (error != 0)
 		free(newtag, M_DEVBUF);
 	else
 		*dmat = newtag;
 	CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
 	    __func__, newtag, (newtag != NULL ? newtag->common.flags : 0),
 	    error);
 	return (error);
 }
 
 static int
 bounce_bus_dma_tag_destroy(bus_dma_tag_t dmat)
 {
 	int error = 0;
 
 	if (dmat != NULL) {
 		if (dmat->map_count != 0) {
 			error = EBUSY;
 			goto out;
 		}
 		if (dmat->segments != NULL)
 			free(dmat->segments, M_DEVBUF);
 		free(dmat, M_DEVBUF);
 	}
 out:
 	CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat, error);
 	return (error);
 }
 
 /*
  * Update the domain for the tag.  We may need to reallocate the zone and
  * bounce pages.
  */
 static int
 bounce_bus_dma_tag_set_domain(bus_dma_tag_t dmat)
 {
 
 	KASSERT(dmat->map_count == 0,
 	    ("bounce_bus_dma_tag_set_domain:  Domain set after use.\n"));
 	if ((dmat->bounce_flags & BF_COULD_BOUNCE) == 0 ||
 	    dmat->bounce_zone == NULL)
 		return (0);
 	dmat->bounce_flags &= ~BF_MIN_ALLOC_COMP;
 	return (bounce_bus_dma_zone_setup(dmat));
 }
 
 static bool
 bounce_bus_dma_id_mapped(bus_dma_tag_t dmat, vm_paddr_t buf, bus_size_t buflen)
 {
 
 	if (!might_bounce(dmat, NULL, buf, buflen))
 		return (true);
 	return (!_bus_dmamap_pagesneeded(dmat, NULL, buf, buflen, NULL));
 }
 
 static bus_dmamap_t
 alloc_dmamap(bus_dma_tag_t dmat, int flags)
 {
 	u_long mapsize;
 	bus_dmamap_t map;
 
 	mapsize = sizeof(*map);
 	mapsize += sizeof(struct sync_list) * dmat->common.nsegments;
 	map = malloc_domainset(mapsize, M_DEVBUF,
 	    DOMAINSET_PREF(dmat->common.domain), flags | M_ZERO);
 	if (map == NULL)
 		return (NULL);
 
 	/* Initialize the new map */
 	STAILQ_INIT(&map->bpages);
 
 	return (map);
 }
 
 /*
  * Allocate a handle for mapping from kva/uva/physical
  * address space into bus device space.
  */
 static int
 bounce_bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
 {
 	struct bounce_zone *bz;
 	int error, maxpages, pages;
 
 	error = 0;
 
 	if (dmat->segments == NULL) {
 		dmat->segments = mallocarray_domainset(dmat->common.nsegments,
 		    sizeof(bus_dma_segment_t), M_DEVBUF,
 		    DOMAINSET_PREF(dmat->common.domain), M_NOWAIT);
 		if (dmat->segments == NULL) {
 			CTR3(KTR_BUSDMA, "%s: tag %p error %d",
 			    __func__, dmat, ENOMEM);
 			return (ENOMEM);
 		}
 	}
 
 	*mapp = alloc_dmamap(dmat, M_NOWAIT);
 	if (*mapp == NULL) {
 		CTR3(KTR_BUSDMA, "%s: tag %p error %d",
 		    __func__, dmat, ENOMEM);
 		return (ENOMEM);
 	}
 
 	/*
 	 * Bouncing might be required if the driver asks for an active
 	 * exclusion region, a data alignment that is stricter than 1, and/or
 	 * an active address boundary.
 	 */
 	if (dmat->bounce_zone == NULL) {
 		if ((error = alloc_bounce_zone(dmat)) != 0) {
 			free(*mapp, M_DEVBUF);
 			return (error);
 		}
 	}
 	bz = dmat->bounce_zone;
 
 	/*
 	 * Attempt to add pages to our pool on a per-instance basis up to a sane
 	 * limit. Even if the tag isn't subject of bouncing due to alignment
 	 * and boundary constraints, it could still auto-bounce due to
 	 * cacheline alignment, which requires at most two bounce pages.
 	 */
 	if (dmat->common.alignment > 1)
 		maxpages = MAX_BPAGES;
 	else
 		maxpages = MIN(MAX_BPAGES, Maxmem -
 		    atop(dmat->common.lowaddr));
 	if ((dmat->bounce_flags & BF_MIN_ALLOC_COMP) == 0 ||
 	    (bz->map_count > 0 && bz->total_bpages < maxpages)) {
 		pages = atop(roundup2(dmat->common.maxsize, PAGE_SIZE)) + 1;
 		pages = MIN(maxpages - bz->total_bpages, pages);
 		pages = MAX(pages, 2);
 		if (alloc_bounce_pages(dmat, pages) < pages)
 			error = ENOMEM;
 		if ((dmat->bounce_flags & BF_MIN_ALLOC_COMP) == 0) {
 			if (error == 0) {
 				dmat->bounce_flags |= BF_MIN_ALLOC_COMP;
 			}
 		} else
 			error = 0;
 	}
 	bz->map_count++;
 
 	if (error == 0) {
 		dmat->map_count++;
 		if ((dmat->bounce_flags & BF_COHERENT) != 0)
 			(*mapp)->flags |= DMAMAP_COHERENT;
 	} else {
 		free(*mapp, M_DEVBUF);
 	}
 	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 	    __func__, dmat, dmat->common.flags, error);
 	return (error);
 }
 
 /*
  * Destroy a handle for mapping from kva/uva/physical
  * address space into bus device space.
  */
 static int
 bounce_bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
 
 	/* Check we are destroying the correct map type */
 	if ((map->flags & DMAMAP_FROM_DMAMEM) != 0)
 		panic("bounce_bus_dmamap_destroy: Invalid map freed\n");
 
 	if (STAILQ_FIRST(&map->bpages) != NULL || map->sync_count != 0) {
 		CTR3(KTR_BUSDMA, "%s: tag %p error %d", __func__, dmat, EBUSY);
 		return (EBUSY);
 	}
 	if (dmat->bounce_zone)
 		dmat->bounce_zone->map_count--;
 	free(map, M_DEVBUF);
 	dmat->map_count--;
 	CTR2(KTR_BUSDMA, "%s: tag %p error 0", __func__, dmat);
 	return (0);
 }
 
 /*
  * Allocate a piece of memory that can be efficiently mapped into
  * bus device space based on the constraints lited in the dma tag.
  * A dmamap to for use with dmamap_load is also allocated.
  */
 static int
 bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
     bus_dmamap_t *mapp)
 {
 	vm_memattr_t attr;
 	int mflags;
 
 	if (flags & BUS_DMA_NOWAIT)
 		mflags = M_NOWAIT;
 	else
 		mflags = M_WAITOK;
 
 	if (dmat->segments == NULL) {
 		dmat->segments = mallocarray_domainset(dmat->common.nsegments,
 		    sizeof(bus_dma_segment_t), M_DEVBUF,
 		    DOMAINSET_PREF(dmat->common.domain), mflags);
 		if (dmat->segments == NULL) {
 			CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 			    __func__, dmat, dmat->common.flags, ENOMEM);
 			return (ENOMEM);
 		}
 	}
 	if (flags & BUS_DMA_ZERO)
 		mflags |= M_ZERO;
 	if (flags & BUS_DMA_NOCACHE)
 		attr = VM_MEMATTR_UNCACHEABLE;
 	else if ((flags & BUS_DMA_COHERENT) != 0 &&
 	    (dmat->bounce_flags & BF_COHERENT) == 0)
 		/*
 		 * If we have a non-coherent tag, and are trying to allocate
 		 * a coherent block of memory it needs to be uncached.
 		 */
 		attr = VM_MEMATTR_UNCACHEABLE;
 	else
 		attr = VM_MEMATTR_DEFAULT;
 
 	/*
 	 * Create the map, but don't set the could bounce flag as
 	 * this allocation should never bounce;
 	 */
 	*mapp = alloc_dmamap(dmat, mflags);
 	if (*mapp == NULL) {
 		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 		    __func__, dmat, dmat->common.flags, ENOMEM);
 		return (ENOMEM);
 	}
 
 	/*
 	 * Mark the map as coherent if we used uncacheable memory or the
 	 * tag was already marked as coherent.
 	 */
 	if (attr == VM_MEMATTR_UNCACHEABLE ||
 	    (dmat->bounce_flags & BF_COHERENT) != 0)
 		(*mapp)->flags |= DMAMAP_COHERENT;
 
 	(*mapp)->flags |= DMAMAP_FROM_DMAMEM;
 
 	/*
 	 * Allocate the buffer from the malloc(9) allocator if...
 	 *  - It's small enough to fit into a single page.
 	 *  - Its alignment requirement is also smaller than the page size.
 	 *  - The low address requirement is fulfilled.
 	 *  - Default cache attributes are requested (WB).
 	 * else allocate non-contiguous pages if...
 	 *  - The page count that could get allocated doesn't exceed
 	 *    nsegments also when the maximum segment size is less
 	 *    than PAGE_SIZE.
 	 *  - The alignment constraint isn't larger than a page boundary.
 	 *  - There are no boundary-crossing constraints.
 	 * else allocate a block of contiguous pages because one or more of the
 	 * constraints is something that only the contig allocator can fulfill.
 	 *
 	 * NOTE: The (dmat->common.alignment <= dmat->maxsize) check
 	 * below is just a quick hack. The exact alignment guarantees
 	 * of malloc(9) need to be nailed down, and the code below
 	 * should be rewritten to take that into account.
 	 *
 	 * In the meantime warn the user if malloc gets it wrong.
 	 */
 	if (dmat->alloc_size <= PAGE_SIZE &&
 	    dmat->alloc_alignment <= PAGE_SIZE &&
 	    dmat->common.lowaddr >= ptoa((vm_paddr_t)Maxmem) &&
 	    attr == VM_MEMATTR_DEFAULT) {
 		*vaddr = malloc_domainset_aligned(dmat->alloc_size,
 		    dmat->alloc_alignment, M_DEVBUF,
 		    DOMAINSET_PREF(dmat->common.domain), mflags);
 	} else if (dmat->common.nsegments >=
 	    howmany(dmat->alloc_size, MIN(dmat->common.maxsegsz, PAGE_SIZE)) &&
 	    dmat->alloc_alignment <= PAGE_SIZE &&
 	    (dmat->common.boundary % PAGE_SIZE) == 0) {
 		/* Page-based multi-segment allocations allowed */
 		*vaddr = kmem_alloc_attr_domainset(
 		    DOMAINSET_PREF(dmat->common.domain), dmat->alloc_size,
 		    mflags, 0ul, dmat->common.lowaddr, attr);
 		dmat->bounce_flags |= BF_KMEM_ALLOC;
 	} else {
 		*vaddr = kmem_alloc_contig_domainset(
 		    DOMAINSET_PREF(dmat->common.domain), dmat->alloc_size,
 		    mflags, 0ul, dmat->common.lowaddr,
 		    dmat->alloc_alignment != 0 ? dmat->alloc_alignment : 1ul,
 		    dmat->common.boundary, attr);
 		dmat->bounce_flags |= BF_KMEM_ALLOC;
 	}
 	if (*vaddr == NULL) {
 		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 		    __func__, dmat, dmat->common.flags, ENOMEM);
 		free(*mapp, M_DEVBUF);
 		return (ENOMEM);
 	} else if (!vm_addr_align_ok(vtophys(*vaddr), dmat->alloc_alignment)) {
 		printf("bus_dmamem_alloc failed to align memory properly.\n");
 	}
 	dmat->map_count++;
 	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 	    __func__, dmat, dmat->common.flags, 0);
 	return (0);
 }
 
 /*
  * Free a piece of memory and it's allociated dmamap, that was allocated
- * via bus_dmamem_alloc.  Make the same choice for free/contigfree.
+ * via bus_dmamem_alloc.
  */
 static void
 bounce_bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
 {
 
 	/*
 	 * Check the map came from bounce_bus_dmamem_alloc, so the map
 	 * should be NULL and the BF_KMEM_ALLOC flag cleared if malloc()
 	 * was used and set if kmem_alloc_contig() was used.
 	 */
 	if ((map->flags & DMAMAP_FROM_DMAMEM) == 0)
 		panic("bus_dmamem_free: Invalid map freed\n");
 	if ((dmat->bounce_flags & BF_KMEM_ALLOC) == 0)
 		free(vaddr, M_DEVBUF);
 	else
 		kmem_free(vaddr, dmat->alloc_size);
 	free(map, M_DEVBUF);
 	dmat->map_count--;
 	CTR3(KTR_BUSDMA, "%s: tag %p flags 0x%x", __func__, dmat,
 	    dmat->bounce_flags);
 }
 
 static bool
 _bus_dmamap_pagesneeded(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf,
     bus_size_t buflen, int *pagesneeded)
 {
 	bus_addr_t curaddr;
 	bus_size_t sgsize;
 	int count;
 
 	/*
 	 * Count the number of bounce pages needed in order to
 	 * complete this transfer
 	 */
 	count = 0;
 	curaddr = buf;
 	while (buflen != 0) {
 		sgsize = buflen;
 		if (must_bounce(dmat, map, curaddr, sgsize)) {
 			sgsize = MIN(sgsize,
 			    PAGE_SIZE - (curaddr & PAGE_MASK));
 			if (pagesneeded == NULL)
 				return (true);
 			count++;
 		}
 		curaddr += sgsize;
 		buflen -= sgsize;
 	}
 
 	if (pagesneeded != NULL)
 		*pagesneeded = count;
 	return (count != 0);
 }
 
 static void
 _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf,
     bus_size_t buflen, int flags)
 {
 
 	if (map->pagesneeded == 0) {
 		_bus_dmamap_pagesneeded(dmat, map, buf, buflen,
 		    &map->pagesneeded);
 		CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
 	}
 }
 
 static void
 _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap,
     void *buf, bus_size_t buflen, int flags)
 {
 	vm_offset_t vaddr;
 	vm_offset_t vendaddr;
 	bus_addr_t paddr;
 	bus_size_t sg_len;
 
 	if (map->pagesneeded == 0) {
 		CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, "
 		    "alignment= %d", dmat->common.lowaddr,
 		    ptoa((vm_paddr_t)Maxmem),
 		    dmat->common.boundary, dmat->common.alignment);
 		CTR2(KTR_BUSDMA, "map= %p, pagesneeded= %d", map,
 		    map->pagesneeded);
 		/*
 		 * Count the number of bounce pages
 		 * needed in order to complete this transfer
 		 */
 		vaddr = (vm_offset_t)buf;
 		vendaddr = (vm_offset_t)buf + buflen;
 
 		while (vaddr < vendaddr) {
 			sg_len = MIN(vendaddr - vaddr,
 			    PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK));
 			if (pmap == kernel_pmap)
 				paddr = pmap_kextract(vaddr);
 			else
 				paddr = pmap_extract(pmap, vaddr);
 			if (must_bounce(dmat, map, paddr, sg_len) != 0) {
 				sg_len = roundup2(sg_len,
 				    dmat->common.alignment);
 				map->pagesneeded++;
 			}
 			vaddr += sg_len;
 		}
 		CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
 	}
 }
 
 /*
  * Utility function to load a physical buffer.  segp contains
  * the starting segment on entrace, and the ending segment on exit.
  */
 static int
 bounce_bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map,
     vm_paddr_t buf, bus_size_t buflen, int flags, bus_dma_segment_t *segs,
     int *segp)
 {
 	struct sync_list *sl;
 	bus_size_t sgsize;
 	bus_addr_t curaddr, sl_end;
 	int error;
 
 	if (segs == NULL)
 		segs = dmat->segments;
 
 	if (might_bounce(dmat, map, (bus_addr_t)buf, buflen)) {
 		_bus_dmamap_count_phys(dmat, map, buf, buflen, flags);
 		if (map->pagesneeded != 0) {
 			error = _bus_dmamap_reserve_pages(dmat, map, flags);
 			if (error)
 				return (error);
 		}
 	}
 
 	sl = map->slist + map->sync_count - 1;
 	sl_end = 0;
 
 	while (buflen > 0) {
 		curaddr = buf;
 		sgsize = buflen;
 		if (map->pagesneeded != 0 &&
 		    must_bounce(dmat, map, curaddr, sgsize)) {
 			/*
 			 * The attempt to split a physically continuous buffer
 			 * seems very controversial, it's unclear whether we
 			 * can do this in all cases. Also, memory for bounced
 			 * buffers is allocated as pages, so we cannot
 			 * guarantee multipage alignment.
 			 */
 			KASSERT(dmat->common.alignment <= PAGE_SIZE,
 			    ("bounced buffer cannot have alignment bigger "
 			    "than PAGE_SIZE: %lu", dmat->common.alignment));
 			sgsize = MIN(sgsize, PAGE_SIZE - (curaddr & PAGE_MASK));
 			curaddr = add_bounce_page(dmat, map, 0, curaddr,
 			    sgsize);
 		} else if ((map->flags & DMAMAP_COHERENT) == 0) {
 			if (map->sync_count > 0)
 				sl_end = sl->paddr + sl->datacount;
 
 			if (map->sync_count == 0 || curaddr != sl_end) {
 				if (++map->sync_count > dmat->common.nsegments)
 					break;
 				sl++;
 				sl->vaddr = 0;
 				sl->paddr = curaddr;
 				sl->pages = PHYS_TO_VM_PAGE(curaddr);
 				KASSERT(sl->pages != NULL,
 				    ("%s: page at PA:0x%08lx is not in "
 				    "vm_page_array", __func__, curaddr));
 				sl->datacount = sgsize;
 			} else
 				sl->datacount += sgsize;
 		}
 		if (!_bus_dmamap_addsegs(dmat, map, curaddr, sgsize, segs,
 		    segp))
 			break;
 		buf += sgsize;
 		buflen -= sgsize;
 	}
 
 	/*
 	 * Did we fit?
 	 */
 	if (buflen != 0) {
 		bus_dmamap_unload(dmat, map);
 		return (EFBIG); /* XXX better return value here? */
 	}
 	return (0);
 }
 
 /*
  * Utility function to load a linear buffer.  segp contains
  * the starting segment on entrace, and the ending segment on exit.
  */
 static int
 bounce_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
     bus_size_t buflen, pmap_t pmap, int flags, bus_dma_segment_t *segs,
     int *segp)
 {
 	struct sync_list *sl;
 	bus_size_t sgsize;
 	bus_addr_t curaddr, sl_pend;
 	vm_offset_t kvaddr, vaddr, sl_vend;
 	int error;
 
 	KASSERT((map->flags & DMAMAP_FROM_DMAMEM) != 0 ||
 	    dmat->common.alignment <= PAGE_SIZE,
 	    ("loading user buffer with alignment bigger than PAGE_SIZE is not "
 	    "supported"));
 
 	if (segs == NULL)
 		segs = dmat->segments;
 
 	if (flags & BUS_DMA_LOAD_MBUF)
 		map->flags |= DMAMAP_MBUF;
 
 	if (might_bounce(dmat, map, (bus_addr_t)buf, buflen)) {
 		_bus_dmamap_count_pages(dmat, map, pmap, buf, buflen, flags);
 		if (map->pagesneeded != 0) {
 			error = _bus_dmamap_reserve_pages(dmat, map, flags);
 			if (error)
 				return (error);
 		}
 	}
 
 	/*
 	 * XXX Optimally we should parse input buffer for physically
 	 * continuous segments first and then pass these segment into
 	 * load loop.
 	 */
 	sl = map->slist + map->sync_count - 1;
 	vaddr = (vm_offset_t)buf;
 	sl_pend = 0;
 	sl_vend = 0;
 
 	while (buflen > 0) {
 		/*
 		 * Get the physical address for this segment.
 		 */
 		if (__predict_true(pmap == kernel_pmap)) {
 			curaddr = pmap_kextract(vaddr);
 			kvaddr = vaddr;
 		} else {
 			curaddr = pmap_extract(pmap, vaddr);
 			kvaddr = 0;
 		}
 
 		/*
 		 * Compute the segment size, and adjust counts.
 		 */
 		sgsize = buflen;
 		if ((map->flags & DMAMAP_FROM_DMAMEM) == 0)
 			sgsize = MIN(sgsize, PAGE_SIZE - (curaddr & PAGE_MASK));
 
 		if (map->pagesneeded != 0 &&
 		    must_bounce(dmat, map, curaddr, sgsize)) {
 			/* See comment in bounce_bus_dmamap_load_phys */
 			KASSERT(dmat->common.alignment <= PAGE_SIZE,
 			    ("bounced buffer cannot have alignment bigger "
 			    "than PAGE_SIZE: %lu", dmat->common.alignment));
 			curaddr = add_bounce_page(dmat, map, kvaddr, curaddr,
 			    sgsize);
 		} else if ((map->flags & DMAMAP_COHERENT) == 0) {
 			if (map->sync_count > 0) {
 				sl_pend = sl->paddr + sl->datacount;
 				sl_vend = sl->vaddr + sl->datacount;
 			}
 
 			if (map->sync_count == 0 ||
 			    (kvaddr != 0 && kvaddr != sl_vend) ||
 			    (curaddr != sl_pend)) {
 				if (++map->sync_count > dmat->common.nsegments)
 					break;
 				sl++;
 				sl->vaddr = kvaddr;
 				sl->paddr = curaddr;
 				if (kvaddr != 0) {
 					sl->pages = NULL;
 				} else {
 					sl->pages = PHYS_TO_VM_PAGE(curaddr);
 					KASSERT(sl->pages != NULL,
 					    ("%s: page at PA:0x%08lx is not "
 					    "in vm_page_array", __func__,
 					    curaddr));
 				}
 				sl->datacount = sgsize;
 			} else
 				sl->datacount += sgsize;
 		}
 		if (!_bus_dmamap_addsegs(dmat, map, curaddr, sgsize, segs,
 		    segp))
 			break;
 		vaddr += sgsize;
 		buflen -= MIN(sgsize, buflen); /* avoid underflow */
 	}
 
 	/*
 	 * Did we fit?
 	 */
 	if (buflen != 0) {
 		bus_dmamap_unload(dmat, map);
 		return (EFBIG); /* XXX better return value here? */
 	}
 	return (0);
 }
 
 static void
 bounce_bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap_t map,
     struct memdesc *mem, bus_dmamap_callback_t *callback, void *callback_arg)
 {
 
 	map->mem = *mem;
 	map->dmat = dmat;
 	map->callback = callback;
 	map->callback_arg = callback_arg;
 }
 
 static bus_dma_segment_t *
 bounce_bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map,
     bus_dma_segment_t *segs, int nsegs, int error)
 {
 
 	if (segs == NULL)
 		segs = dmat->segments;
 	return (segs);
 }
 
 /*
  * Release the mapping held by map.
  */
 static void
 bounce_bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
 	free_bounce_pages(dmat, map);
 	map->sync_count = 0;
 	map->flags &= ~DMAMAP_MBUF;
 }
 
 static void
 dma_preread_safe(char *va, vm_size_t size)
 {
 	/*
 	 * Write back any partial cachelines immediately before and
 	 * after the DMA region.
 	 */
 	if (!__is_aligned(va, dcache_line_size))
 		cpu_dcache_wb_range(va, 1);
 	if (!__is_aligned(va + size, dcache_line_size))
 		cpu_dcache_wb_range(va + size, 1);
 
 	cpu_dcache_inv_range(va, size);
 }
 
 static void
 dma_dcache_sync(struct sync_list *sl, bus_dmasync_op_t op)
 {
 	uint32_t len, offset;
 	vm_page_t m;
 	vm_paddr_t pa;
 	vm_offset_t va, tempva;
 	bus_size_t size;
 
 	offset = sl->paddr & PAGE_MASK;
 	m = sl->pages;
 	size = sl->datacount;
 	pa = sl->paddr;
 
 	for ( ; size != 0; size -= len, pa += len, offset = 0, ++m) {
 		tempva = 0;
 		if (sl->vaddr == 0) {
 			len = min(PAGE_SIZE - offset, size);
 			tempva = pmap_quick_enter_page(m);
 			va = tempva | offset;
 			KASSERT(pa == (VM_PAGE_TO_PHYS(m) | offset),
 			    ("unexpected vm_page_t phys: 0x%16lx != 0x%16lx",
 			    VM_PAGE_TO_PHYS(m) | offset, pa));
 		} else {
 			len = sl->datacount;
 			va = sl->vaddr;
 		}
 
 		switch (op) {
 		case BUS_DMASYNC_PREWRITE:
 		case BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD:
 			cpu_dcache_wb_range((void *)va, len);
 			break;
 		case BUS_DMASYNC_PREREAD:
 			/*
 			 * An mbuf may start in the middle of a cacheline. There
 			 * will be no cpu writes to the beginning of that line
 			 * (which contains the mbuf header) while dma is in
 			 * progress.  Handle that case by doing a writeback of
 			 * just the first cacheline before invalidating the
 			 * overall buffer.  Any mbuf in a chain may have this
 			 * misalignment.  Buffers which are not mbufs bounce if
 			 * they are not aligned to a cacheline.
 			 */
 			dma_preread_safe((void *)va, len);
 			break;
 		case BUS_DMASYNC_POSTREAD:
 		case BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE:
 			cpu_dcache_inv_range((void *)va, len);
 			break;
 		default:
 			panic("unsupported combination of sync operations: "
                               "0x%08x\n", op);
 		}
 
 		if (tempva != 0)
 			pmap_quick_remove_page(tempva);
 	}
 }
 
 static void
 bounce_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map,
     bus_dmasync_op_t op)
 {
 	struct bounce_page *bpage;
 	struct sync_list *sl, *end;
 	vm_offset_t datavaddr, tempvaddr;
 
 	if (op == BUS_DMASYNC_POSTWRITE)
 		return;
 
 	if ((op & BUS_DMASYNC_POSTREAD) != 0) {
 		/*
 		 * Wait for any DMA operations to complete before the bcopy.
 		 */
 		dsb(sy);
 	}
 
 	if ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) {
 		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x op 0x%x "
 		    "performing bounce", __func__, dmat, dmat->common.flags,
 		    op);
 
 		if ((op & BUS_DMASYNC_PREWRITE) != 0) {
 			while (bpage != NULL) {
 				tempvaddr = 0;
 				datavaddr = bpage->datavaddr;
 				if (datavaddr == 0) {
 					tempvaddr = pmap_quick_enter_page(
 					    bpage->datapage);
 					datavaddr = tempvaddr | bpage->dataoffs;
 				}
 
 				bcopy((void *)datavaddr,
 				    (void *)bpage->vaddr, bpage->datacount);
 				if (tempvaddr != 0)
 					pmap_quick_remove_page(tempvaddr);
 				if ((map->flags & DMAMAP_COHERENT) == 0)
 					cpu_dcache_wb_range((void *)bpage->vaddr,
 					    bpage->datacount);
 				bpage = STAILQ_NEXT(bpage, links);
 			}
 			dmat->bounce_zone->total_bounced++;
 		} else if ((op & BUS_DMASYNC_PREREAD) != 0) {
 			while (bpage != NULL) {
 				if ((map->flags & DMAMAP_COHERENT) == 0)
 					cpu_dcache_wbinv_range((void *)bpage->vaddr,
 					    bpage->datacount);
 				bpage = STAILQ_NEXT(bpage, links);
 			}
 		}
 
 		if ((op & BUS_DMASYNC_POSTREAD) != 0) {
 			while (bpage != NULL) {
 				if ((map->flags & DMAMAP_COHERENT) == 0)
 					cpu_dcache_inv_range((void *)bpage->vaddr,
 					    bpage->datacount);
 				tempvaddr = 0;
 				datavaddr = bpage->datavaddr;
 				if (datavaddr == 0) {
 					tempvaddr = pmap_quick_enter_page(
 					    bpage->datapage);
 					datavaddr = tempvaddr | bpage->dataoffs;
 				}
 
 				bcopy((void *)bpage->vaddr,
 				    (void *)datavaddr, bpage->datacount);
 
 				if (tempvaddr != 0)
 					pmap_quick_remove_page(tempvaddr);
 				bpage = STAILQ_NEXT(bpage, links);
 			}
 			dmat->bounce_zone->total_bounced++;
 		}
 	}
 
 	/*
 	 * Cache maintenance for normal (non-COHERENT non-bounce) buffers.
 	 */
 	if (map->sync_count != 0) {
 		sl = &map->slist[0];
 		end = &map->slist[map->sync_count];
 		CTR3(KTR_BUSDMA, "%s: tag %p op 0x%x "
 		    "performing sync", __func__, dmat, op);
 
 		for ( ; sl != end; ++sl)
 			dma_dcache_sync(sl, op);
 	}
 
 	if ((op & (BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE)) != 0) {
 		/*
 		 * Wait for the bcopy to complete before any DMA operations.
 		 */
 		dsb(sy);
 	}
 
 	kmsan_bus_dmamap_sync(&map->kmsan_mem, op);
 }
 
 #ifdef KMSAN
 static void
 bounce_bus_dmamap_load_kmsan(bus_dmamap_t map, struct memdesc *mem)
 {
 	if (map == NULL)
 		return;
 	memcpy(&map->kmsan_mem, mem, sizeof(map->kmsan_mem));
 }
 #endif
 
 struct bus_dma_impl bus_dma_bounce_impl = {
 	.tag_create = bounce_bus_dma_tag_create,
 	.tag_destroy = bounce_bus_dma_tag_destroy,
 	.tag_set_domain = bounce_bus_dma_tag_set_domain,
 	.id_mapped = bounce_bus_dma_id_mapped,
 	.map_create = bounce_bus_dmamap_create,
 	.map_destroy = bounce_bus_dmamap_destroy,
 	.mem_alloc = bounce_bus_dmamem_alloc,
 	.mem_free = bounce_bus_dmamem_free,
 	.load_phys = bounce_bus_dmamap_load_phys,
 	.load_buffer = bounce_bus_dmamap_load_buffer,
 	.load_ma = bus_dmamap_load_ma_triv,
 	.map_waitok = bounce_bus_dmamap_waitok,
 	.map_complete = bounce_bus_dmamap_complete,
 	.map_unload = bounce_bus_dmamap_unload,
 	.map_sync = bounce_bus_dmamap_sync,
 #ifdef KMSAN
 	.load_kmsan = bounce_bus_dmamap_load_kmsan,
 #endif
 };
diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c
index 46695a415e86..d69f86023da6 100644
--- a/sys/arm64/arm64/gicv3_its.c
+++ b/sys/arm64/arm64/gicv3_its.c
@@ -1,2321 +1,2320 @@
 /*-
  * Copyright (c) 2015-2016 The FreeBSD Foundation
  * Copyright (c) 2023 Arm Ltd
  *
  * This software was developed by Andrew Turner under
  * the sponsorship of the FreeBSD Foundation.
  *
  * This software was developed by Semihalf under
  * the sponsorship of the FreeBSD Foundation.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include "opt_acpi.h"
 #include "opt_platform.h"
 #include "opt_iommu.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cpuset.h>
 #include <sys/domainset.h>
 #include <sys/endian.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/physmem.h>
 #include <sys/proc.h>
 #include <sys/taskqueue.h>
 #include <sys/tree.h>
 #include <sys/queue.h>
 #include <sys/rman.h>
 #include <sys/sbuf.h>
 #include <sys/smp.h>
 #include <sys/sysctl.h>
 #include <sys/vmem.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_page.h>
 
 #include <machine/bus.h>
 #include <machine/intr.h>
 
 #include <arm/arm/gic_common.h>
 #include <arm64/arm64/gic_v3_reg.h>
 #include <arm64/arm64/gic_v3_var.h>
 
 #ifdef FDT
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #endif
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
 #ifdef IOMMU
 #include <dev/iommu/iommu.h>
 #include <dev/iommu/iommu_gas.h>
 #endif
 
 #include "pcib_if.h"
 #include "pic_if.h"
 #include "msi_if.h"
 
 MALLOC_DEFINE(M_GICV3_ITS, "GICv3 ITS",
     "ARM GICv3 Interrupt Translation Service");
 
 #define	LPI_NIRQS		(64 * 1024)
 
 /* The size and alignment of the command circular buffer */
 #define	ITS_CMDQ_SIZE		(64 * 1024)	/* Must be a multiple of 4K */
 #define	ITS_CMDQ_ALIGN		(64 * 1024)
 
 #define	LPI_CONFTAB_SIZE	LPI_NIRQS
 #define	LPI_CONFTAB_ALIGN	(64 * 1024)
 #define	LPI_CONFTAB_MAX_ADDR	((1ul << 48) - 1) /* We need a 47 bit PA */
 
 /* 1 bit per SPI, PPI, and SGI (8k), and 1 bit per LPI (LPI_CONFTAB_SIZE) */
 #define	LPI_PENDTAB_SIZE	((LPI_NIRQS + GIC_FIRST_LPI) / 8)
 #define	LPI_PENDTAB_ALIGN	(64 * 1024)
 #define	LPI_PENDTAB_MAX_ADDR	((1ul << 48) - 1) /* We need a 47 bit PA */
 
 #define	LPI_INT_TRANS_TAB_ALIGN	256
 #define	LPI_INT_TRANS_TAB_MAX_ADDR ((1ul << 48) - 1)
 
 /* ITS commands encoding */
 #define	ITS_CMD_MOVI		(0x01)
 #define	ITS_CMD_SYNC		(0x05)
 #define	ITS_CMD_MAPD		(0x08)
 #define	ITS_CMD_MAPC		(0x09)
 #define	ITS_CMD_MAPTI		(0x0a)
 #define	ITS_CMD_MAPI		(0x0b)
 #define	ITS_CMD_INV		(0x0c)
 #define	ITS_CMD_INVALL		(0x0d)
 /* Command */
 #define	CMD_COMMAND_MASK	(0xFFUL)
 /* PCI device ID */
 #define	CMD_DEVID_SHIFT		(32)
 #define	CMD_DEVID_MASK		(0xFFFFFFFFUL << CMD_DEVID_SHIFT)
 /* Size of IRQ ID bitfield */
 #define	CMD_SIZE_MASK		(0xFFUL)
 /* Virtual LPI ID */
 #define	CMD_ID_MASK		(0xFFFFFFFFUL)
 /* Physical LPI ID */
 #define	CMD_PID_SHIFT		(32)
 #define	CMD_PID_MASK		(0xFFFFFFFFUL << CMD_PID_SHIFT)
 /* Collection */
 #define	CMD_COL_MASK		(0xFFFFUL)
 /* Target (CPU or Re-Distributor) */
 #define	CMD_TARGET_SHIFT	(16)
 #define	CMD_TARGET_MASK		(0xFFFFFFFFUL << CMD_TARGET_SHIFT)
 /* Interrupt Translation Table address */
 #define	CMD_ITT_MASK		(0xFFFFFFFFFF00UL)
 /* Valid command bit */
 #define	CMD_VALID_SHIFT		(63)
 #define	CMD_VALID_MASK		(1UL << CMD_VALID_SHIFT)
 
 #define	ITS_TARGET_NONE		0xFBADBEEF
 
 /* LPI chunk owned by ITS device */
 struct lpi_chunk {
 	u_int	lpi_base;
 	u_int	lpi_free;	/* First free LPI in set */
 	u_int	lpi_num;	/* Total number of LPIs in chunk */
 	u_int	lpi_busy;	/* Number of busy LPIs in chink */
 };
 
 /* ITS device */
 struct its_dev {
 	TAILQ_ENTRY(its_dev)	entry;
 	/* PCI device */
 	device_t		pci_dev;
 	/* Device ID (i.e. PCI device ID) */
 	uint32_t		devid;
 	/* List of assigned LPIs */
 	struct lpi_chunk	lpis;
 	/* Virtual address of ITT */
 	void			*itt;
-	size_t			itt_size;
 };
 
 /*
  * ITS command descriptor.
  * Idea for command description passing taken from Linux.
  */
 struct its_cmd_desc {
 	uint8_t cmd_type;
 
 	union {
 		struct {
 			struct its_dev *its_dev;
 			struct its_col *col;
 			uint32_t id;
 		} cmd_desc_movi;
 
 		struct {
 			struct its_col *col;
 		} cmd_desc_sync;
 
 		struct {
 			struct its_col *col;
 			uint8_t valid;
 		} cmd_desc_mapc;
 
 		struct {
 			struct its_dev *its_dev;
 			struct its_col *col;
 			uint32_t pid;
 			uint32_t id;
 		} cmd_desc_mapvi;
 
 		struct {
 			struct its_dev *its_dev;
 			struct its_col *col;
 			uint32_t pid;
 		} cmd_desc_mapi;
 
 		struct {
 			struct its_dev *its_dev;
 			uint8_t valid;
 		} cmd_desc_mapd;
 
 		struct {
 			struct its_dev *its_dev;
 			struct its_col *col;
 			uint32_t pid;
 		} cmd_desc_inv;
 
 		struct {
 			struct its_col *col;
 		} cmd_desc_invall;
 	};
 };
 
 /* ITS command. Each command is 32 bytes long */
 struct its_cmd {
 	uint64_t	cmd_dword[4];	/* ITS command double word */
 };
 
 /* An ITS private table */
 struct its_ptable {
 	void		*ptab_vaddr;
 	/* Size of the L1 and L2 tables */
 	size_t		ptab_l1_size;
 	size_t		ptab_l2_size;
 	/* Number of L1 and L2 entries */
 	int		ptab_l1_nidents;
 	int		ptab_l2_nidents;
 
 	int		ptab_page_size;
 	int		ptab_share;
 	bool		ptab_indirect;
 };
 
 /* ITS collection description. */
 struct its_col {
 	uint64_t	col_target;	/* Target Re-Distributor */
 	uint64_t	col_id;		/* Collection ID */
 };
 
 struct gicv3_its_irqsrc {
 	struct intr_irqsrc	gi_isrc;
 	u_int			gi_id;
 	u_int			gi_lpi;
 	struct its_dev		*gi_its_dev;
 	TAILQ_ENTRY(gicv3_its_irqsrc) gi_link;
 };
 
 struct gicv3_its_softc {
 	device_t	dev;
 	struct intr_pic *sc_pic;
 	struct resource *sc_its_res;
 
 	cpuset_t	sc_cpus;
 	struct domainset *sc_ds;
 	u_int		gic_irq_cpu;
 	int		sc_devbits;
 	int		sc_dev_table_idx;
 
 	struct its_ptable sc_its_ptab[GITS_BASER_NUM];
 	struct its_col *sc_its_cols[MAXCPU];	/* Per-CPU collections */
 
 	/*
 	 * TODO: We should get these from the parent as we only want a
 	 * single copy of each across the interrupt controller.
 	 */
 	uint8_t		*sc_conf_base;
 	void		*sc_pend_base[MAXCPU];
 
 	/* Command handling */
 	struct mtx sc_its_cmd_lock;
 	struct its_cmd *sc_its_cmd_base; /* Command circular buffer address */
 	size_t sc_its_cmd_next_idx;
 
 	vmem_t *sc_irq_alloc;
 	struct gicv3_its_irqsrc	**sc_irqs;
 	u_int	sc_irq_base;
 	u_int	sc_irq_length;
 	u_int	sc_irq_count;
 
 	struct mtx sc_its_dev_lock;
 	TAILQ_HEAD(its_dev_list, its_dev) sc_its_dev_list;
 	TAILQ_HEAD(free_irqs, gicv3_its_irqsrc) sc_free_irqs;
 
 #define	ITS_FLAGS_CMDQ_FLUSH		0x00000001
 #define	ITS_FLAGS_LPI_CONF_FLUSH	0x00000002
 #define	ITS_FLAGS_ERRATA_CAVIUM_22375	0x00000004
 #define	ITS_FLAGS_LPI_PREALLOC		0x00000008
 	u_int sc_its_flags;
 	bool	trace_enable;
 	vm_page_t ma; /* fake msi page */
 };
 
 typedef void (its_quirk_func_t)(device_t);
 static its_quirk_func_t its_quirk_cavium_22375;
 
 static const struct {
 	const char *desc;
 	uint32_t iidr;
 	uint32_t iidr_mask;
 	its_quirk_func_t *func;
 } its_quirks[] = {
 	{
 		/* Cavium ThunderX Pass 1.x */
 		.desc = "Cavium ThunderX errata: 22375, 24313",
 		.iidr = GITS_IIDR_RAW(GITS_IIDR_IMPL_CAVIUM,
 		    GITS_IIDR_PROD_THUNDER, GITS_IIDR_VAR_THUNDER_1, 0),
 		.iidr_mask = ~GITS_IIDR_REVISION_MASK,
 		.func = its_quirk_cavium_22375,
 	},
 };
 
 #define	gic_its_read_4(sc, reg)			\
     bus_read_4((sc)->sc_its_res, (reg))
 #define	gic_its_read_8(sc, reg)			\
     bus_read_8((sc)->sc_its_res, (reg))
 
 #define	gic_its_write_4(sc, reg, val)		\
     bus_write_4((sc)->sc_its_res, (reg), (val))
 #define	gic_its_write_8(sc, reg, val)		\
     bus_write_8((sc)->sc_its_res, (reg), (val))
 
 static device_attach_t gicv3_its_attach;
 static device_detach_t gicv3_its_detach;
 
 static pic_disable_intr_t gicv3_its_disable_intr;
 static pic_enable_intr_t gicv3_its_enable_intr;
 static pic_map_intr_t gicv3_its_map_intr;
 static pic_setup_intr_t gicv3_its_setup_intr;
 static pic_post_filter_t gicv3_its_post_filter;
 static pic_post_ithread_t gicv3_its_post_ithread;
 static pic_pre_ithread_t gicv3_its_pre_ithread;
 static pic_bind_intr_t gicv3_its_bind_intr;
 #ifdef SMP
 static pic_init_secondary_t gicv3_its_init_secondary;
 #endif
 static msi_alloc_msi_t gicv3_its_alloc_msi;
 static msi_release_msi_t gicv3_its_release_msi;
 static msi_alloc_msix_t gicv3_its_alloc_msix;
 static msi_release_msix_t gicv3_its_release_msix;
 static msi_map_msi_t gicv3_its_map_msi;
 #ifdef IOMMU
 static msi_iommu_init_t gicv3_iommu_init;
 static msi_iommu_deinit_t gicv3_iommu_deinit;
 #endif
 
 static void its_cmd_movi(device_t, struct gicv3_its_irqsrc *);
 static void its_cmd_mapc(device_t, struct its_col *, uint8_t);
 static void its_cmd_mapti(device_t, struct gicv3_its_irqsrc *);
 static void its_cmd_mapd(device_t, struct its_dev *, uint8_t);
 static void its_cmd_inv(device_t, struct its_dev *, struct gicv3_its_irqsrc *);
 static void its_cmd_invall(device_t, struct its_col *);
 
 static device_method_t gicv3_its_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_detach,	gicv3_its_detach),
 
 	/* Interrupt controller interface */
 	DEVMETHOD(pic_disable_intr,	gicv3_its_disable_intr),
 	DEVMETHOD(pic_enable_intr,	gicv3_its_enable_intr),
 	DEVMETHOD(pic_map_intr,		gicv3_its_map_intr),
 	DEVMETHOD(pic_setup_intr,	gicv3_its_setup_intr),
 	DEVMETHOD(pic_post_filter,	gicv3_its_post_filter),
 	DEVMETHOD(pic_post_ithread,	gicv3_its_post_ithread),
 	DEVMETHOD(pic_pre_ithread,	gicv3_its_pre_ithread),
 #ifdef SMP
 	DEVMETHOD(pic_bind_intr,	gicv3_its_bind_intr),
 	DEVMETHOD(pic_init_secondary,	gicv3_its_init_secondary),
 #endif
 
 	/* MSI/MSI-X */
 	DEVMETHOD(msi_alloc_msi,	gicv3_its_alloc_msi),
 	DEVMETHOD(msi_release_msi,	gicv3_its_release_msi),
 	DEVMETHOD(msi_alloc_msix,	gicv3_its_alloc_msix),
 	DEVMETHOD(msi_release_msix,	gicv3_its_release_msix),
 	DEVMETHOD(msi_map_msi,		gicv3_its_map_msi),
 #ifdef IOMMU
 	DEVMETHOD(msi_iommu_init,	gicv3_iommu_init),
 	DEVMETHOD(msi_iommu_deinit,	gicv3_iommu_deinit),
 #endif
 
 	/* End */
 	DEVMETHOD_END
 };
 
 static DEFINE_CLASS_0(gic, gicv3_its_driver, gicv3_its_methods,
     sizeof(struct gicv3_its_softc));
 
 static void
 gicv3_its_cmdq_init(struct gicv3_its_softc *sc)
 {
 	vm_paddr_t cmd_paddr;
 	uint64_t reg, tmp;
 
 	/* Set up the command circular buffer */
 	sc->sc_its_cmd_base = contigmalloc_domainset(ITS_CMDQ_SIZE, M_GICV3_ITS,
 	    sc->sc_ds, M_WAITOK | M_ZERO, 0, (1ul << 48) - 1, ITS_CMDQ_ALIGN,
 	    0);
 	sc->sc_its_cmd_next_idx = 0;
 
 	cmd_paddr = vtophys(sc->sc_its_cmd_base);
 
 	/* Set the base of the command buffer */
 	reg = GITS_CBASER_VALID |
 	    (GITS_CBASER_CACHE_NIWAWB << GITS_CBASER_CACHE_SHIFT) |
 	    cmd_paddr | (GITS_CBASER_SHARE_IS << GITS_CBASER_SHARE_SHIFT) |
 	    (ITS_CMDQ_SIZE / 4096 - 1);
 	gic_its_write_8(sc, GITS_CBASER, reg);
 
 	/* Read back to check for fixed value fields */
 	tmp = gic_its_read_8(sc, GITS_CBASER);
 
 	if ((tmp & GITS_CBASER_SHARE_MASK) !=
 	    (GITS_CBASER_SHARE_IS << GITS_CBASER_SHARE_SHIFT)) {
 		/* Check if the hardware reported non-shareable */
 		if ((tmp & GITS_CBASER_SHARE_MASK) ==
 		    (GITS_CBASER_SHARE_NS << GITS_CBASER_SHARE_SHIFT)) {
 			/* If so remove the cache attribute */
 			reg &= ~GITS_CBASER_CACHE_MASK;
 			reg &= ~GITS_CBASER_SHARE_MASK;
 			/* Set to Non-cacheable, Non-shareable */
 			reg |= GITS_CBASER_CACHE_NIN << GITS_CBASER_CACHE_SHIFT;
 			reg |= GITS_CBASER_SHARE_NS << GITS_CBASER_SHARE_SHIFT;
 
 			gic_its_write_8(sc, GITS_CBASER, reg);
 		}
 
 		/* The command queue has to be flushed after each command */
 		sc->sc_its_flags |= ITS_FLAGS_CMDQ_FLUSH;
 	}
 
 	/* Get the next command from the start of the buffer */
 	gic_its_write_8(sc, GITS_CWRITER, 0x0);
 }
 
 static int
 gicv3_its_table_page_size(struct gicv3_its_softc *sc, int table)
 {
 	uint64_t reg, tmp;
 	int page_size;
 
 	page_size = PAGE_SIZE_64K;
 	reg = gic_its_read_8(sc, GITS_BASER(table));
 
 	while (1) {
 		reg &= GITS_BASER_PSZ_MASK;
 		switch (page_size) {
 		case PAGE_SIZE_4K:	/* 4KB */
 			reg |= GITS_BASER_PSZ_4K << GITS_BASER_PSZ_SHIFT;
 			break;
 		case PAGE_SIZE_16K:	/* 16KB */
 			reg |= GITS_BASER_PSZ_16K << GITS_BASER_PSZ_SHIFT;
 			break;
 		case PAGE_SIZE_64K:	/* 64KB */
 			reg |= GITS_BASER_PSZ_64K << GITS_BASER_PSZ_SHIFT;
 			break;
 		}
 
 		/* Write the new page size */
 		gic_its_write_8(sc, GITS_BASER(table), reg);
 
 		/* Read back to check */
 		tmp = gic_its_read_8(sc, GITS_BASER(table));
 
 		/* The page size is correct */
 		if ((tmp & GITS_BASER_PSZ_MASK) == (reg & GITS_BASER_PSZ_MASK))
 			return (page_size);
 
 		switch (page_size) {
 		default:
 			return (-1);
 		case PAGE_SIZE_16K:
 			page_size = PAGE_SIZE_4K;
 			break;
 		case PAGE_SIZE_64K:
 			page_size = PAGE_SIZE_16K;
 			break;
 		}
 	}
 }
 
 static bool
 gicv3_its_table_supports_indirect(struct gicv3_its_softc *sc, int table)
 {
 	uint64_t reg;
 
 	reg = gic_its_read_8(sc, GITS_BASER(table));
 
 	/* Try setting the indirect flag */
 	reg |= GITS_BASER_INDIRECT;
 	gic_its_write_8(sc, GITS_BASER(table), reg);
 
 	/* Read back to check */
 	reg = gic_its_read_8(sc, GITS_BASER(table));
 	return ((reg & GITS_BASER_INDIRECT) != 0);
 }
 
 
 static int
 gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc)
 {
 	void *table;
 	vm_paddr_t paddr;
 	uint64_t cache, reg, share, tmp, type;
 	size_t its_tbl_size, nitspages, npages;
 	size_t l1_esize, l2_esize, l1_nidents, l2_nidents;
 	int i, page_size;
 	int devbits;
 	bool indirect;
 
 	if ((sc->sc_its_flags & ITS_FLAGS_ERRATA_CAVIUM_22375) != 0) {
 		/*
 		 * GITS_TYPER[17:13] of ThunderX reports that device IDs
 		 * are to be 21 bits in length. The entry size of the ITS
 		 * table can be read from GITS_BASERn[52:48] and on ThunderX
 		 * is supposed to be 8 bytes in length (for device table).
 		 * Finally the page size that is to be used by ITS to access
 		 * this table will be set to 64KB.
 		 *
 		 * This gives 0x200000 entries of size 0x8 bytes covered by
 		 * 256 pages each of which 64KB in size. The number of pages
 		 * (minus 1) should then be written to GITS_BASERn[7:0]. In
 		 * that case this value would be 0xFF but on ThunderX the
 		 * maximum value that HW accepts is 0xFD.
 		 *
 		 * Set an arbitrary number of device ID bits to 20 in order
 		 * to limit the number of entries in ITS device table to
 		 * 0x100000 and the table size to 8MB.
 		 */
 		devbits = 20;
 		cache = 0;
 	} else {
 		devbits = GITS_TYPER_DEVB(gic_its_read_8(sc, GITS_TYPER));
 		cache = GITS_BASER_CACHE_WAWB;
 	}
 	sc->sc_devbits = devbits;
 	share = GITS_BASER_SHARE_IS;
 
 	for (i = 0; i < GITS_BASER_NUM; i++) {
 		reg = gic_its_read_8(sc, GITS_BASER(i));
 		/* The type of table */
 		type = GITS_BASER_TYPE(reg);
 		if (type == GITS_BASER_TYPE_UNIMPL)
 			continue;
 
 		/* The table entry size */
 		l1_esize = GITS_BASER_ESIZE(reg);
 
 		/* Find the tables page size */
 		page_size = gicv3_its_table_page_size(sc, i);
 		if (page_size == -1) {
 			device_printf(dev, "No valid page size for table %d\n",
 			    i);
 			return (EINVAL);
 		}
 
 		indirect = false;
 		l2_nidents = 0;
 		l2_esize = 0;
 		switch(type) {
 		case GITS_BASER_TYPE_DEV:
 			if (sc->sc_dev_table_idx != -1)
 				device_printf(dev,
 				    "Warning: Multiple device tables found\n");
 
 			sc->sc_dev_table_idx = i;
 			l1_nidents = (1 << devbits);
 			if ((l1_esize * l1_nidents) > (page_size * 2)) {
 				indirect =
 				    gicv3_its_table_supports_indirect(sc, i);
 				if (indirect) {
 					/*
 					 * Each l1 entry is 8 bytes and points
 					 * to an l2 table of size page_size.
 					 * Calculate how many entries this is
 					 * and use this to find how many
 					 * 8 byte l1 idents we need.
 					 */
 					l2_esize = l1_esize;
 					l2_nidents = page_size / l2_esize;
 					l1_nidents = l1_nidents / l2_nidents;
 					l1_esize = GITS_INDIRECT_L1_ESIZE;
 				}
 			}
 			its_tbl_size = l1_esize * l1_nidents;
 			its_tbl_size = roundup2(its_tbl_size, page_size);
 			break;
 		case GITS_BASER_TYPE_VP:
 		case GITS_BASER_TYPE_PP: /* Undocumented? */
 		case GITS_BASER_TYPE_IC:
 			its_tbl_size = page_size;
 			break;
 		default:
 			if (bootverbose)
 				device_printf(dev, "Unhandled table type %lx\n",
 				    type);
 			continue;
 		}
 		npages = howmany(its_tbl_size, PAGE_SIZE);
 
 		/* Allocate the table */
 		table = contigmalloc_domainset(npages * PAGE_SIZE,
 		    M_GICV3_ITS, sc->sc_ds, M_WAITOK | M_ZERO, 0,
 		    (1ul << 48) - 1, PAGE_SIZE_64K, 0);
 
 		sc->sc_its_ptab[i].ptab_vaddr = table;
 		sc->sc_its_ptab[i].ptab_l1_size = its_tbl_size;
 		sc->sc_its_ptab[i].ptab_l1_nidents = l1_nidents;
 		sc->sc_its_ptab[i].ptab_l2_size = page_size;
 		sc->sc_its_ptab[i].ptab_l2_nidents = l2_nidents;
 
 		sc->sc_its_ptab[i].ptab_indirect = indirect;
 		sc->sc_its_ptab[i].ptab_page_size = page_size;
 
 		paddr = vtophys(table);
 
 		while (1) {
 			nitspages = howmany(its_tbl_size, page_size);
 
 			/* Clear the fields we will be setting */
 			reg &= ~(GITS_BASER_VALID | GITS_BASER_INDIRECT |
 			    GITS_BASER_CACHE_MASK | GITS_BASER_TYPE_MASK |
 			    GITS_BASER_PA_MASK |
 			    GITS_BASER_SHARE_MASK | GITS_BASER_PSZ_MASK |
 			    GITS_BASER_SIZE_MASK);
 			/* Set the new values */
 			reg |= GITS_BASER_VALID |
 			    (indirect ? GITS_BASER_INDIRECT : 0) |
 			    (cache << GITS_BASER_CACHE_SHIFT) |
 			    (type << GITS_BASER_TYPE_SHIFT) |
 			    paddr | (share << GITS_BASER_SHARE_SHIFT) |
 			    (nitspages - 1);
 
 			switch (page_size) {
 			case PAGE_SIZE_4K:	/* 4KB */
 				reg |=
 				    GITS_BASER_PSZ_4K << GITS_BASER_PSZ_SHIFT;
 				break;
 			case PAGE_SIZE_16K:	/* 16KB */
 				reg |=
 				    GITS_BASER_PSZ_16K << GITS_BASER_PSZ_SHIFT;
 				break;
 			case PAGE_SIZE_64K:	/* 64KB */
 				reg |=
 				    GITS_BASER_PSZ_64K << GITS_BASER_PSZ_SHIFT;
 				break;
 			}
 
 			gic_its_write_8(sc, GITS_BASER(i), reg);
 
 			/* Read back to check */
 			tmp = gic_its_read_8(sc, GITS_BASER(i));
 
 			/* Do the shareability masks line up? */
 			if ((tmp & GITS_BASER_SHARE_MASK) !=
 			    (reg & GITS_BASER_SHARE_MASK)) {
 				share = (tmp & GITS_BASER_SHARE_MASK) >>
 				    GITS_BASER_SHARE_SHIFT;
 				continue;
 			}
 
 			if (tmp != reg) {
 				device_printf(dev, "GITS_BASER%d: "
 				    "unable to be updated: %lx != %lx\n",
 				    i, reg, tmp);
 				return (ENXIO);
 			}
 
 			sc->sc_its_ptab[i].ptab_share = share;
 			/* We should have made all needed changes */
 			break;
 		}
 	}
 
 	return (0);
 }
 
 static void
 gicv3_its_conftable_init(struct gicv3_its_softc *sc)
 {
 	/* note: we assume the ITS children are serialized by the parent */
 	static void *conf_table;
 	int extra_flags = 0;
 	device_t gicv3;
 	uint32_t ctlr;
 	vm_paddr_t conf_pa;
 	vm_offset_t conf_va;
 
 	/*
 	 * The PROPBASER is a singleton in our parent. We only set it up the
 	 * first time through. conf_table is effectively global to all the units
 	 * and we rely on subr_bus to serialize probe/attach.
 	 */
 	if (conf_table != NULL) {
 		sc->sc_conf_base = conf_table;
 		return;
 	}
 
 	gicv3 = device_get_parent(sc->dev);
 	ctlr = gic_r_read_4(gicv3, GICR_CTLR);
 	if ((ctlr & GICR_CTLR_LPI_ENABLE) != 0) {
 		conf_pa = gic_r_read_8(gicv3, GICR_PROPBASER);
 		conf_pa &= GICR_PROPBASER_PA_MASK;
 		/*
 		 * If there was a pre-existing PROPBASER, then we need to honor
 		 * it because implementation defined behavior in gicv3 makes it
 		 * impossible to quiesce to change it out. We will only see a
 		 * pre-existing one when we've been kexec'd from a Linux kernel,
 		 * or from a LinuxBoot environment.
 		 *
 		 * Linux provides us with a MEMRESERVE table that we put into
 		 * the excluded physmem area. If PROPBASER isn't in this tabke,
 		 * the system cannot run due to random memory corruption,
 		 * so we panic for this case.
 		 */
 		if (!physmem_excluded(conf_pa, LPI_CONFTAB_SIZE))
 			panic("gicv3 PROPBASER needs to reuse %#lx, but not reserved",
 			    conf_pa);
 		conf_va = PHYS_TO_DMAP(conf_pa);
 		if (!pmap_klookup(conf_va, NULL))
 			panic("Cannot map prior LPI mapping into KVA");
 		conf_table = (void *)conf_va;
 		extra_flags = ITS_FLAGS_LPI_PREALLOC | ITS_FLAGS_LPI_CONF_FLUSH;
 		if (bootverbose)
 			device_printf(sc->dev,
 			    "LPI enabled, conf table using pa %#lx va %lx\n",
 			    conf_pa, conf_va);
 	} else {
 		/*
 		 * Otherwise just allocate contiguous pages. We'll configure the
 		 * PROPBASER register later in its_init_cpu_lpi().
 		 */
 		conf_table = contigmalloc(LPI_CONFTAB_SIZE,
 		    M_GICV3_ITS, M_WAITOK, 0, LPI_CONFTAB_MAX_ADDR,
 		    LPI_CONFTAB_ALIGN, 0);
 	}
 	sc->sc_conf_base = conf_table;
 	sc->sc_its_flags |= extra_flags;
 
 	/* Set the default configuration */
 	memset(sc->sc_conf_base, GIC_PRIORITY_MAX | LPI_CONF_GROUP1,
 	    LPI_CONFTAB_SIZE);
 
 	/* Flush the table to memory */
 	cpu_dcache_wb_range(sc->sc_conf_base, LPI_CONFTAB_SIZE);
 }
 
 static void
 gicv3_its_pendtables_init(struct gicv3_its_softc *sc)
 {
 
 	if ((sc->sc_its_flags & ITS_FLAGS_LPI_PREALLOC) == 0) {
 		for (int i = 0; i <= mp_maxid; i++) {
 			if (CPU_ISSET(i, &sc->sc_cpus) == 0)
 				continue;
 
 			sc->sc_pend_base[i] = contigmalloc(
 			    LPI_PENDTAB_SIZE, M_GICV3_ITS, M_WAITOK | M_ZERO,
 			    0, LPI_PENDTAB_MAX_ADDR, LPI_PENDTAB_ALIGN, 0);
 
 			/* Flush so the ITS can see the memory */
 			cpu_dcache_wb_range(sc->sc_pend_base[i],
 			    LPI_PENDTAB_SIZE);
 		}
 	}
 }
 
 static void
 its_init_cpu_lpi(device_t dev, struct gicv3_its_softc *sc)
 {
 	device_t gicv3;
 	uint64_t xbaser, tmp, size;
 	uint32_t ctlr;
 	u_int cpuid;
 
 	gicv3 = device_get_parent(dev);
 	cpuid = PCPU_GET(cpuid);
 
 	/*
 	 * Set the redistributor base. If we're reusing what we found on boot
 	 * since the gic was already running, then don't touch it here. We also
 	 * don't need to disable / enable LPI if we're not changing PROPBASER,
 	 * so only do that if we're not prealloced.
 	 */
 	if ((sc->sc_its_flags & ITS_FLAGS_LPI_PREALLOC) == 0) {
 		/* Disable LPIs */
 		ctlr = gic_r_read_4(gicv3, GICR_CTLR);
 		ctlr &= ~GICR_CTLR_LPI_ENABLE;
 		gic_r_write_4(gicv3, GICR_CTLR, ctlr);
 
 		/* Make sure changes are observable my the GIC */
 		dsb(sy);
 
 		size = (flsl(LPI_CONFTAB_SIZE | GIC_FIRST_LPI) - 1);
 
 		xbaser = vtophys(sc->sc_conf_base) |
 		    (GICR_PROPBASER_SHARE_IS << GICR_PROPBASER_SHARE_SHIFT) |
 		    (GICR_PROPBASER_CACHE_NIWAWB << GICR_PROPBASER_CACHE_SHIFT) |
 		    size;
 
 		gic_r_write_8(gicv3, GICR_PROPBASER, xbaser);
 
 		/* Check the cache attributes we set */
 		tmp = gic_r_read_8(gicv3, GICR_PROPBASER);
 
 		if ((tmp & GICR_PROPBASER_SHARE_MASK) !=
 		    (xbaser & GICR_PROPBASER_SHARE_MASK)) {
 			if ((tmp & GICR_PROPBASER_SHARE_MASK) ==
 			    (GICR_PROPBASER_SHARE_NS << GICR_PROPBASER_SHARE_SHIFT)) {
 				/* We need to mark as non-cacheable */
 				xbaser &= ~(GICR_PROPBASER_SHARE_MASK |
 				    GICR_PROPBASER_CACHE_MASK);
 				/* Non-cacheable */
 				xbaser |= GICR_PROPBASER_CACHE_NIN <<
 				    GICR_PROPBASER_CACHE_SHIFT;
 				/* Non-shareable */
 				xbaser |= GICR_PROPBASER_SHARE_NS <<
 				    GICR_PROPBASER_SHARE_SHIFT;
 				gic_r_write_8(gicv3, GICR_PROPBASER, xbaser);
 			}
 			sc->sc_its_flags |= ITS_FLAGS_LPI_CONF_FLUSH;
 		}
 
 		/*
 		 * Set the LPI pending table base
 		 */
 		xbaser = vtophys(sc->sc_pend_base[cpuid]) |
 		    (GICR_PENDBASER_CACHE_NIWAWB << GICR_PENDBASER_CACHE_SHIFT) |
 		    (GICR_PENDBASER_SHARE_IS << GICR_PENDBASER_SHARE_SHIFT);
 
 		gic_r_write_8(gicv3, GICR_PENDBASER, xbaser);
 
 		tmp = gic_r_read_8(gicv3, GICR_PENDBASER);
 
 		if ((tmp & GICR_PENDBASER_SHARE_MASK) ==
 		    (GICR_PENDBASER_SHARE_NS << GICR_PENDBASER_SHARE_SHIFT)) {
 			/* Clear the cahce and shareability bits */
 			xbaser &= ~(GICR_PENDBASER_CACHE_MASK |
 			    GICR_PENDBASER_SHARE_MASK);
 			/* Mark as non-shareable */
 			xbaser |= GICR_PENDBASER_SHARE_NS << GICR_PENDBASER_SHARE_SHIFT;
 			/* And non-cacheable */
 			xbaser |= GICR_PENDBASER_CACHE_NIN <<
 			    GICR_PENDBASER_CACHE_SHIFT;
 		}
 
 		/* Enable LPIs */
 		ctlr = gic_r_read_4(gicv3, GICR_CTLR);
 		ctlr |= GICR_CTLR_LPI_ENABLE;
 		gic_r_write_4(gicv3, GICR_CTLR, ctlr);
 
 		/* Make sure the GIC has seen everything */
 		dsb(sy);
 	} else {
 		KASSERT(sc->sc_pend_base[cpuid] == NULL,
 		    ("PREALLOC too soon cpuid %d", cpuid));
 		tmp = gic_r_read_8(gicv3, GICR_PENDBASER);
 		tmp &= GICR_PENDBASER_PA_MASK;
 		if (!physmem_excluded(tmp, LPI_PENDTAB_SIZE))
 			panic("gicv3 PENDBASER on cpu %d needs to reuse 0x%#lx, but not reserved\n",
 			    cpuid, tmp);
 		sc->sc_pend_base[cpuid] = (void *)PHYS_TO_DMAP(tmp);
 	}
 
 
 	if (bootverbose)
 		device_printf(gicv3, "using %sPENDBASE of %#lx on cpu %d\n",
 		    (sc->sc_its_flags & ITS_FLAGS_LPI_PREALLOC) ? "pre-existing " : "",
 		    vtophys(sc->sc_pend_base[cpuid]), cpuid);
 }
 
 static int
 its_init_cpu(device_t dev, struct gicv3_its_softc *sc)
 {
 	device_t gicv3;
 	vm_paddr_t target;
 	u_int cpuid;
 	struct redist_pcpu *rpcpu;
 
 	gicv3 = device_get_parent(dev);
 	cpuid = PCPU_GET(cpuid);
 	if (!CPU_ISSET(cpuid, &sc->sc_cpus))
 		return (0);
 
 	/* Check if the ITS is enabled on this CPU */
 	if ((gic_r_read_8(gicv3, GICR_TYPER) & GICR_TYPER_PLPIS) == 0)
 		return (ENXIO);
 
 	rpcpu = gicv3_get_redist(dev);
 
 	/* Do per-cpu LPI init once */
 	if (!rpcpu->lpi_enabled) {
 		its_init_cpu_lpi(dev, sc);
 		rpcpu->lpi_enabled = true;
 	}
 
 	if ((gic_its_read_8(sc, GITS_TYPER) & GITS_TYPER_PTA) != 0) {
 		/* This ITS wants the redistributor physical address */
 		target = vtophys((vm_offset_t)rman_get_virtual(rpcpu->res) +
 		    rpcpu->offset);
 	} else {
 		/* This ITS wants the unique processor number */
 		target = GICR_TYPER_CPUNUM(gic_r_read_8(gicv3, GICR_TYPER)) <<
 		    CMD_TARGET_SHIFT;
 	}
 
 	sc->sc_its_cols[cpuid]->col_target = target;
 	sc->sc_its_cols[cpuid]->col_id = cpuid;
 
 	its_cmd_mapc(dev, sc->sc_its_cols[cpuid], 1);
 	its_cmd_invall(dev, sc->sc_its_cols[cpuid]);
 
 	return (0);
 }
 
 static int
 gicv3_its_sysctl_trace_enable(SYSCTL_HANDLER_ARGS)
 {
 	struct gicv3_its_softc *sc;
 	int rv;
 
 	sc = arg1;
 
 	rv = sysctl_handle_bool(oidp, &sc->trace_enable, 0, req);
 	if (rv != 0 || req->newptr == NULL)
 		return (rv);
 	if (sc->trace_enable)
 		gic_its_write_8(sc, GITS_TRKCTLR, 3);
 	else
 		gic_its_write_8(sc, GITS_TRKCTLR, 0);
 
 	return (0);
 }
 
 static int
 gicv3_its_sysctl_trace_regs(SYSCTL_HANDLER_ARGS)
 {
 	struct gicv3_its_softc *sc;
 	struct sbuf *sb;
 	int err;
 
 	sc = arg1;
 	sb = sbuf_new_for_sysctl(NULL, NULL, 128, req);
 	if (sb == NULL) {
 		device_printf(sc->dev, "Could not allocate sbuf for output.\n");
 		return (ENOMEM);
 	}
 	sbuf_cat(sb, "\n");
 	sbuf_printf(sb, "GITS_TRKCTLR: 0x%08X\n",
 	    gic_its_read_4(sc, GITS_TRKCTLR));
 	sbuf_printf(sb, "GITS_TRKR:    0x%08X\n",
 	    gic_its_read_4(sc, GITS_TRKR));
 	sbuf_printf(sb, "GITS_TRKDIDR: 0x%08X\n",
 	    gic_its_read_4(sc, GITS_TRKDIDR));
 	sbuf_printf(sb, "GITS_TRKPIDR: 0x%08X\n",
 	    gic_its_read_4(sc, GITS_TRKPIDR));
 	sbuf_printf(sb, "GITS_TRKVIDR: 0x%08X\n",
 	    gic_its_read_4(sc, GITS_TRKVIDR));
 	sbuf_printf(sb, "GITS_TRKTGTR: 0x%08X\n",
 	   gic_its_read_4(sc, GITS_TRKTGTR));
 
 	err = sbuf_finish(sb);
 	if (err)
 		device_printf(sc->dev, "Error finishing sbuf: %d\n", err);
 	sbuf_delete(sb);
 	return(err);
 }
 
 static int
 gicv3_its_init_sysctl(struct gicv3_its_softc *sc)
 {
 	struct sysctl_oid *oid, *child;
 	struct sysctl_ctx_list *ctx_list;
 
 	ctx_list = device_get_sysctl_ctx(sc->dev);
 	child = device_get_sysctl_tree(sc->dev);
 	oid = SYSCTL_ADD_NODE(ctx_list,
 	    SYSCTL_CHILDREN(child), OID_AUTO, "tracing",
 	    CTLFLAG_RD| CTLFLAG_MPSAFE, NULL, "Messages tracing");
 	if (oid == NULL)
 		return (ENXIO);
 
 	/* Add registers */
 	SYSCTL_ADD_PROC(ctx_list,
 	    SYSCTL_CHILDREN(oid), OID_AUTO, "enable",
 	    CTLTYPE_U8 | CTLFLAG_RW | CTLFLAG_MPSAFE, sc, 0,
 	    gicv3_its_sysctl_trace_enable, "CU", "Enable tracing");
 	SYSCTL_ADD_PROC(ctx_list,
 	    SYSCTL_CHILDREN(oid), OID_AUTO, "capture",
 	    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, sc, 0,
 	    gicv3_its_sysctl_trace_regs, "", "Captured tracing registers.");
 
 	return (0);
 }
 
 static int
 gicv3_its_attach(device_t dev)
 {
 	struct gicv3_its_softc *sc;
 	int domain, err, i, rid;
 	uint64_t phys;
 	uint32_t ctlr, iidr;
 
 	sc = device_get_softc(dev);
 
 	sc->sc_dev_table_idx = -1;
 	sc->sc_irq_length = gicv3_get_nirqs(dev);
 	sc->sc_irq_base = GIC_FIRST_LPI;
 	sc->sc_irq_base += device_get_unit(dev) * sc->sc_irq_length;
 
 	rid = 0;
 	sc->sc_its_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
 	    RF_ACTIVE);
 	if (sc->sc_its_res == NULL) {
 		device_printf(dev, "Could not allocate memory\n");
 		return (ENXIO);
 	}
 
 	phys = rounddown2(vtophys(rman_get_virtual(sc->sc_its_res)) +
 	    GITS_TRANSLATER, PAGE_SIZE);
 	sc->ma = malloc(sizeof(struct vm_page), M_DEVBUF, M_WAITOK | M_ZERO);
 	vm_page_initfake(sc->ma, phys, VM_MEMATTR_DEFAULT);
 
 	CPU_COPY(&all_cpus, &sc->sc_cpus);
 	iidr = gic_its_read_4(sc, GITS_IIDR);
 	for (i = 0; i < nitems(its_quirks); i++) {
 		if ((iidr & its_quirks[i].iidr_mask) == its_quirks[i].iidr) {
 			if (bootverbose) {
 				device_printf(dev, "Applying %s\n",
 				    its_quirks[i].desc);
 			}
 			its_quirks[i].func(dev);
 			break;
 		}
 	}
 
 	if (bus_get_domain(dev, &domain) == 0 && domain < MAXMEMDOM) {
 		sc->sc_ds = DOMAINSET_PREF(domain);
 	} else {
 		sc->sc_ds = DOMAINSET_RR();
 	}
 
 	/*
 	 * GIT_CTLR_EN is mandated to reset to 0 on a Warm reset, but we may be
 	 * coming in via, for instance, a kexec/kboot style setup where a
 	 * previous kernel has configured then relinquished control.  Clear it
 	 * so that we can reconfigure GITS_BASER*.
 	 */
 	ctlr = gic_its_read_4(sc, GITS_CTLR);
 	if ((ctlr & GITS_CTLR_EN) != 0) {
 		ctlr &= ~GITS_CTLR_EN;
 		gic_its_write_4(sc, GITS_CTLR, ctlr);
 	}
 
 	/* Allocate the private tables */
 	err = gicv3_its_table_init(dev, sc);
 	if (err != 0)
 		return (err);
 
 	/* Protects access to the device list */
 	mtx_init(&sc->sc_its_dev_lock, "ITS device lock", NULL, MTX_SPIN);
 
 	/* Protects access to the ITS command circular buffer. */
 	mtx_init(&sc->sc_its_cmd_lock, "ITS cmd lock", NULL, MTX_SPIN);
 
 	/* Allocate the command circular buffer */
 	gicv3_its_cmdq_init(sc);
 
 	/* Allocate the per-CPU collections */
 	for (int cpu = 0; cpu <= mp_maxid; cpu++)
 		if (CPU_ISSET(cpu, &sc->sc_cpus) != 0)
 			sc->sc_its_cols[cpu] = malloc_domainset(
 			    sizeof(*sc->sc_its_cols[0]), M_GICV3_ITS,
 			    DOMAINSET_PREF(pcpu_find(cpu)->pc_domain),
 			    M_WAITOK | M_ZERO);
 		else
 			sc->sc_its_cols[cpu] = NULL;
 
 	/* Enable the ITS */
 	gic_its_write_4(sc, GITS_CTLR, ctlr | GITS_CTLR_EN);
 
 	/* Create the LPI configuration table */
 	gicv3_its_conftable_init(sc);
 
 	/* And the pending tebles */
 	gicv3_its_pendtables_init(sc);
 
 	/* Enable LPIs on this CPU */
 	its_init_cpu(dev, sc);
 
 	TAILQ_INIT(&sc->sc_its_dev_list);
 	TAILQ_INIT(&sc->sc_free_irqs);
 
 	/*
 	 * Create the vmem object to allocate INTRNG IRQs from. We try to
 	 * use all IRQs not already used by the GICv3.
 	 * XXX: This assumes there are no other interrupt controllers in the
 	 * system.
 	 */
 	sc->sc_irq_alloc = vmem_create(device_get_nameunit(dev), 0,
 	    gicv3_get_nirqs(dev), 1, 0, M_FIRSTFIT | M_WAITOK);
 
 	sc->sc_irqs = malloc(sizeof(*sc->sc_irqs) * sc->sc_irq_length,
 	    M_GICV3_ITS, M_WAITOK | M_ZERO);
 
 	/* For GIC-500 install tracking sysctls. */
 	if ((iidr & (GITS_IIDR_PRODUCT_MASK | GITS_IIDR_IMPLEMENTOR_MASK)) ==
 	    GITS_IIDR_RAW(GITS_IIDR_IMPL_ARM, GITS_IIDR_PROD_GIC500, 0, 0))
 		gicv3_its_init_sysctl(sc);
 
 	return (0);
 }
 
 static int
 gicv3_its_detach(device_t dev)
 {
 
 	return (ENXIO);
 }
 
 static void
 its_quirk_cavium_22375(device_t dev)
 {
 	struct gicv3_its_softc *sc;
 	int domain;
 
 	sc = device_get_softc(dev);
 	sc->sc_its_flags |= ITS_FLAGS_ERRATA_CAVIUM_22375;
 
 	/*
 	 * We need to limit which CPUs we send these interrupts to on
 	 * the original dual socket ThunderX as it is unable to
 	 * forward them between the two sockets.
 	 */
 	if (bus_get_domain(dev, &domain) == 0) {
 		if (domain < MAXMEMDOM) {
 			CPU_COPY(&cpuset_domain[domain], &sc->sc_cpus);
 		} else {
 			CPU_ZERO(&sc->sc_cpus);
 		}
 	}
 }
 
 static void
 gicv3_its_disable_intr(device_t dev, struct intr_irqsrc *isrc)
 {
 	struct gicv3_its_softc *sc;
 	struct gicv3_its_irqsrc *girq;
 	uint8_t *conf;
 
 	sc = device_get_softc(dev);
 	girq = (struct gicv3_its_irqsrc *)isrc;
 	conf = sc->sc_conf_base;
 
 	conf[girq->gi_lpi] &= ~LPI_CONF_ENABLE;
 
 	if ((sc->sc_its_flags & ITS_FLAGS_LPI_CONF_FLUSH) != 0) {
 		/* Clean D-cache under command. */
 		cpu_dcache_wb_range(&conf[girq->gi_lpi], 1);
 	} else {
 		/* DSB inner shareable, store */
 		dsb(ishst);
 	}
 
 	its_cmd_inv(dev, girq->gi_its_dev, girq);
 }
 
 static void
 gicv3_its_enable_intr(device_t dev, struct intr_irqsrc *isrc)
 {
 	struct gicv3_its_softc *sc;
 	struct gicv3_its_irqsrc *girq;
 	uint8_t *conf;
 
 	sc = device_get_softc(dev);
 	girq = (struct gicv3_its_irqsrc *)isrc;
 	conf = sc->sc_conf_base;
 
 	conf[girq->gi_lpi] |= LPI_CONF_ENABLE;
 
 	if ((sc->sc_its_flags & ITS_FLAGS_LPI_CONF_FLUSH) != 0) {
 		/* Clean D-cache under command. */
 		cpu_dcache_wb_range(&conf[girq->gi_lpi], 1);
 	} else {
 		/* DSB inner shareable, store */
 		dsb(ishst);
 	}
 
 	its_cmd_inv(dev, girq->gi_its_dev, girq);
 }
 
 static int
 gicv3_its_intr(void *arg, uintptr_t irq)
 {
 	struct gicv3_its_softc *sc = arg;
 	struct gicv3_its_irqsrc *girq;
 	struct trapframe *tf;
 
 	irq -= sc->sc_irq_base;
 	girq = sc->sc_irqs[irq];
 	if (girq == NULL)
 		panic("gicv3_its_intr: Invalid interrupt %ld",
 		    irq + sc->sc_irq_base);
 
 	tf = curthread->td_intr_frame;
 	intr_isrc_dispatch(&girq->gi_isrc, tf);
 	return (FILTER_HANDLED);
 }
 
 static void
 gicv3_its_pre_ithread(device_t dev, struct intr_irqsrc *isrc)
 {
 	struct gicv3_its_irqsrc *girq;
 
 	girq = (struct gicv3_its_irqsrc *)isrc;
 	gic_icc_write(EOIR1, girq->gi_lpi + GIC_FIRST_LPI);
 }
 
 static void
 gicv3_its_post_ithread(device_t dev, struct intr_irqsrc *isrc)
 {
 
 }
 
 static void
 gicv3_its_post_filter(device_t dev, struct intr_irqsrc *isrc)
 {
 	struct gicv3_its_irqsrc *girq;
 
 	girq = (struct gicv3_its_irqsrc *)isrc;
 	gic_icc_write(EOIR1, girq->gi_lpi + GIC_FIRST_LPI);
 }
 
 static int
 gicv3_its_select_cpu(device_t dev, struct intr_irqsrc *isrc)
 {
 	struct gicv3_its_softc *sc;
 
 	sc = device_get_softc(dev);
 	if (CPU_EMPTY(&isrc->isrc_cpu)) {
 		sc->gic_irq_cpu = intr_irq_next_cpu(sc->gic_irq_cpu,
 		    &sc->sc_cpus);
 		CPU_SETOF(sc->gic_irq_cpu, &isrc->isrc_cpu);
 	}
 
 	return (0);
 }
 
 static int
 gicv3_its_bind_intr(device_t dev, struct intr_irqsrc *isrc)
 {
 	struct gicv3_its_irqsrc *girq;
 
 	gicv3_its_select_cpu(dev, isrc);
 
 	girq = (struct gicv3_its_irqsrc *)isrc;
 	its_cmd_movi(dev, girq);
 	return (0);
 }
 
 static int
 gicv3_its_map_intr(device_t dev, struct intr_map_data *data,
     struct intr_irqsrc **isrcp)
 {
 
 	/*
 	 * This should never happen, we only call this function to map
 	 * interrupts found before the controller driver is ready.
 	 */
 	panic("gicv3_its_map_intr: Unable to map a MSI interrupt");
 }
 
 static int
 gicv3_its_setup_intr(device_t dev, struct intr_irqsrc *isrc,
     struct resource *res, struct intr_map_data *data)
 {
 
 	/* Bind the interrupt to a CPU */
 	gicv3_its_bind_intr(dev, isrc);
 
 	return (0);
 }
 
 #ifdef SMP
 static void
 gicv3_its_init_secondary(device_t dev)
 {
 	struct gicv3_its_softc *sc;
 
 	sc = device_get_softc(dev);
 
 	/*
 	 * This is fatal as otherwise we may bind interrupts to this CPU.
 	 * We need a way to tell the interrupt framework to only bind to a
 	 * subset of given CPUs when it performs the shuffle.
 	 */
 	if (its_init_cpu(dev, sc) != 0)
 		panic("gicv3_its_init_secondary: No usable ITS on CPU%d",
 		    PCPU_GET(cpuid));
 }
 #endif
 
 static uint32_t
 its_get_devid(device_t pci_dev)
 {
 	uintptr_t id;
 
 	if (pci_get_id(pci_dev, PCI_ID_MSI, &id) != 0)
 		panic("%s: %s: Unable to get the MSI DeviceID", __func__,
 		    device_get_nameunit(pci_dev));
 
 	return (id);
 }
 
 static struct its_dev *
 its_device_find(device_t dev, device_t child)
 {
 	struct gicv3_its_softc *sc;
 	struct its_dev *its_dev = NULL;
 
 	sc = device_get_softc(dev);
 
 	mtx_lock_spin(&sc->sc_its_dev_lock);
 	TAILQ_FOREACH(its_dev, &sc->sc_its_dev_list, entry) {
 		if (its_dev->pci_dev == child)
 			break;
 	}
 	mtx_unlock_spin(&sc->sc_its_dev_lock);
 
 	return (its_dev);
 }
 
 static bool
 its_device_alloc(struct gicv3_its_softc *sc, int devid)
 {
 	struct its_ptable *ptable;
 	void *l2_table;
 	uint64_t *table;
 	uint32_t index;
 	bool shareable;
 
 	/* No device table */
 	if (sc->sc_dev_table_idx < 0) {
 		if (devid >= (1 << sc->sc_devbits)) {
 			if (bootverbose) {
 				device_printf(sc->dev,
 				    "%s: Device out of range for hardware "
 				    "(%x >= %x)\n", __func__, devid,
 				    1 << sc->sc_devbits);
 			}
 			return (false);
 		}
 		return (true);
 	}
 
 	ptable = &sc->sc_its_ptab[sc->sc_dev_table_idx];
 	/* Check the devid is within the table limit */
 	if (!ptable->ptab_indirect) {
 		if (devid >= ptable->ptab_l1_nidents) {
 			if (bootverbose) {
 				device_printf(sc->dev,
 				    "%s: Device out of range for table "
 				    "(%x >= %x)\n", __func__, devid,
 				    ptable->ptab_l1_nidents);
 			}
 			return (false);
 		}
 
 		return (true);
 	}
 
 	/* Check the devid is within the allocated range */
 	index = devid / ptable->ptab_l2_nidents;
 	if (index >= ptable->ptab_l1_nidents) {
 		if (bootverbose) {
 			device_printf(sc->dev,
 			    "%s: Index out of range for table (%x >= %x)\n",
 			    __func__, index, ptable->ptab_l1_nidents);
 		}
 		return (false);
 	}
 
 	table = (uint64_t *)ptable->ptab_vaddr;
 	/* We have an second level table */
 	if ((table[index] & GITS_BASER_VALID) != 0)
 		return (true);
 
 	shareable = true;
 	if ((ptable->ptab_share & GITS_BASER_SHARE_MASK) == GITS_BASER_SHARE_NS)
 		shareable = false;
 
 	l2_table = contigmalloc_domainset(ptable->ptab_l2_size,
 	    M_GICV3_ITS, sc->sc_ds, M_WAITOK | M_ZERO, 0, (1ul << 48) - 1,
 	    ptable->ptab_page_size, 0);
 
 	if (!shareable)
 		cpu_dcache_wb_range(l2_table, ptable->ptab_l2_size);
 
 	table[index] = vtophys(l2_table) | GITS_BASER_VALID;
 	if (!shareable)
 		cpu_dcache_wb_range(&table[index], sizeof(table[index]));
 
 	dsb(sy);
 	return (true);
 }
 
 static struct its_dev *
 its_device_get(device_t dev, device_t child, u_int nvecs)
 {
 	struct gicv3_its_softc *sc;
 	struct its_dev *its_dev;
 	vmem_addr_t irq_base;
-	size_t esize;
+	size_t esize, itt_size;
 
 	sc = device_get_softc(dev);
 
 	its_dev = its_device_find(dev, child);
 	if (its_dev != NULL)
 		return (its_dev);
 
 	its_dev = malloc(sizeof(*its_dev), M_GICV3_ITS, M_NOWAIT | M_ZERO);
 	if (its_dev == NULL)
 		return (NULL);
 
 	its_dev->pci_dev = child;
 	its_dev->devid = its_get_devid(child);
 
 	its_dev->lpis.lpi_busy = 0;
 	its_dev->lpis.lpi_num = nvecs;
 	its_dev->lpis.lpi_free = nvecs;
 
 	if (!its_device_alloc(sc, its_dev->devid)) {
 		free(its_dev, M_GICV3_ITS);
 		return (NULL);
 	}
 
 	if (vmem_alloc(sc->sc_irq_alloc, nvecs, M_FIRSTFIT | M_NOWAIT,
 	    &irq_base) != 0) {
 		free(its_dev, M_GICV3_ITS);
 		return (NULL);
 	}
 	its_dev->lpis.lpi_base = irq_base;
 
 	/* Get ITT entry size */
 	esize = GITS_TYPER_ITTES(gic_its_read_8(sc, GITS_TYPER));
 
 	/*
 	 * Allocate ITT for this device.
 	 * PA has to be 256 B aligned. At least two entries for device.
 	 */
-	its_dev->itt_size = roundup2(MAX(nvecs, 2) * esize, 256);
-	its_dev->itt = contigmalloc_domainset(its_dev->itt_size,
+	itt_size = roundup2(MAX(nvecs, 2) * esize, 256);
+	its_dev->itt = contigmalloc_domainset(itt_size,
 	    M_GICV3_ITS, sc->sc_ds, M_NOWAIT | M_ZERO, 0,
 	    LPI_INT_TRANS_TAB_MAX_ADDR, LPI_INT_TRANS_TAB_ALIGN, 0);
 	if (its_dev->itt == NULL) {
 		vmem_free(sc->sc_irq_alloc, its_dev->lpis.lpi_base, nvecs);
 		free(its_dev, M_GICV3_ITS);
 		return (NULL);
 	}
 
 	/* Make sure device sees zeroed ITT. */
 	if ((sc->sc_its_flags & ITS_FLAGS_CMDQ_FLUSH) != 0)
-		cpu_dcache_wb_range(its_dev->itt, its_dev->itt_size);
+		cpu_dcache_wb_range(its_dev->itt, itt_size);
 
 	mtx_lock_spin(&sc->sc_its_dev_lock);
 	TAILQ_INSERT_TAIL(&sc->sc_its_dev_list, its_dev, entry);
 	mtx_unlock_spin(&sc->sc_its_dev_lock);
 
 	/* Map device to its ITT */
 	its_cmd_mapd(dev, its_dev, 1);
 
 	return (its_dev);
 }
 
 static void
 its_device_release(device_t dev, struct its_dev *its_dev)
 {
 	struct gicv3_its_softc *sc;
 
 	KASSERT(its_dev->lpis.lpi_busy == 0,
 	    ("its_device_release: Trying to release an inuse ITS device"));
 
 	/* Unmap device in ITS */
 	its_cmd_mapd(dev, its_dev, 0);
 
 	sc = device_get_softc(dev);
 
 	/* Remove the device from the list of devices */
 	mtx_lock_spin(&sc->sc_its_dev_lock);
 	TAILQ_REMOVE(&sc->sc_its_dev_list, its_dev, entry);
 	mtx_unlock_spin(&sc->sc_its_dev_lock);
 
 	/* Free ITT */
 	KASSERT(its_dev->itt != NULL, ("Invalid ITT in valid ITS device"));
-	contigfree(its_dev->itt, its_dev->itt_size, M_GICV3_ITS);
+	free(its_dev->itt, M_GICV3_ITS);
 
 	/* Free the IRQ allocation */
 	vmem_free(sc->sc_irq_alloc, its_dev->lpis.lpi_base,
 	    its_dev->lpis.lpi_num);
 
 	free(its_dev, M_GICV3_ITS);
 }
 
 static struct gicv3_its_irqsrc *
 gicv3_its_alloc_irqsrc(device_t dev, struct gicv3_its_softc *sc, u_int irq)
 {
 	struct gicv3_its_irqsrc *girq = NULL;
 
 	KASSERT(sc->sc_irqs[irq] == NULL,
 	    ("%s: Interrupt %u already allocated", __func__, irq));
 	mtx_lock_spin(&sc->sc_its_dev_lock);
 	if (!TAILQ_EMPTY(&sc->sc_free_irqs)) {
 		girq = TAILQ_FIRST(&sc->sc_free_irqs);
 		TAILQ_REMOVE(&sc->sc_free_irqs, girq, gi_link);
 	}
 	mtx_unlock_spin(&sc->sc_its_dev_lock);
 	if (girq == NULL) {
 		girq = malloc(sizeof(*girq), M_GICV3_ITS,
 		    M_NOWAIT | M_ZERO);
 		if (girq == NULL)
 			return (NULL);
 		girq->gi_id = -1;
 		if (intr_isrc_register(&girq->gi_isrc, dev, 0,
 		    "%s,%u", device_get_nameunit(dev), irq) != 0) {
 			free(girq, M_GICV3_ITS);
 			return (NULL);
 		}
 	}
 	girq->gi_lpi = irq + sc->sc_irq_base - GIC_FIRST_LPI;
 	sc->sc_irqs[irq] = girq;
 
 	return (girq);
 }
 
 static void
 gicv3_its_release_irqsrc(struct gicv3_its_softc *sc,
     struct gicv3_its_irqsrc *girq)
 {
 	u_int irq;
 
 	mtx_assert(&sc->sc_its_dev_lock, MA_OWNED);
 
 	irq = girq->gi_lpi + GIC_FIRST_LPI - sc->sc_irq_base;
 	sc->sc_irqs[irq] = NULL;
 
 	girq->gi_id = -1;
 	girq->gi_its_dev = NULL;
 	TAILQ_INSERT_TAIL(&sc->sc_free_irqs, girq, gi_link);
 }
 
 static int
 gicv3_its_alloc_msi(device_t dev, device_t child, int count, int maxcount,
     device_t *pic, struct intr_irqsrc **srcs)
 {
 	struct gicv3_its_softc *sc;
 	struct gicv3_its_irqsrc *girq;
 	struct its_dev *its_dev;
 	u_int irq;
 	int i;
 
 	its_dev = its_device_get(dev, child, count);
 	if (its_dev == NULL)
 		return (ENXIO);
 
 	KASSERT(its_dev->lpis.lpi_free >= count,
 	    ("gicv3_its_alloc_msi: No free LPIs"));
 	sc = device_get_softc(dev);
 	irq = its_dev->lpis.lpi_base + its_dev->lpis.lpi_num -
 	    its_dev->lpis.lpi_free;
 
 	/* Allocate the irqsrc for each MSI */
 	for (i = 0; i < count; i++, irq++) {
 		its_dev->lpis.lpi_free--;
 		srcs[i] = (struct intr_irqsrc *)gicv3_its_alloc_irqsrc(dev,
 		    sc, irq);
 		if (srcs[i] == NULL)
 			break;
 	}
 
 	/* The allocation failed, release them */
 	if (i != count) {
 		mtx_lock_spin(&sc->sc_its_dev_lock);
 		for (i = 0; i < count; i++) {
 			girq = (struct gicv3_its_irqsrc *)srcs[i];
 			if (girq == NULL)
 				break;
 			gicv3_its_release_irqsrc(sc, girq);
 			srcs[i] = NULL;
 		}
 		mtx_unlock_spin(&sc->sc_its_dev_lock);
 		return (ENXIO);
 	}
 
 	/* Finish the allocation now we have all MSI irqsrcs */
 	for (i = 0; i < count; i++) {
 		girq = (struct gicv3_its_irqsrc *)srcs[i];
 		girq->gi_id = i;
 		girq->gi_its_dev = its_dev;
 
 		/* Map the message to the given IRQ */
 		gicv3_its_select_cpu(dev, (struct intr_irqsrc *)girq);
 		its_cmd_mapti(dev, girq);
 	}
 	its_dev->lpis.lpi_busy += count;
 	*pic = dev;
 
 	return (0);
 }
 
 static int
 gicv3_its_release_msi(device_t dev, device_t child, int count,
     struct intr_irqsrc **isrc)
 {
 	struct gicv3_its_softc *sc;
 	struct gicv3_its_irqsrc *girq;
 	struct its_dev *its_dev;
 	int i;
 
 	its_dev = its_device_find(dev, child);
 
 	KASSERT(its_dev != NULL,
 	    ("gicv3_its_release_msi: Releasing a MSI interrupt with "
 	     "no ITS device"));
 	KASSERT(its_dev->lpis.lpi_busy >= count,
 	    ("gicv3_its_release_msi: Releasing more interrupts than "
 	     "were allocated: releasing %d, allocated %d", count,
 	     its_dev->lpis.lpi_busy));
 
 	sc = device_get_softc(dev);
 	mtx_lock_spin(&sc->sc_its_dev_lock);
 	for (i = 0; i < count; i++) {
 		girq = (struct gicv3_its_irqsrc *)isrc[i];
 		gicv3_its_release_irqsrc(sc, girq);
 	}
 	mtx_unlock_spin(&sc->sc_its_dev_lock);
 	its_dev->lpis.lpi_busy -= count;
 
 	if (its_dev->lpis.lpi_busy == 0)
 		its_device_release(dev, its_dev);
 
 	return (0);
 }
 
 static int
 gicv3_its_alloc_msix(device_t dev, device_t child, device_t *pic,
     struct intr_irqsrc **isrcp)
 {
 	struct gicv3_its_softc *sc;
 	struct gicv3_its_irqsrc *girq;
 	struct its_dev *its_dev;
 	u_int nvecs, irq;
 
 	nvecs = pci_msix_count(child);
 	its_dev = its_device_get(dev, child, nvecs);
 	if (its_dev == NULL)
 		return (ENXIO);
 
 	KASSERT(its_dev->lpis.lpi_free > 0,
 	    ("gicv3_its_alloc_msix: No free LPIs"));
 	sc = device_get_softc(dev);
 	irq = its_dev->lpis.lpi_base + its_dev->lpis.lpi_num -
 	    its_dev->lpis.lpi_free;
 
 	girq = gicv3_its_alloc_irqsrc(dev, sc, irq);
 	if (girq == NULL)
 		return (ENXIO);
 	girq->gi_id = its_dev->lpis.lpi_busy;
 	girq->gi_its_dev = its_dev;
 
 	its_dev->lpis.lpi_free--;
 	its_dev->lpis.lpi_busy++;
 
 	/* Map the message to the given IRQ */
 	gicv3_its_select_cpu(dev, (struct intr_irqsrc *)girq);
 	its_cmd_mapti(dev, girq);
 
 	*pic = dev;
 	*isrcp = (struct intr_irqsrc *)girq;
 
 	return (0);
 }
 
 static int
 gicv3_its_release_msix(device_t dev, device_t child, struct intr_irqsrc *isrc)
 {
 	struct gicv3_its_softc *sc;
 	struct gicv3_its_irqsrc *girq;
 	struct its_dev *its_dev;
 
 	its_dev = its_device_find(dev, child);
 
 	KASSERT(its_dev != NULL,
 	    ("gicv3_its_release_msix: Releasing a MSI-X interrupt with "
 	     "no ITS device"));
 	KASSERT(its_dev->lpis.lpi_busy > 0,
 	    ("gicv3_its_release_msix: Releasing more interrupts than "
 	     "were allocated: allocated %d", its_dev->lpis.lpi_busy));
 
 	sc = device_get_softc(dev);
 	girq = (struct gicv3_its_irqsrc *)isrc;
 	mtx_lock_spin(&sc->sc_its_dev_lock);
 	gicv3_its_release_irqsrc(sc, girq);
 	mtx_unlock_spin(&sc->sc_its_dev_lock);
 	its_dev->lpis.lpi_busy--;
 
 	if (its_dev->lpis.lpi_busy == 0)
 		its_device_release(dev, its_dev);
 
 	return (0);
 }
 
 static int
 gicv3_its_map_msi(device_t dev, device_t child, struct intr_irqsrc *isrc,
     uint64_t *addr, uint32_t *data)
 {
 	struct gicv3_its_softc *sc;
 	struct gicv3_its_irqsrc *girq;
 
 	sc = device_get_softc(dev);
 	girq = (struct gicv3_its_irqsrc *)isrc;
 
 	*addr = vtophys(rman_get_virtual(sc->sc_its_res)) + GITS_TRANSLATER;
 	*data = girq->gi_id;
 
 	return (0);
 }
 
 #ifdef IOMMU
 static int
 gicv3_iommu_init(device_t dev, device_t child, struct iommu_domain **domain)
 {
 	struct gicv3_its_softc *sc;
 	struct iommu_ctx *ctx;
 	int error;
 
 	sc = device_get_softc(dev);
 	ctx = iommu_get_dev_ctx(child);
 	if (ctx == NULL)
 		return (ENXIO);
 	/* Map the page containing the GITS_TRANSLATER register. */
 	error = iommu_map_msi(ctx, PAGE_SIZE, 0,
 	    IOMMU_MAP_ENTRY_WRITE, IOMMU_MF_CANWAIT, &sc->ma);
 	*domain = iommu_get_ctx_domain(ctx);
 
 	return (error);
 }
 
 static void
 gicv3_iommu_deinit(device_t dev, device_t child)
 {
 	struct iommu_ctx *ctx;
 
 	ctx = iommu_get_dev_ctx(child);
 	if (ctx == NULL)
 		return;
 
 	iommu_unmap_msi(ctx);
 }
 #endif
 
 /*
  * Commands handling.
  */
 
 static __inline void
 cmd_format_command(struct its_cmd *cmd, uint8_t cmd_type)
 {
 	/* Command field: DW0 [7:0] */
 	cmd->cmd_dword[0] &= htole64(~CMD_COMMAND_MASK);
 	cmd->cmd_dword[0] |= htole64(cmd_type);
 }
 
 static __inline void
 cmd_format_devid(struct its_cmd *cmd, uint32_t devid)
 {
 	/* Device ID field: DW0 [63:32] */
 	cmd->cmd_dword[0] &= htole64(~CMD_DEVID_MASK);
 	cmd->cmd_dword[0] |= htole64((uint64_t)devid << CMD_DEVID_SHIFT);
 }
 
 static __inline void
 cmd_format_size(struct its_cmd *cmd, uint16_t size)
 {
 	/* Size field: DW1 [4:0] */
 	cmd->cmd_dword[1] &= htole64(~CMD_SIZE_MASK);
 	cmd->cmd_dword[1] |= htole64((size & CMD_SIZE_MASK));
 }
 
 static __inline void
 cmd_format_id(struct its_cmd *cmd, uint32_t id)
 {
 	/* ID field: DW1 [31:0] */
 	cmd->cmd_dword[1] &= htole64(~CMD_ID_MASK);
 	cmd->cmd_dword[1] |= htole64(id);
 }
 
 static __inline void
 cmd_format_pid(struct its_cmd *cmd, uint32_t pid)
 {
 	/* Physical ID field: DW1 [63:32] */
 	cmd->cmd_dword[1] &= htole64(~CMD_PID_MASK);
 	cmd->cmd_dword[1] |= htole64((uint64_t)pid << CMD_PID_SHIFT);
 }
 
 static __inline void
 cmd_format_col(struct its_cmd *cmd, uint16_t col_id)
 {
 	/* Collection field: DW2 [16:0] */
 	cmd->cmd_dword[2] &= htole64(~CMD_COL_MASK);
 	cmd->cmd_dword[2] |= htole64(col_id);
 }
 
 static __inline void
 cmd_format_target(struct its_cmd *cmd, uint64_t target)
 {
 	/* Target Address field: DW2 [47:16] */
 	cmd->cmd_dword[2] &= htole64(~CMD_TARGET_MASK);
 	cmd->cmd_dword[2] |= htole64(target & CMD_TARGET_MASK);
 }
 
 static __inline void
 cmd_format_itt(struct its_cmd *cmd, uint64_t itt)
 {
 	/* ITT Address field: DW2 [47:8] */
 	cmd->cmd_dword[2] &= htole64(~CMD_ITT_MASK);
 	cmd->cmd_dword[2] |= htole64(itt & CMD_ITT_MASK);
 }
 
 static __inline void
 cmd_format_valid(struct its_cmd *cmd, uint8_t valid)
 {
 	/* Valid field: DW2 [63] */
 	cmd->cmd_dword[2] &= htole64(~CMD_VALID_MASK);
 	cmd->cmd_dword[2] |= htole64((uint64_t)valid << CMD_VALID_SHIFT);
 }
 
 static inline bool
 its_cmd_queue_full(struct gicv3_its_softc *sc)
 {
 	size_t read_idx, next_write_idx;
 
 	/* Get the index of the next command */
 	next_write_idx = (sc->sc_its_cmd_next_idx + 1) %
 	    (ITS_CMDQ_SIZE / sizeof(struct its_cmd));
 	/* And the index of the current command being read */
 	read_idx = gic_its_read_4(sc, GITS_CREADR) / sizeof(struct its_cmd);
 
 	/*
 	 * The queue is full when the write offset points
 	 * at the command before the current read offset.
 	 */
 	return (next_write_idx == read_idx);
 }
 
 static inline void
 its_cmd_sync(struct gicv3_its_softc *sc, struct its_cmd *cmd)
 {
 
 	if ((sc->sc_its_flags & ITS_FLAGS_CMDQ_FLUSH) != 0) {
 		/* Clean D-cache under command. */
 		cpu_dcache_wb_range(cmd, sizeof(*cmd));
 	} else {
 		/* DSB inner shareable, store */
 		dsb(ishst);
 	}
 
 }
 
 static inline uint64_t
 its_cmd_cwriter_offset(struct gicv3_its_softc *sc, struct its_cmd *cmd)
 {
 	uint64_t off;
 
 	off = (cmd - sc->sc_its_cmd_base) * sizeof(*cmd);
 
 	return (off);
 }
 
 static void
 its_cmd_wait_completion(device_t dev, struct its_cmd *cmd_first,
     struct its_cmd *cmd_last)
 {
 	struct gicv3_its_softc *sc;
 	uint64_t first, last, read;
 	size_t us_left;
 
 	sc = device_get_softc(dev);
 
 	/*
 	 * XXX ARM64TODO: This is obviously a significant delay.
 	 * The reason for that is that currently the time frames for
 	 * the command to complete are not known.
 	 */
 	us_left = 1000000;
 
 	first = its_cmd_cwriter_offset(sc, cmd_first);
 	last = its_cmd_cwriter_offset(sc, cmd_last);
 
 	for (;;) {
 		read = gic_its_read_8(sc, GITS_CREADR);
 		if (first < last) {
 			if (read < first || read >= last)
 				break;
 		} else if (read < first && read >= last)
 			break;
 
 		if (us_left-- == 0) {
 			/* This means timeout */
 			device_printf(dev,
 			    "Timeout while waiting for CMD completion.\n");
 			return;
 		}
 		DELAY(1);
 	}
 }
 
 static struct its_cmd *
 its_cmd_alloc_locked(device_t dev)
 {
 	struct gicv3_its_softc *sc;
 	struct its_cmd *cmd;
 	size_t us_left;
 
 	sc = device_get_softc(dev);
 
 	/*
 	 * XXX ARM64TODO: This is obviously a significant delay.
 	 * The reason for that is that currently the time frames for
 	 * the command to complete (and therefore free the descriptor)
 	 * are not known.
 	 */
 	us_left = 1000000;
 
 	mtx_assert(&sc->sc_its_cmd_lock, MA_OWNED);
 	while (its_cmd_queue_full(sc)) {
 		if (us_left-- == 0) {
 			/* Timeout while waiting for free command */
 			device_printf(dev,
 			    "Timeout while waiting for free command\n");
 			return (NULL);
 		}
 		DELAY(1);
 	}
 
 	cmd = &sc->sc_its_cmd_base[sc->sc_its_cmd_next_idx];
 	sc->sc_its_cmd_next_idx++;
 	sc->sc_its_cmd_next_idx %= ITS_CMDQ_SIZE / sizeof(struct its_cmd);
 
 	return (cmd);
 }
 
 static uint64_t
 its_cmd_prepare(struct its_cmd *cmd, struct its_cmd_desc *desc)
 {
 	uint64_t target;
 	uint8_t cmd_type;
 	u_int size;
 
 	cmd_type = desc->cmd_type;
 	target = ITS_TARGET_NONE;
 
 	switch (cmd_type) {
 	case ITS_CMD_MOVI:	/* Move interrupt ID to another collection */
 		target = desc->cmd_desc_movi.col->col_target;
 		cmd_format_command(cmd, ITS_CMD_MOVI);
 		cmd_format_id(cmd, desc->cmd_desc_movi.id);
 		cmd_format_col(cmd, desc->cmd_desc_movi.col->col_id);
 		cmd_format_devid(cmd, desc->cmd_desc_movi.its_dev->devid);
 		break;
 	case ITS_CMD_SYNC:	/* Wait for previous commands completion */
 		target = desc->cmd_desc_sync.col->col_target;
 		cmd_format_command(cmd, ITS_CMD_SYNC);
 		cmd_format_target(cmd, target);
 		break;
 	case ITS_CMD_MAPD:	/* Assign ITT to device */
 		cmd_format_command(cmd, ITS_CMD_MAPD);
 		cmd_format_itt(cmd, vtophys(desc->cmd_desc_mapd.its_dev->itt));
 		/*
 		 * Size describes number of bits to encode interrupt IDs
 		 * supported by the device minus one.
 		 * When V (valid) bit is zero, this field should be written
 		 * as zero.
 		 */
 		if (desc->cmd_desc_mapd.valid != 0) {
 			size = fls(desc->cmd_desc_mapd.its_dev->lpis.lpi_num);
 			size = MAX(1, size) - 1;
 		} else
 			size = 0;
 
 		cmd_format_size(cmd, size);
 		cmd_format_devid(cmd, desc->cmd_desc_mapd.its_dev->devid);
 		cmd_format_valid(cmd, desc->cmd_desc_mapd.valid);
 		break;
 	case ITS_CMD_MAPC:	/* Map collection to Re-Distributor */
 		target = desc->cmd_desc_mapc.col->col_target;
 		cmd_format_command(cmd, ITS_CMD_MAPC);
 		cmd_format_col(cmd, desc->cmd_desc_mapc.col->col_id);
 		cmd_format_valid(cmd, desc->cmd_desc_mapc.valid);
 		cmd_format_target(cmd, target);
 		break;
 	case ITS_CMD_MAPTI:
 		target = desc->cmd_desc_mapvi.col->col_target;
 		cmd_format_command(cmd, ITS_CMD_MAPTI);
 		cmd_format_devid(cmd, desc->cmd_desc_mapvi.its_dev->devid);
 		cmd_format_id(cmd, desc->cmd_desc_mapvi.id);
 		cmd_format_pid(cmd, desc->cmd_desc_mapvi.pid);
 		cmd_format_col(cmd, desc->cmd_desc_mapvi.col->col_id);
 		break;
 	case ITS_CMD_MAPI:
 		target = desc->cmd_desc_mapi.col->col_target;
 		cmd_format_command(cmd, ITS_CMD_MAPI);
 		cmd_format_devid(cmd, desc->cmd_desc_mapi.its_dev->devid);
 		cmd_format_id(cmd, desc->cmd_desc_mapi.pid);
 		cmd_format_col(cmd, desc->cmd_desc_mapi.col->col_id);
 		break;
 	case ITS_CMD_INV:
 		target = desc->cmd_desc_inv.col->col_target;
 		cmd_format_command(cmd, ITS_CMD_INV);
 		cmd_format_devid(cmd, desc->cmd_desc_inv.its_dev->devid);
 		cmd_format_id(cmd, desc->cmd_desc_inv.pid);
 		break;
 	case ITS_CMD_INVALL:
 		cmd_format_command(cmd, ITS_CMD_INVALL);
 		cmd_format_col(cmd, desc->cmd_desc_invall.col->col_id);
 		break;
 	default:
 		panic("its_cmd_prepare: Invalid command: %x", cmd_type);
 	}
 
 	return (target);
 }
 
 static int
 its_cmd_send(device_t dev, struct its_cmd_desc *desc)
 {
 	struct gicv3_its_softc *sc;
 	struct its_cmd *cmd, *cmd_sync, *cmd_write;
 	struct its_col col_sync;
 	struct its_cmd_desc desc_sync;
 	uint64_t target, cwriter;
 
 	sc = device_get_softc(dev);
 	mtx_lock_spin(&sc->sc_its_cmd_lock);
 	cmd = its_cmd_alloc_locked(dev);
 	if (cmd == NULL) {
 		device_printf(dev, "could not allocate ITS command\n");
 		mtx_unlock_spin(&sc->sc_its_cmd_lock);
 		return (EBUSY);
 	}
 
 	target = its_cmd_prepare(cmd, desc);
 	its_cmd_sync(sc, cmd);
 
 	if (target != ITS_TARGET_NONE) {
 		cmd_sync = its_cmd_alloc_locked(dev);
 		if (cmd_sync != NULL) {
 			desc_sync.cmd_type = ITS_CMD_SYNC;
 			col_sync.col_target = target;
 			desc_sync.cmd_desc_sync.col = &col_sync;
 			its_cmd_prepare(cmd_sync, &desc_sync);
 			its_cmd_sync(sc, cmd_sync);
 		}
 	}
 
 	/* Update GITS_CWRITER */
 	cwriter = sc->sc_its_cmd_next_idx * sizeof(struct its_cmd);
 	gic_its_write_8(sc, GITS_CWRITER, cwriter);
 	cmd_write = &sc->sc_its_cmd_base[sc->sc_its_cmd_next_idx];
 	mtx_unlock_spin(&sc->sc_its_cmd_lock);
 
 	its_cmd_wait_completion(dev, cmd, cmd_write);
 
 	return (0);
 }
 
 /* Handlers to send commands */
 static void
 its_cmd_movi(device_t dev, struct gicv3_its_irqsrc *girq)
 {
 	struct gicv3_its_softc *sc;
 	struct its_cmd_desc desc;
 	struct its_col *col;
 
 	sc = device_get_softc(dev);
 	col = sc->sc_its_cols[CPU_FFS(&girq->gi_isrc.isrc_cpu) - 1];
 
 	desc.cmd_type = ITS_CMD_MOVI;
 	desc.cmd_desc_movi.its_dev = girq->gi_its_dev;
 	desc.cmd_desc_movi.col = col;
 	desc.cmd_desc_movi.id = girq->gi_id;
 
 	its_cmd_send(dev, &desc);
 }
 
 static void
 its_cmd_mapc(device_t dev, struct its_col *col, uint8_t valid)
 {
 	struct its_cmd_desc desc;
 
 	desc.cmd_type = ITS_CMD_MAPC;
 	desc.cmd_desc_mapc.col = col;
 	/*
 	 * Valid bit set - map the collection.
 	 * Valid bit cleared - unmap the collection.
 	 */
 	desc.cmd_desc_mapc.valid = valid;
 
 	its_cmd_send(dev, &desc);
 }
 
 static void
 its_cmd_mapti(device_t dev, struct gicv3_its_irqsrc *girq)
 {
 	struct gicv3_its_softc *sc;
 	struct its_cmd_desc desc;
 	struct its_col *col;
 	u_int col_id;
 
 	sc = device_get_softc(dev);
 
 	col_id = CPU_FFS(&girq->gi_isrc.isrc_cpu) - 1;
 	col = sc->sc_its_cols[col_id];
 
 	desc.cmd_type = ITS_CMD_MAPTI;
 	desc.cmd_desc_mapvi.its_dev = girq->gi_its_dev;
 	desc.cmd_desc_mapvi.col = col;
 	/* The EventID sent to the device */
 	desc.cmd_desc_mapvi.id = girq->gi_id;
 	/* The physical interrupt presented to softeware */
 	desc.cmd_desc_mapvi.pid = girq->gi_lpi + GIC_FIRST_LPI;
 
 	its_cmd_send(dev, &desc);
 }
 
 static void
 its_cmd_mapd(device_t dev, struct its_dev *its_dev, uint8_t valid)
 {
 	struct its_cmd_desc desc;
 
 	desc.cmd_type = ITS_CMD_MAPD;
 	desc.cmd_desc_mapd.its_dev = its_dev;
 	desc.cmd_desc_mapd.valid = valid;
 
 	its_cmd_send(dev, &desc);
 }
 
 static void
 its_cmd_inv(device_t dev, struct its_dev *its_dev,
     struct gicv3_its_irqsrc *girq)
 {
 	struct gicv3_its_softc *sc;
 	struct its_cmd_desc desc;
 	struct its_col *col;
 
 	sc = device_get_softc(dev);
 	col = sc->sc_its_cols[CPU_FFS(&girq->gi_isrc.isrc_cpu) - 1];
 
 	desc.cmd_type = ITS_CMD_INV;
 	/* The EventID sent to the device */
 	desc.cmd_desc_inv.pid = girq->gi_id;
 	desc.cmd_desc_inv.its_dev = its_dev;
 	desc.cmd_desc_inv.col = col;
 
 	its_cmd_send(dev, &desc);
 }
 
 static void
 its_cmd_invall(device_t dev, struct its_col *col)
 {
 	struct its_cmd_desc desc;
 
 	desc.cmd_type = ITS_CMD_INVALL;
 	desc.cmd_desc_invall.col = col;
 
 	its_cmd_send(dev, &desc);
 }
 
 #ifdef FDT
 static device_probe_t gicv3_its_fdt_probe;
 static device_attach_t gicv3_its_fdt_attach;
 
 static device_method_t gicv3_its_fdt_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		gicv3_its_fdt_probe),
 	DEVMETHOD(device_attach,	gicv3_its_fdt_attach),
 
 	/* End */
 	DEVMETHOD_END
 };
 
 #define its_baseclasses its_fdt_baseclasses
 DEFINE_CLASS_1(its, gicv3_its_fdt_driver, gicv3_its_fdt_methods,
     sizeof(struct gicv3_its_softc), gicv3_its_driver);
 #undef its_baseclasses
 
 EARLY_DRIVER_MODULE(its_fdt, gic, gicv3_its_fdt_driver, 0, 0,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
 
 static int
 gicv3_its_fdt_probe(device_t dev)
 {
 
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
 	if (!ofw_bus_is_compatible(dev, "arm,gic-v3-its"))
 		return (ENXIO);
 
 	if (!gicv3_get_support_lpis(dev))
 		return (ENXIO);
 
 	device_set_desc(dev, "ARM GIC Interrupt Translation Service");
 	return (BUS_PROBE_DEFAULT);
 }
 
 static int
 gicv3_its_fdt_attach(device_t dev)
 {
 	struct gicv3_its_softc *sc;
 	phandle_t xref;
 	int err;
 
 	sc = device_get_softc(dev);
 	sc->dev = dev;
 	err = gicv3_its_attach(dev);
 	if (err != 0)
 		return (err);
 
 	/* Register this device as a interrupt controller */
 	xref = OF_xref_from_node(ofw_bus_get_node(dev));
 	sc->sc_pic = intr_pic_register(dev, xref);
 	err = intr_pic_add_handler(device_get_parent(dev), sc->sc_pic,
 	    gicv3_its_intr, sc, sc->sc_irq_base, sc->sc_irq_length);
 	if (err != 0) {
 		device_printf(dev, "Failed to add PIC handler: %d\n", err);
 		return (err);
 	}
 
 	/* Register this device to handle MSI interrupts */
 	err = intr_msi_register(dev, xref);
 	if (err != 0) {
 		device_printf(dev, "Failed to register for MSIs: %d\n", err);
 		return (err);
 	}
 
 	return (0);
 }
 #endif
 
 #ifdef DEV_ACPI
 static device_probe_t gicv3_its_acpi_probe;
 static device_attach_t gicv3_its_acpi_attach;
 
 static device_method_t gicv3_its_acpi_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		gicv3_its_acpi_probe),
 	DEVMETHOD(device_attach,	gicv3_its_acpi_attach),
 
 	/* End */
 	DEVMETHOD_END
 };
 
 #define its_baseclasses its_acpi_baseclasses
 DEFINE_CLASS_1(its, gicv3_its_acpi_driver, gicv3_its_acpi_methods,
     sizeof(struct gicv3_its_softc), gicv3_its_driver);
 #undef its_baseclasses
 
 EARLY_DRIVER_MODULE(its_acpi, gic, gicv3_its_acpi_driver, 0, 0,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
 
 static int
 gicv3_its_acpi_probe(device_t dev)
 {
 
 	if (gic_get_bus(dev) != GIC_BUS_ACPI)
 		return (EINVAL);
 
 	if (gic_get_hw_rev(dev) < 3)
 		return (EINVAL);
 
 	if (!gicv3_get_support_lpis(dev))
 		return (ENXIO);
 
 	device_set_desc(dev, "ARM GIC Interrupt Translation Service");
 	return (BUS_PROBE_DEFAULT);
 }
 
 static int
 gicv3_its_acpi_attach(device_t dev)
 {
 	struct gicv3_its_softc *sc;
 	struct gic_v3_devinfo *di;
 	int err;
 
 	sc = device_get_softc(dev);
 	sc->dev = dev;
 	err = gicv3_its_attach(dev);
 	if (err != 0)
 		return (err);
 
 	di = device_get_ivars(dev);
 	sc->sc_pic = intr_pic_register(dev, di->msi_xref);
 	err = intr_pic_add_handler(device_get_parent(dev), sc->sc_pic,
 	    gicv3_its_intr, sc, sc->sc_irq_base, sc->sc_irq_length);
 	if (err != 0) {
 		device_printf(dev, "Failed to add PIC handler: %d\n", err);
 		return (err);
 	}
 
 	/* Register this device to handle MSI interrupts */
 	err = intr_msi_register(dev, di->msi_xref);
 	if (err != 0) {
 		device_printf(dev, "Failed to register for MSIs: %d\n", err);
 		return (err);
 	}
 
 	return (0);
 }
 #endif
diff --git a/sys/arm64/include/bus_dma.h b/sys/arm64/include/bus_dma.h
index fb494be0bdc4..d9c37eb2641b 100644
--- a/sys/arm64/include/bus_dma.h
+++ b/sys/arm64/include/bus_dma.h
@@ -1,164 +1,164 @@
 
 #ifndef _MACHINE_BUS_DMA_H_
 #define	_MACHINE_BUS_DMA_H_
 
 #define WANT_INLINE_DMAMAP
 #include <sys/bus_dma.h>
 
 #include <machine/bus_dma_impl.h>
 
 /*
  * Is DMA address 1:1 mapping of physical address
  */
 static inline bool
 bus_dma_id_mapped(bus_dma_tag_t dmat, vm_paddr_t buf, bus_size_t buflen)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->id_mapped(dmat, buf, buflen));
 }
 
 /*
  * Allocate a handle for mapping from kva/uva/physical
  * address space into bus device space.
  */
 static inline int
 bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->map_create(dmat, flags, mapp));
 }
 
 /*
  * Destroy a handle for mapping from kva/uva/physical
  * address space into bus device space.
  */
 static inline int
 bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->map_destroy(dmat, map));
 }
 
 /*
  * Allocate a piece of memory that can be efficiently mapped into
  * bus device space based on the constraints listed in the dma tag.
  * A dmamap to for use with dmamap_load is also allocated.
  */
 static inline int
 bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
     bus_dmamap_t *mapp)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->mem_alloc(dmat, vaddr, flags, mapp));
 }
 
 /*
  * Free a piece of memory and it's allociated dmamap, that was allocated
- * via bus_dmamem_alloc.  Make the same choice for free/contigfree.
+ * via bus_dmamem_alloc.
  */
 static inline void
 bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	tc->impl->mem_free(dmat, vaddr, map);
 }
 
 /*
  * Release the mapping held by map.
  */
 static inline void
 bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	tc->impl->map_unload(dmat, map);
 }
 
 static inline void
 bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	tc->impl->map_sync(dmat, map, op);
 }
 
 static inline int
 _bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf,
     bus_size_t buflen, int flags, bus_dma_segment_t *segs, int *segp)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->load_phys(dmat, map, buf, buflen, flags, segs,
 	    segp));
 }
 
 static inline int
 _bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map, struct vm_page **ma,
     bus_size_t tlen, int ma_offs, int flags, bus_dma_segment_t *segs,
     int *segp)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->load_ma(dmat, map, ma, tlen, ma_offs, flags,
 	    segs, segp));
 }
 
 static inline int
 _bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
     bus_size_t buflen, struct pmap *pmap, int flags, bus_dma_segment_t *segs,
     int *segp)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->load_buffer(dmat, map, buf, buflen, pmap, flags, segs,
 	    segp));
 }
 
 static inline void
 _bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap_t map,
     struct memdesc *mem, bus_dmamap_callback_t *callback, void *callback_arg)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	tc->impl->map_waitok(dmat, map, mem, callback, callback_arg);
 }
 
 static inline bus_dma_segment_t *
 _bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map,
     bus_dma_segment_t *segs, int nsegs, int error)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->map_complete(dmat, map, segs, nsegs, error));
 }
 
 #ifdef KMSAN
 static inline void
 _bus_dmamap_load_kmsan(bus_dma_tag_t dmat, bus_dmamap_t map,
     struct memdesc *mem)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->load_kmsan(map, mem));
 }
 #endif
 
 #endif /* !_MACHINE_BUS_DMA_H_ */
diff --git a/sys/arm64/iommu/smmu.c b/sys/arm64/iommu/smmu.c
index 76a7d29dc2db..93b0cbb7c8e4 100644
--- a/sys/arm64/iommu/smmu.c
+++ b/sys/arm64/iommu/smmu.c
@@ -1,2013 +1,2011 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2019-2020 Ruslan Bukin <br@bsdpad.com>
  *
  * This software was developed by SRI International and the University of
  * Cambridge Computer Laboratory (Department of Computer Science and
  * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
  * DARPA SSITH research programme.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 /*
  * Hardware overview.
  *
  * An incoming transaction from a peripheral device has an address, size,
  * attributes and StreamID.
  *
  * In case of PCI-based devices, StreamID is a PCI rid.
  *
  * The StreamID is used to select a Stream Table Entry (STE) in a Stream table,
  * which contains per-device configuration.
  *
  * Stream table is a linear or 2-level walk table (this driver supports both).
  * Note that a linear table could occupy 1GB or more of memory depending on
  * sid_bits value.
  *
  * STE is used to locate a Context Descriptor, which is a struct in memory
  * that describes stages of translation, translation table type, pointer to
  * level 0 of page tables, ASID, etc.
  *
  * Hardware supports two stages of translation: Stage1 (S1) and Stage2 (S2):
  *  o S1 is used for the host machine traffic translation
  *  o S2 is for a hypervisor
  *
  * This driver enables S1 stage with standard AArch64 page tables.
  *
  * Note that SMMU does not share TLB with a main CPU.
  * Command queue is used by this driver to Invalidate SMMU TLB, STE cache.
  *
  * An arm64 SoC could have more than one SMMU instance.
  * ACPI IORT table describes which SMMU unit is assigned for a particular
  * peripheral device.
  *
  * Queues.
  *
  * Register interface and Memory-based circular buffer queues are used
  * to interface SMMU.
  *
  * These are a Command queue for commands to send to the SMMU and an Event
  * queue for event/fault reports from the SMMU. Optionally PRI queue is
  * designed for PCIe page requests reception.
  *
  * Note that not every hardware supports PRI services. For instance they were
  * not found in Neoverse N1 SDP machine.
  * (This drivers does not implement PRI queue.)
  *
  * All SMMU queues are arranged as circular buffers in memory. They are used
  * in a producer-consumer fashion so that an output queue contains data
  * produced by the SMMU and consumed by software.
  * An input queue contains data produced by software, consumed by the SMMU.
  *
  * Interrupts.
  *
  * Interrupts are not required by this driver for normal operation.
  * The standard wired interrupt is only triggered when an event comes from
  * the SMMU, which is only in a case of errors (e.g. translation fault).
  */
 
 #include "opt_platform.h"
 #include "opt_acpi.h"
 
 #include <sys/param.h>
 #include <sys/bitstring.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/rman.h>
 #include <sys/lock.h>
 #include <sys/sysctl.h>
 #include <sys/tree.h>
 #include <sys/taskqueue.h>
 #include <vm/vm.h>
 #include <vm/vm_page.h>
 #ifdef DEV_ACPI
 #include <contrib/dev/acpica/include/acpi.h>
 #include <dev/acpica/acpivar.h>
 #endif
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/iommu/iommu.h>
 #include <arm64/iommu/iommu_pmap.h>
 
 #include <machine/bus.h>
 
 #ifdef FDT
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #endif
 
 #include "iommu.h"
 #include "iommu_if.h"
 
 #include "smmureg.h"
 #include "smmuvar.h"
 
 #define	STRTAB_L1_SZ_SHIFT	20
 #define	STRTAB_SPLIT		8
 
 #define	STRTAB_L1_DESC_L2PTR_M	(0x3fffffffffff << 6)
 #define	STRTAB_L1_DESC_DWORDS	1
 
 #define	STRTAB_STE_DWORDS	8
 
 #define	CMDQ_ENTRY_DWORDS	2
 #define	EVTQ_ENTRY_DWORDS	4
 #define	PRIQ_ENTRY_DWORDS	2
 
 #define	CD_DWORDS		8
 
 #define	Q_WRP(q, p)		((p) & (1 << (q)->size_log2))
 #define	Q_IDX(q, p)		((p) & ((1 << (q)->size_log2) - 1))
 #define	Q_OVF(p)		((p) & (1 << 31)) /* Event queue overflowed */
 
 #define	SMMU_Q_ALIGN		(64 * 1024)
 
 #define		MAXADDR_48BIT	0xFFFFFFFFFFFFUL
 #define		MAXADDR_52BIT	0xFFFFFFFFFFFFFUL
 
 static struct resource_spec smmu_spec[] = {
 	{ SYS_RES_MEMORY, 0, RF_ACTIVE },
 	{ SYS_RES_IRQ, 0, RF_ACTIVE },
 	{ SYS_RES_IRQ, 1, RF_ACTIVE | RF_OPTIONAL },
 	{ SYS_RES_IRQ, 2, RF_ACTIVE },
 	{ SYS_RES_IRQ, 3, RF_ACTIVE },
 	RESOURCE_SPEC_END
 };
 
 MALLOC_DEFINE(M_SMMU, "SMMU", SMMU_DEVSTR);
 
 #define	dprintf(fmt, ...)
 
 struct smmu_event {
 	int ident;
 	char *str;
 	char *msg;
 };
 
 static struct smmu_event events[] = {
 	{ 0x01, "F_UUT",
 		"Unsupported Upstream Transaction."},
 	{ 0x02, "C_BAD_STREAMID",
 		"Transaction StreamID out of range."},
 	{ 0x03, "F_STE_FETCH",
 		"Fetch of STE caused external abort."},
 	{ 0x04, "C_BAD_STE",
 		"Used STE invalid."},
 	{ 0x05, "F_BAD_ATS_TREQ",
 		"Address Translation Request disallowed for a StreamID "
 		"and a PCIe ATS Translation Request received."},
 	{ 0x06, "F_STREAM_DISABLED",
 		"The STE of a transaction marks non-substream transactions "
 		"disabled."},
 	{ 0x07, "F_TRANSL_FORBIDDEN",
 		"An incoming PCIe transaction is marked Translated but "
 		"SMMU bypass is disallowed for this StreamID."},
 	{ 0x08, "C_BAD_SUBSTREAMID",
 		"Incoming SubstreamID present, but configuration is invalid."},
 	{ 0x09, "F_CD_FETCH",
 		"Fetch of CD caused external abort."},
 	{ 0x0a, "C_BAD_CD",
 		"Fetched CD invalid."},
 	{ 0x0b, "F_WALK_EABT",
 		"An external abort occurred fetching (or updating) "
 		"a translation table descriptor."},
 	{ 0x10, "F_TRANSLATION",
 		"Translation fault."},
 	{ 0x11, "F_ADDR_SIZE",
 		"Address Size fault."},
 	{ 0x12, "F_ACCESS",
 		"Access flag fault due to AF == 0 in a page or block TTD."},
 	{ 0x13, "F_PERMISSION",
 		"Permission fault occurred on page access."},
 	{ 0x20, "F_TLB_CONFLICT",
 		"A TLB conflict occurred because of the transaction."},
 	{ 0x21, "F_CFG_CONFLICT",
 		"A configuration cache conflict occurred due to "
 		"the transaction."},
 	{ 0x24, "E_PAGE_REQUEST",
 		"Speculative page request hint."},
 	{ 0x25, "F_VMS_FETCH",
 		"Fetch of VMS caused external abort."},
 	{ 0, NULL, NULL },
 };
 
 static int
 smmu_q_has_space(struct smmu_queue *q)
 {
 
 	/*
 	 * See 6.3.27 SMMU_CMDQ_PROD
 	 *
 	 * There is space in the queue for additional commands if:
 	 *  SMMU_CMDQ_CONS.RD != SMMU_CMDQ_PROD.WR ||
 	 *  SMMU_CMDQ_CONS.RD_WRAP == SMMU_CMDQ_PROD.WR_WRAP
 	 */
 
 	if (Q_IDX(q, q->lc.cons) != Q_IDX(q, q->lc.prod) ||
 	    Q_WRP(q, q->lc.cons) == Q_WRP(q, q->lc.prod))
 		return (1);
 
 	return (0);
 }
 
 static int
 smmu_q_empty(struct smmu_queue *q)
 {
 
 	if (Q_IDX(q, q->lc.cons) == Q_IDX(q, q->lc.prod) &&
 	    Q_WRP(q, q->lc.cons) == Q_WRP(q, q->lc.prod))
 		return (1);
 
 	return (0);
 }
 
 static int __unused
 smmu_q_consumed(struct smmu_queue *q, uint32_t prod)
 {
 
 	if ((Q_WRP(q, q->lc.cons) == Q_WRP(q, prod)) &&
 	    (Q_IDX(q, q->lc.cons) >= Q_IDX(q, prod)))
 		return (1);
 
 	if ((Q_WRP(q, q->lc.cons) != Q_WRP(q, prod)) &&
 	    (Q_IDX(q, q->lc.cons) <= Q_IDX(q, prod)))
 		return (1);
 
 	return (0);
 }
 
 static uint32_t
 smmu_q_inc_cons(struct smmu_queue *q)
 {
 	uint32_t cons;
 	uint32_t val;
 
 	cons = (Q_WRP(q, q->lc.cons) | Q_IDX(q, q->lc.cons)) + 1;
 	val = (Q_OVF(q->lc.cons) | Q_WRP(q, cons) | Q_IDX(q, cons));
 
 	return (val);
 }
 
 static uint32_t
 smmu_q_inc_prod(struct smmu_queue *q)
 {
 	uint32_t prod;
 	uint32_t val;
 
 	prod = (Q_WRP(q, q->lc.prod) | Q_IDX(q, q->lc.prod)) + 1;
 	val = (Q_OVF(q->lc.prod) | Q_WRP(q, prod) | Q_IDX(q, prod));
 
 	return (val);
 }
 
 static int
 smmu_write_ack(struct smmu_softc *sc, uint32_t reg,
     uint32_t reg_ack, uint32_t val)
 {
 	uint32_t v;
 	int timeout;
 
 	timeout = 100000;
 
 	bus_write_4(sc->res[0], reg, val);
 
 	do {
 		v = bus_read_4(sc->res[0], reg_ack);
 		if (v == val)
 			break;
 	} while (timeout--);
 
 	if (timeout <= 0) {
 		device_printf(sc->dev, "Failed to write reg.\n");
 		return (-1);
 	}
 
 	return (0);
 }
 
 static int
 smmu_init_queue(struct smmu_softc *sc, struct smmu_queue *q,
     uint32_t prod_off, uint32_t cons_off, uint32_t dwords)
 {
 	int sz;
 
 	sz = (1 << q->size_log2) * dwords * 8;
 
 	/* Set up the command circular buffer */
 	q->vaddr = contigmalloc(sz, M_SMMU,
 	    M_WAITOK | M_ZERO, 0, (1ul << 48) - 1, SMMU_Q_ALIGN, 0);
 	if (q->vaddr == NULL) {
 		device_printf(sc->dev, "failed to allocate %d bytes\n", sz);
 		return (-1);
 	}
 
 	q->prod_off = prod_off;
 	q->cons_off = cons_off;
 	q->paddr = vtophys(q->vaddr);
 
 	q->base = CMDQ_BASE_RA | EVENTQ_BASE_WA | PRIQ_BASE_WA;
 	q->base |= q->paddr & Q_BASE_ADDR_M;
 	q->base |= q->size_log2 << Q_LOG2SIZE_S;
 
 	return (0);
 }
 
 static int
 smmu_init_queues(struct smmu_softc *sc)
 {
 	int err;
 
 	/* Command queue. */
 	err = smmu_init_queue(sc, &sc->cmdq,
 	    SMMU_CMDQ_PROD, SMMU_CMDQ_CONS, CMDQ_ENTRY_DWORDS);
 	if (err)
 		return (ENXIO);
 
 	/* Event queue. */
 	err = smmu_init_queue(sc, &sc->evtq,
 	    SMMU_EVENTQ_PROD, SMMU_EVENTQ_CONS, EVTQ_ENTRY_DWORDS);
 	if (err)
 		return (ENXIO);
 
 	if (!(sc->features & SMMU_FEATURE_PRI))
 		return (0);
 
 	/* PRI queue. */
 	err = smmu_init_queue(sc, &sc->priq,
 	    SMMU_PRIQ_PROD, SMMU_PRIQ_CONS, PRIQ_ENTRY_DWORDS);
 	if (err)
 		return (ENXIO);
 
 	return (0);
 }
 
 /*
  * Dump 2LVL or linear STE.
  */
 static void
 smmu_dump_ste(struct smmu_softc *sc, int sid)
 {
 	struct smmu_strtab *strtab;
 	struct l1_desc *l1_desc;
 	uint64_t *ste, *l1;
 	int i;
 
 	strtab = &sc->strtab;
 
 	if (sc->features & SMMU_FEATURE_2_LVL_STREAM_TABLE) {
 		i = sid >> STRTAB_SPLIT;
 		l1 = (void *)((uint64_t)strtab->vaddr +
 		    STRTAB_L1_DESC_DWORDS * 8 * i);
 		device_printf(sc->dev, "L1 ste == %lx\n", l1[0]);
 
 		l1_desc = &strtab->l1[i];
 		ste = l1_desc->va;
 		if (ste == NULL) /* L2 is not initialized */
 			return;
 	} else {
 		ste = (void *)((uint64_t)strtab->vaddr +
 		    sid * (STRTAB_STE_DWORDS << 3));
 	}
 
 	/* Dump L2 or linear STE. */
 	for (i = 0; i < STRTAB_STE_DWORDS; i++)
 		device_printf(sc->dev, "ste[%d] == %lx\n", i, ste[i]);
 }
 
 static void __unused
 smmu_dump_cd(struct smmu_softc *sc, struct smmu_cd *cd)
 {
 	uint64_t *vaddr;
 	int i;
 
 	device_printf(sc->dev, "%s\n", __func__);
 
 	vaddr = cd->vaddr;
 	for (i = 0; i < CD_DWORDS; i++)
 		device_printf(sc->dev, "cd[%d] == %lx\n", i, vaddr[i]);
 }
 
 static void
 smmu_evtq_dequeue(struct smmu_softc *sc, uint32_t *evt)
 {
 	struct smmu_queue *evtq;
 	void *entry_addr;
 
 	evtq = &sc->evtq;
 
 	evtq->lc.val = bus_read_8(sc->res[0], evtq->prod_off);
 	entry_addr = (void *)((uint64_t)evtq->vaddr +
 	    evtq->lc.cons * EVTQ_ENTRY_DWORDS * 8);
 	memcpy(evt, entry_addr, EVTQ_ENTRY_DWORDS * 8);
 	evtq->lc.cons = smmu_q_inc_cons(evtq);
 	bus_write_4(sc->res[0], evtq->cons_off, evtq->lc.cons);
 }
 
 static void
 smmu_print_event(struct smmu_softc *sc, uint32_t *evt)
 {
 	struct smmu_event *ev;
 	uintptr_t input_addr;
 	uint8_t event_id;
 	device_t dev;
 	int sid;
 	int i;
 
 	dev = sc->dev;
 
 	ev = NULL;
 	event_id = evt[0] & 0xff;
 	for (i = 0; events[i].ident != 0; i++) {
 		if (events[i].ident == event_id) {
 			ev = &events[i];
 			break;
 		}
 	}
 
 	sid = evt[1];
 	input_addr = evt[5];
 	input_addr <<= 32;
 	input_addr |= evt[4];
 
 	if (smmu_quirks_check(dev, sid, event_id, input_addr)) {
 		/* The event is known. Don't print anything. */
 		return;
 	}
 
 	if (ev) {
 		device_printf(sc->dev,
 		    "Event %s (%s) received.\n", ev->str, ev->msg);
 	} else
 		device_printf(sc->dev, "Event 0x%x received\n", event_id);
 
 	device_printf(sc->dev, "SID %x, Input Address: %jx\n",
 	    sid, input_addr);
 
 	for (i = 0; i < 8; i++)
 		device_printf(sc->dev, "evt[%d] %x\n", i, evt[i]);
 
 	smmu_dump_ste(sc, sid);
 }
 
 static void
 make_cmd(struct smmu_softc *sc, uint64_t *cmd,
     struct smmu_cmdq_entry *entry)
 {
 
 	memset(cmd, 0, CMDQ_ENTRY_DWORDS * 8);
 	cmd[0] = entry->opcode << CMD_QUEUE_OPCODE_S;
 
 	switch (entry->opcode) {
 	case CMD_TLBI_NH_VA:
 		cmd[0] |= (uint64_t)entry->tlbi.asid << TLBI_0_ASID_S;
 		cmd[1] = entry->tlbi.addr & TLBI_1_ADDR_M;
 		if (entry->tlbi.leaf) {
 			/*
 			 * Leaf flag means that only cached entries
 			 * for the last level of translation table walk
 			 * are required to be invalidated.
 			 */
 			cmd[1] |= TLBI_1_LEAF;
 		}
 		break;
 	case CMD_TLBI_NH_ASID:
 		cmd[0] |= (uint64_t)entry->tlbi.asid << TLBI_0_ASID_S;
 		break;
 	case CMD_TLBI_NSNH_ALL:
 	case CMD_TLBI_NH_ALL:
 	case CMD_TLBI_EL2_ALL:
 		break;
 	case CMD_CFGI_CD:
 		cmd[0] |= ((uint64_t)entry->cfgi.ssid << CFGI_0_SSID_S);
 		/* FALLTROUGH */
 	case CMD_CFGI_STE:
 		cmd[0] |= ((uint64_t)entry->cfgi.sid << CFGI_0_STE_SID_S);
 		cmd[1] |= ((uint64_t)entry->cfgi.leaf << CFGI_1_LEAF_S);
 		break;
 	case CMD_CFGI_STE_RANGE:
 		cmd[1] = (31 << CFGI_1_STE_RANGE_S);
 		break;
 	case CMD_SYNC:
 		cmd[0] |= SYNC_0_MSH_IS | SYNC_0_MSIATTR_OIWB;
 		if (entry->sync.msiaddr) {
 			cmd[0] |= SYNC_0_CS_SIG_IRQ;
 			cmd[1] |= (entry->sync.msiaddr & SYNC_1_MSIADDRESS_M);
 		} else
 			cmd[0] |= SYNC_0_CS_SIG_SEV;
 		break;
 	case CMD_PREFETCH_CONFIG:
 		cmd[0] |= ((uint64_t)entry->prefetch.sid << PREFETCH_0_SID_S);
 		break;
 	};
 }
 
 static void
 smmu_cmdq_enqueue_cmd(struct smmu_softc *sc, struct smmu_cmdq_entry *entry)
 {
 	uint64_t cmd[CMDQ_ENTRY_DWORDS];
 	struct smmu_queue *cmdq;
 	void *entry_addr;
 
 	cmdq = &sc->cmdq;
 
 	make_cmd(sc, cmd, entry);
 
 	SMMU_LOCK(sc);
 
 	/* Ensure that a space is available. */
 	do {
 		cmdq->lc.cons = bus_read_4(sc->res[0], cmdq->cons_off);
 	} while (smmu_q_has_space(cmdq) == 0);
 
 	/* Write the command to the current prod entry. */
 	entry_addr = (void *)((uint64_t)cmdq->vaddr +
 	    Q_IDX(cmdq, cmdq->lc.prod) * CMDQ_ENTRY_DWORDS * 8);
 	memcpy(entry_addr, cmd, CMDQ_ENTRY_DWORDS * 8);
 
 	/* Increment prod index. */
 	cmdq->lc.prod = smmu_q_inc_prod(cmdq);
 	bus_write_4(sc->res[0], cmdq->prod_off, cmdq->lc.prod);
 
 	SMMU_UNLOCK(sc);
 }
 
 static void __unused
 smmu_poll_until_consumed(struct smmu_softc *sc, struct smmu_queue *q)
 {
 
 	while (1) {
 		q->lc.val = bus_read_8(sc->res[0], q->prod_off);
 		if (smmu_q_empty(q))
 			break;
 		cpu_spinwait();
 	}
 }
 
 static int
 smmu_sync(struct smmu_softc *sc)
 {
 	struct smmu_cmdq_entry cmd;
 	struct smmu_queue *q;
 	uint32_t *base;
 	int timeout;
 	int prod;
 
 	q = &sc->cmdq;
 	prod = q->lc.prod;
 
 	/* Enqueue sync command. */
 	cmd.opcode = CMD_SYNC;
 	cmd.sync.msiaddr = q->paddr + Q_IDX(q, prod) * CMDQ_ENTRY_DWORDS * 8;
 	smmu_cmdq_enqueue_cmd(sc, &cmd);
 
 	/* Wait for the sync completion. */
 	base = (void *)((uint64_t)q->vaddr +
 	    Q_IDX(q, prod) * CMDQ_ENTRY_DWORDS * 8);
 
 	/*
 	 * It takes around 200 loops (6 instructions each)
 	 * on Neoverse N1 to complete the sync.
 	 */
 	timeout = 10000;
 
 	do {
 		if (*base == 0) {
 			/* MSI write completed. */
 			break;
 		}
 		cpu_spinwait();
 	} while (timeout--);
 
 	if (timeout < 0)
 		device_printf(sc->dev, "Failed to sync\n");
 
 	return (0);
 }
 
 static int
 smmu_sync_cd(struct smmu_softc *sc, int sid, int ssid, bool leaf)
 {
 	struct smmu_cmdq_entry cmd;
 
 	cmd.opcode = CMD_CFGI_CD;
 	cmd.cfgi.sid = sid;
 	cmd.cfgi.ssid = ssid;
 	cmd.cfgi.leaf = leaf;
 	smmu_cmdq_enqueue_cmd(sc, &cmd);
 
 	return (0);
 }
 
 static void
 smmu_invalidate_all_sid(struct smmu_softc *sc)
 {
 	struct smmu_cmdq_entry cmd;
 
 	/* Invalidate cached config */
 	cmd.opcode = CMD_CFGI_STE_RANGE;
 	smmu_cmdq_enqueue_cmd(sc, &cmd);
 	smmu_sync(sc);
 }
 
 static void
 smmu_tlbi_all(struct smmu_softc *sc)
 {
 	struct smmu_cmdq_entry cmd;
 
 	/* Invalidate entire TLB */
 	cmd.opcode = CMD_TLBI_NSNH_ALL;
 	smmu_cmdq_enqueue_cmd(sc, &cmd);
 	smmu_sync(sc);
 }
 
 static void
 smmu_tlbi_asid(struct smmu_softc *sc, uint16_t asid)
 {
 	struct smmu_cmdq_entry cmd;
 
 	/* Invalidate TLB for an ASID. */
 	cmd.opcode = CMD_TLBI_NH_ASID;
 	cmd.tlbi.asid = asid;
 	smmu_cmdq_enqueue_cmd(sc, &cmd);
 	smmu_sync(sc);
 }
 
 static void
 smmu_tlbi_va(struct smmu_softc *sc, vm_offset_t va, uint16_t asid)
 {
 	struct smmu_cmdq_entry cmd;
 
 	/* Invalidate specific range */
 	cmd.opcode = CMD_TLBI_NH_VA;
 	cmd.tlbi.asid = asid;
 	cmd.tlbi.vmid = 0;
 	cmd.tlbi.leaf = true; /* We change only L3. */
 	cmd.tlbi.addr = va;
 	smmu_cmdq_enqueue_cmd(sc, &cmd);
 }
 
 static void
 smmu_invalidate_sid(struct smmu_softc *sc, uint32_t sid)
 {
 	struct smmu_cmdq_entry cmd;
 
 	/* Invalidate cached config */
 	cmd.opcode = CMD_CFGI_STE;
 	cmd.cfgi.sid = sid;
 	smmu_cmdq_enqueue_cmd(sc, &cmd);
 	smmu_sync(sc);
 }
 
 static void
 smmu_prefetch_sid(struct smmu_softc *sc, uint32_t sid)
 {
 	struct smmu_cmdq_entry cmd;
 
 	cmd.opcode = CMD_PREFETCH_CONFIG;
 	cmd.prefetch.sid = sid;
 	smmu_cmdq_enqueue_cmd(sc, &cmd);
 	smmu_sync(sc);
 }
 
 /*
  * Init STE in bypass mode. Traffic is not translated for the sid.
  */
 static void
 smmu_init_ste_bypass(struct smmu_softc *sc, uint32_t sid, uint64_t *ste)
 {
 	uint64_t val;
 
 	val = STE0_VALID | STE0_CONFIG_BYPASS;
 
 	ste[1] = STE1_SHCFG_INCOMING | STE1_EATS_FULLATS;
 	ste[2] = 0;
 	ste[3] = 0;
 	ste[4] = 0;
 	ste[5] = 0;
 	ste[6] = 0;
 	ste[7] = 0;
 
 	smmu_invalidate_sid(sc, sid);
 	ste[0] = val;
 	dsb(sy);
 	smmu_invalidate_sid(sc, sid);
 
 	smmu_prefetch_sid(sc, sid);
 }
 
 /*
  * Enable Stage1 (S1) translation for the sid.
  */
 static int
 smmu_init_ste_s1(struct smmu_softc *sc, struct smmu_cd *cd,
     uint32_t sid, uint64_t *ste)
 {
 	uint64_t val;
 
 	val = STE0_VALID;
 
 	/* S1 */
 	ste[1] = STE1_EATS_FULLATS	|
 		 STE1_S1CSH_IS		|
 		 STE1_S1CIR_WBRA	|
 		 STE1_S1COR_WBRA	|
 		 STE1_STRW_NS_EL1;
 	ste[2] = 0;
 	ste[3] = 0;
 	ste[4] = 0;
 	ste[5] = 0;
 	ste[6] = 0;
 	ste[7] = 0;
 
 	if (sc->features & SMMU_FEATURE_STALL &&
 	    ((sc->features & SMMU_FEATURE_STALL_FORCE) == 0))
 		ste[1] |= STE1_S1STALLD;
 
 	/* Configure STE */
 	val |= (cd->paddr & STE0_S1CONTEXTPTR_M);
 	val |= STE0_CONFIG_S1_TRANS;
 
 	smmu_invalidate_sid(sc, sid);
 
 	/* The STE[0] has to be written in a single blast, last of all. */
 	ste[0] = val;
 	dsb(sy);
 
 	smmu_invalidate_sid(sc, sid);
 	smmu_sync_cd(sc, sid, 0, true);
 	smmu_invalidate_sid(sc, sid);
 
 	/* The sid will be used soon most likely. */
 	smmu_prefetch_sid(sc, sid);
 
 	return (0);
 }
 
 static uint64_t *
 smmu_get_ste_addr(struct smmu_softc *sc, int sid)
 {
 	struct smmu_strtab *strtab;
 	struct l1_desc *l1_desc;
 	uint64_t *addr;
 
 	strtab = &sc->strtab;
 
 	if (sc->features & SMMU_FEATURE_2_LVL_STREAM_TABLE) {
 		l1_desc = &strtab->l1[sid >> STRTAB_SPLIT];
 		addr = l1_desc->va;
 		addr += (sid & ((1 << STRTAB_SPLIT) - 1)) * STRTAB_STE_DWORDS;
 	} else {
 		addr = (void *)((uint64_t)strtab->vaddr +
 		    STRTAB_STE_DWORDS * 8 * sid);
 	};
 
 	return (addr);
 }
 
 static int
 smmu_init_ste(struct smmu_softc *sc, struct smmu_cd *cd, int sid, bool bypass)
 {
 	uint64_t *addr;
 
 	addr = smmu_get_ste_addr(sc, sid);
 
 	if (bypass)
 		smmu_init_ste_bypass(sc, sid, addr);
 	else
 		smmu_init_ste_s1(sc, cd, sid, addr);
 
 	smmu_sync(sc);
 
 	return (0);
 }
 
 static void
 smmu_deinit_ste(struct smmu_softc *sc, int sid)
 {
 	uint64_t *ste;
 
 	ste = smmu_get_ste_addr(sc, sid);
 	ste[0] = 0;
 
 	smmu_invalidate_sid(sc, sid);
 	smmu_sync_cd(sc, sid, 0, true);
 	smmu_invalidate_sid(sc, sid);
 
 	smmu_sync(sc);
 }
 
 static int
 smmu_init_cd(struct smmu_softc *sc, struct smmu_domain *domain)
 {
 	vm_paddr_t paddr;
 	uint64_t *ptr;
 	uint64_t val;
 	vm_size_t size;
 	struct smmu_cd *cd;
 	struct smmu_pmap *p;
 
 	size = 1 * (CD_DWORDS << 3);
 
 	p = &domain->p;
 	cd = domain->cd = malloc(sizeof(struct smmu_cd),
 	    M_SMMU, M_WAITOK | M_ZERO);
 
 	cd->vaddr = contigmalloc(size, M_SMMU,
 	    M_WAITOK | M_ZERO,	/* flags */
 	    0,			/* low */
 	    (1ul << 40) - 1,	/* high */
 	    size,		/* alignment */
 	    0);			/* boundary */
 	if (cd->vaddr == NULL) {
 		device_printf(sc->dev, "Failed to allocate CD\n");
 		return (ENXIO);
 	}
 
-	cd->size = size;
 	cd->paddr = vtophys(cd->vaddr);
 
 	ptr = cd->vaddr;
 
 	val = CD0_VALID;
 	val |= CD0_AA64;
 	val |= CD0_R;
 	val |= CD0_A;
 	val |= CD0_ASET;
 	val |= (uint64_t)domain->asid << CD0_ASID_S;
 	val |= CD0_TG0_4KB;
 	val |= CD0_EPD1; /* Disable TT1 */
 	val |= ((64 - sc->ias) << CD0_T0SZ_S);
 	val |= CD0_IPS_48BITS;
 
 	paddr = p->sp_l0_paddr & CD1_TTB0_M;
 	KASSERT(paddr == p->sp_l0_paddr, ("bad allocation 1"));
 
 	ptr[1] = paddr;
 	ptr[2] = 0;
 	ptr[3] = MAIR_ATTR(MAIR_DEVICE_nGnRnE, VM_MEMATTR_DEVICE)	|
 		 MAIR_ATTR(MAIR_NORMAL_NC, VM_MEMATTR_UNCACHEABLE)	|
 		 MAIR_ATTR(MAIR_NORMAL_WB, VM_MEMATTR_WRITE_BACK)	|
 		 MAIR_ATTR(MAIR_NORMAL_WT, VM_MEMATTR_WRITE_THROUGH);
 
 	/* Install the CD. */
 	ptr[0] = val;
 
 	return (0);
 }
 
 static int
 smmu_init_strtab_linear(struct smmu_softc *sc)
 {
 	struct smmu_strtab *strtab;
 	vm_paddr_t base;
 	uint32_t size;
 	uint64_t reg;
 
 	strtab = &sc->strtab;
 	strtab->num_l1_entries = (1 << sc->sid_bits);
 
 	size = strtab->num_l1_entries * (STRTAB_STE_DWORDS << 3);
 
 	if (bootverbose)
 		device_printf(sc->dev,
 		    "%s: linear strtab size %d, num_l1_entries %d\n",
 		    __func__, size, strtab->num_l1_entries);
 
 	strtab->vaddr = contigmalloc(size, M_SMMU,
 	    M_WAITOK | M_ZERO,	/* flags */
 	    0,			/* low */
 	    (1ul << 48) - 1,	/* high */
 	    size,		/* alignment */
 	    0);			/* boundary */
 	if (strtab->vaddr == NULL) {
 		device_printf(sc->dev, "failed to allocate strtab\n");
 		return (ENXIO);
 	}
 
 	reg = STRTAB_BASE_CFG_FMT_LINEAR;
 	reg |= sc->sid_bits << STRTAB_BASE_CFG_LOG2SIZE_S;
 	strtab->base_cfg = (uint32_t)reg;
 
 	base = vtophys(strtab->vaddr);
 
 	reg = base & STRTAB_BASE_ADDR_M;
 	KASSERT(reg == base, ("bad allocation 2"));
 	reg |= STRTAB_BASE_RA;
 	strtab->base = reg;
 
 	return (0);
 }
 
 static int
 smmu_init_strtab_2lvl(struct smmu_softc *sc)
 {
 	struct smmu_strtab *strtab;
 	vm_paddr_t base;
 	uint64_t reg_base;
 	uint32_t l1size;
 	uint32_t size;
 	uint32_t reg;
 	int sz;
 
 	strtab = &sc->strtab;
 
 	size = STRTAB_L1_SZ_SHIFT - (ilog2(STRTAB_L1_DESC_DWORDS) + 3);
 	size = min(size, sc->sid_bits - STRTAB_SPLIT);
 	strtab->num_l1_entries = (1 << size);
 	size += STRTAB_SPLIT;
 
 	l1size = strtab->num_l1_entries * (STRTAB_L1_DESC_DWORDS << 3);
 
 	if (bootverbose)
 		device_printf(sc->dev,
 		    "%s: size %d, l1 entries %d, l1size %d\n",
 		    __func__, size, strtab->num_l1_entries, l1size);
 
 	strtab->vaddr = contigmalloc(l1size, M_SMMU,
 	    M_WAITOK | M_ZERO,	/* flags */
 	    0,			/* low */
 	    (1ul << 48) - 1,	/* high */
 	    l1size,		/* alignment */
 	    0);			/* boundary */
 	if (strtab->vaddr == NULL) {
 		device_printf(sc->dev, "Failed to allocate 2lvl strtab.\n");
 		return (ENOMEM);
 	}
 
 	sz = strtab->num_l1_entries * sizeof(struct l1_desc);
 
 	strtab->l1 = malloc(sz, M_SMMU, M_WAITOK | M_ZERO);
 	if (strtab->l1 == NULL) {
-		contigfree(strtab->vaddr, l1size, M_SMMU);
+		free(strtab->vaddr, M_SMMU);
 		return (ENOMEM);
 	}
 
 	reg = STRTAB_BASE_CFG_FMT_2LVL;
 	reg |= size << STRTAB_BASE_CFG_LOG2SIZE_S;
 	reg |= STRTAB_SPLIT << STRTAB_BASE_CFG_SPLIT_S;
 	strtab->base_cfg = (uint32_t)reg;
 
 	base = vtophys(strtab->vaddr);
 
 	reg_base = base & STRTAB_BASE_ADDR_M;
 	KASSERT(reg_base == base, ("bad allocation 3"));
 	reg_base |= STRTAB_BASE_RA;
 	strtab->base = reg_base;
 
 	return (0);
 }
 
 static int
 smmu_init_strtab(struct smmu_softc *sc)
 {
 	int error;
 
 	if (sc->features & SMMU_FEATURE_2_LVL_STREAM_TABLE)
 		error = smmu_init_strtab_2lvl(sc);
 	else
 		error = smmu_init_strtab_linear(sc);
 
 	return (error);
 }
 
 static int
 smmu_init_l1_entry(struct smmu_softc *sc, int sid)
 {
 	struct smmu_strtab *strtab;
 	struct l1_desc *l1_desc;
 	uint64_t *addr;
 	uint64_t val;
 	size_t size;
 	int i;
 
 	strtab = &sc->strtab;
 	l1_desc = &strtab->l1[sid >> STRTAB_SPLIT];
 	if (l1_desc->va) {
 		/* Already allocated. */
 		return (0);
 	}
 
 	size = 1 << (STRTAB_SPLIT + ilog2(STRTAB_STE_DWORDS) + 3);
 
 	l1_desc->span = STRTAB_SPLIT + 1;
-	l1_desc->size = size;
 	l1_desc->va = contigmalloc(size, M_SMMU,
 	    M_WAITOK | M_ZERO,	/* flags */
 	    0,			/* low */
 	    (1ul << 48) - 1,	/* high */
 	    size,		/* alignment */
 	    0);			/* boundary */
 	if (l1_desc->va == NULL) {
 		device_printf(sc->dev, "failed to allocate l2 entry\n");
 		return (ENXIO);
 	}
 
 	l1_desc->pa = vtophys(l1_desc->va);
 
 	i = sid >> STRTAB_SPLIT;
 	addr = (void *)((uint64_t)strtab->vaddr +
 	    STRTAB_L1_DESC_DWORDS * 8 * i);
 
 	/* Install the L1 entry. */
 	val = l1_desc->pa & STRTAB_L1_DESC_L2PTR_M;
 	KASSERT(val == l1_desc->pa, ("bad allocation 4"));
 	val |= l1_desc->span;
 	*addr = val;
 
 	return (0);
 }
 
 static void __unused
 smmu_deinit_l1_entry(struct smmu_softc *sc, int sid)
 {
 	struct smmu_strtab *strtab;
 	struct l1_desc *l1_desc;
 	uint64_t *addr;
 	int i;
 
 	strtab = &sc->strtab;
 
 	i = sid >> STRTAB_SPLIT;
 	addr = (void *)((uint64_t)strtab->vaddr +
 	    STRTAB_L1_DESC_DWORDS * 8 * i);
 	*addr = 0;
 
 	l1_desc = &strtab->l1[sid >> STRTAB_SPLIT];
-	contigfree(l1_desc->va, l1_desc->size, M_SMMU);
+	free(l1_desc->va, M_SMMU);
 }
 
 static int
 smmu_disable(struct smmu_softc *sc)
 {
 	uint32_t reg;
 	int error;
 
 	/* Disable SMMU */
 	reg = bus_read_4(sc->res[0], SMMU_CR0);
 	reg &= ~CR0_SMMUEN;
 	error = smmu_write_ack(sc, SMMU_CR0, SMMU_CR0ACK, reg);
 	if (error)
 		device_printf(sc->dev, "Could not disable SMMU.\n");
 
 	return (0);
 }
 
 static int
 smmu_event_intr(void *arg)
 {
 	uint32_t evt[EVTQ_ENTRY_DWORDS * 2];
 	struct smmu_softc *sc;
 
 	sc = arg;
 
 	do {
 		smmu_evtq_dequeue(sc, evt);
 		smmu_print_event(sc, evt);
 	} while (!smmu_q_empty(&sc->evtq));
 
 	return (FILTER_HANDLED);
 }
 
 static int __unused
 smmu_sync_intr(void *arg)
 {
 	struct smmu_softc *sc;
 
 	sc = arg;
 
 	device_printf(sc->dev, "%s\n", __func__);
 
 	return (FILTER_HANDLED);
 }
 
 static int
 smmu_gerr_intr(void *arg)
 {
 	struct smmu_softc *sc;
 
 	sc = arg;
 
 	device_printf(sc->dev, "SMMU Global Error\n");
 
 	return (FILTER_HANDLED);
 }
 
 static int
 smmu_enable_interrupts(struct smmu_softc *sc)
 {
 	uint32_t reg;
 	int error;
 
 	/* Disable MSI. */
 	bus_write_8(sc->res[0], SMMU_GERROR_IRQ_CFG0, 0);
 	bus_write_4(sc->res[0], SMMU_GERROR_IRQ_CFG1, 0);
 	bus_write_4(sc->res[0], SMMU_GERROR_IRQ_CFG2, 0);
 
 	bus_write_8(sc->res[0], SMMU_EVENTQ_IRQ_CFG0, 0);
 	bus_write_4(sc->res[0], SMMU_EVENTQ_IRQ_CFG1, 0);
 	bus_write_4(sc->res[0], SMMU_EVENTQ_IRQ_CFG2, 0);
 
 	if (sc->features & CR0_PRIQEN) {
 		bus_write_8(sc->res[0], SMMU_PRIQ_IRQ_CFG0, 0);
 		bus_write_4(sc->res[0], SMMU_PRIQ_IRQ_CFG1, 0);
 		bus_write_4(sc->res[0], SMMU_PRIQ_IRQ_CFG2, 0);
 	}
 
 	/* Disable any interrupts. */
 	error = smmu_write_ack(sc, SMMU_IRQ_CTRL, SMMU_IRQ_CTRLACK, 0);
 	if (error) {
 		device_printf(sc->dev, "Could not disable interrupts.\n");
 		return (ENXIO);
 	}
 
 	/* Enable interrupts. */
 	reg = IRQ_CTRL_EVENTQ_IRQEN | IRQ_CTRL_GERROR_IRQEN;
 	if (sc->features & SMMU_FEATURE_PRI)
 		reg |= IRQ_CTRL_PRIQ_IRQEN;
 
 	error = smmu_write_ack(sc, SMMU_IRQ_CTRL, SMMU_IRQ_CTRLACK, reg);
 	if (error) {
 		device_printf(sc->dev, "Could not enable interrupts.\n");
 		return (ENXIO);
 	}
 
 	return (0);
 }
 
 #ifdef DEV_ACPI
 static void
 smmu_configure_intr(struct smmu_softc *sc, struct resource *res)
 {
 	struct intr_map_data_acpi *ad;
 	struct intr_map_data *data;
 
 	data = rman_get_virtual(res);
 	KASSERT(data != NULL, ("data is NULL"));
 
 	if (data->type == INTR_MAP_DATA_ACPI) {
 		ad = (struct intr_map_data_acpi *)data;
 		ad->trig = INTR_TRIGGER_EDGE;
 		ad->pol = INTR_POLARITY_HIGH;
 	}
 }
 #endif
 
 static int
 smmu_setup_interrupts(struct smmu_softc *sc)
 {
 	device_t dev;
 	int error;
 
 	dev = sc->dev;
 
 #ifdef DEV_ACPI
 	/*
 	 * Configure SMMU interrupts as EDGE triggered manually
 	 * as ACPI tables carries no information for that.
 	 */
 	smmu_configure_intr(sc, sc->res[1]);
 	/* PRIQ is not in use. */
 	smmu_configure_intr(sc, sc->res[3]);
 	smmu_configure_intr(sc, sc->res[4]);
 #endif
 
 	error = bus_setup_intr(dev, sc->res[1], INTR_TYPE_MISC,
 	    smmu_event_intr, NULL, sc, &sc->intr_cookie[0]);
 	if (error) {
 		device_printf(dev, "Couldn't setup Event interrupt handler\n");
 		return (ENXIO);
 	}
 
 	error = bus_setup_intr(dev, sc->res[4], INTR_TYPE_MISC,
 	    smmu_gerr_intr, NULL, sc, &sc->intr_cookie[2]);
 	if (error) {
 		device_printf(dev, "Couldn't setup Gerr interrupt handler\n");
 		return (ENXIO);
 	}
 
 	return (0);
 }
 
 static int
 smmu_reset(struct smmu_softc *sc)
 {
 	struct smmu_cmdq_entry cmd;
 	struct smmu_strtab *strtab;
 	int error;
 	int reg;
 
 	reg = bus_read_4(sc->res[0], SMMU_CR0);
 
 	if (reg & CR0_SMMUEN)
 		device_printf(sc->dev,
 		    "%s: Warning: SMMU is enabled\n", __func__);
 
 	error = smmu_disable(sc);
 	if (error)
 		device_printf(sc->dev,
 		    "%s: Could not disable SMMU.\n", __func__);
 
 	if (smmu_enable_interrupts(sc) != 0) {
 		device_printf(sc->dev, "Could not enable interrupts.\n");
 		return (ENXIO);
 	}
 
 	reg = CR1_TABLE_SH_IS	|
 	      CR1_TABLE_OC_WBC	|
 	      CR1_TABLE_IC_WBC	|
 	      CR1_QUEUE_SH_IS	|
 	      CR1_QUEUE_OC_WBC	|
 	      CR1_QUEUE_IC_WBC;
 	bus_write_4(sc->res[0], SMMU_CR1, reg);
 
 	reg = CR2_PTM | CR2_RECINVSID | CR2_E2H;
 	bus_write_4(sc->res[0], SMMU_CR2, reg);
 
 	/* Stream table. */
 	strtab = &sc->strtab;
 	bus_write_8(sc->res[0], SMMU_STRTAB_BASE, strtab->base);
 	bus_write_4(sc->res[0], SMMU_STRTAB_BASE_CFG, strtab->base_cfg);
 
 	/* Command queue. */
 	bus_write_8(sc->res[0], SMMU_CMDQ_BASE, sc->cmdq.base);
 	bus_write_4(sc->res[0], SMMU_CMDQ_PROD, sc->cmdq.lc.prod);
 	bus_write_4(sc->res[0], SMMU_CMDQ_CONS, sc->cmdq.lc.cons);
 
 	reg = CR0_CMDQEN;
 	error = smmu_write_ack(sc, SMMU_CR0, SMMU_CR0ACK, reg);
 	if (error) {
 		device_printf(sc->dev, "Could not enable command queue\n");
 		return (ENXIO);
 	}
 
 	/* Invalidate cached configuration. */
 	smmu_invalidate_all_sid(sc);
 
 	if (sc->features & SMMU_FEATURE_HYP) {
 		cmd.opcode = CMD_TLBI_EL2_ALL;
 		smmu_cmdq_enqueue_cmd(sc, &cmd);
 	};
 
 	/* Invalidate TLB. */
 	smmu_tlbi_all(sc);
 
 	/* Event queue */
 	bus_write_8(sc->res[0], SMMU_EVENTQ_BASE, sc->evtq.base);
 	bus_write_4(sc->res[0], SMMU_EVENTQ_PROD, sc->evtq.lc.prod);
 	bus_write_4(sc->res[0], SMMU_EVENTQ_CONS, sc->evtq.lc.cons);
 
 	reg |= CR0_EVENTQEN;
 	error = smmu_write_ack(sc, SMMU_CR0, SMMU_CR0ACK, reg);
 	if (error) {
 		device_printf(sc->dev, "Could not enable event queue\n");
 		return (ENXIO);
 	}
 
 	if (sc->features & SMMU_FEATURE_PRI) {
 		/* PRI queue */
 		bus_write_8(sc->res[0], SMMU_PRIQ_BASE, sc->priq.base);
 		bus_write_4(sc->res[0], SMMU_PRIQ_PROD, sc->priq.lc.prod);
 		bus_write_4(sc->res[0], SMMU_PRIQ_CONS, sc->priq.lc.cons);
 
 		reg |= CR0_PRIQEN;
 		error = smmu_write_ack(sc, SMMU_CR0, SMMU_CR0ACK, reg);
 		if (error) {
 			device_printf(sc->dev, "Could not enable PRI queue\n");
 			return (ENXIO);
 		}
 	}
 
 	if (sc->features & SMMU_FEATURE_ATS) {
 		reg |= CR0_ATSCHK;
 		error = smmu_write_ack(sc, SMMU_CR0, SMMU_CR0ACK, reg);
 		if (error) {
 			device_printf(sc->dev, "Could not enable ATS check.\n");
 			return (ENXIO);
 		}
 	}
 
 	reg |= CR0_SMMUEN;
 	error = smmu_write_ack(sc, SMMU_CR0, SMMU_CR0ACK, reg);
 	if (error) {
 		device_printf(sc->dev, "Could not enable SMMU.\n");
 		return (ENXIO);
 	}
 
 	return (0);
 }
 
 static int
 smmu_check_features(struct smmu_softc *sc)
 {
 	uint32_t reg;
 	uint32_t val;
 
 	sc->features = 0;
 
 	reg = bus_read_4(sc->res[0], SMMU_IDR0);
 
 	if (reg & IDR0_ST_LVL_2) {
 		if (bootverbose)
 			device_printf(sc->dev,
 			    "2-level stream table supported.\n");
 		sc->features |= SMMU_FEATURE_2_LVL_STREAM_TABLE;
 	}
 
 	if (reg & IDR0_CD2L) {
 		if (bootverbose)
 			device_printf(sc->dev,
 			    "2-level CD table supported.\n");
 		sc->features |= SMMU_FEATURE_2_LVL_CD;
 	}
 
 	switch (reg & IDR0_TTENDIAN_M) {
 	case IDR0_TTENDIAN_MIXED:
 		if (bootverbose)
 			device_printf(sc->dev, "Mixed endianness supported.\n");
 		sc->features |= SMMU_FEATURE_TT_LE;
 		sc->features |= SMMU_FEATURE_TT_BE;
 		break;
 	case IDR0_TTENDIAN_LITTLE:
 		if (bootverbose)
 			device_printf(sc->dev,
 			    "Little endian supported only.\n");
 		sc->features |= SMMU_FEATURE_TT_LE;
 		break;
 	case IDR0_TTENDIAN_BIG:
 		if (bootverbose)
 			device_printf(sc->dev, "Big endian supported only.\n");
 		sc->features |= SMMU_FEATURE_TT_BE;
 		break;
 	default:
 		device_printf(sc->dev, "Unsupported endianness.\n");
 		return (ENXIO);
 	}
 
 	if (reg & IDR0_SEV)
 		sc->features |= SMMU_FEATURE_SEV;
 
 	if (reg & IDR0_MSI) {
 		if (bootverbose)
 			device_printf(sc->dev, "MSI feature present.\n");
 		sc->features |= SMMU_FEATURE_MSI;
 	}
 
 	if (reg & IDR0_HYP) {
 		if (bootverbose)
 			device_printf(sc->dev, "HYP feature present.\n");
 		sc->features |= SMMU_FEATURE_HYP;
 	}
 
 	if (reg & IDR0_ATS)
 		sc->features |= SMMU_FEATURE_ATS;
 
 	if (reg & IDR0_PRI)
 		sc->features |= SMMU_FEATURE_PRI;
 
 	switch (reg & IDR0_STALL_MODEL_M) {
 	case IDR0_STALL_MODEL_FORCE:
 		/* Stall is forced. */
 		sc->features |= SMMU_FEATURE_STALL_FORCE;
 		/* FALLTHROUGH */
 	case IDR0_STALL_MODEL_STALL:
 		sc->features |= SMMU_FEATURE_STALL;
 		break;
 	}
 
 	/* Grab translation stages supported. */
 	if (reg & IDR0_S1P) {
 		if (bootverbose)
 			device_printf(sc->dev,
 			    "Stage 1 translation supported.\n");
 		sc->features |= SMMU_FEATURE_S1P;
 	}
 	if (reg & IDR0_S2P) {
 		if (bootverbose)
 			device_printf(sc->dev,
 			    "Stage 2 translation supported.\n");
 		sc->features |= SMMU_FEATURE_S2P;
 	}
 
 	switch (reg & IDR0_TTF_M) {
 	case IDR0_TTF_ALL:
 	case IDR0_TTF_AA64:
 		sc->ias = 40;
 		break;
 	default:
 		device_printf(sc->dev, "No AArch64 table format support.\n");
 		return (ENXIO);
 	}
 
 	if (reg & IDR0_ASID16)
 		sc->asid_bits = 16;
 	else
 		sc->asid_bits = 8;
 
 	if (bootverbose)
 		device_printf(sc->dev, "ASID bits %d\n", sc->asid_bits);
 
 	if (reg & IDR0_VMID16)
 		sc->vmid_bits = 16;
 	else
 		sc->vmid_bits = 8;
 
 	reg = bus_read_4(sc->res[0], SMMU_IDR1);
 
 	if (reg & (IDR1_TABLES_PRESET | IDR1_QUEUES_PRESET | IDR1_REL)) {
 		device_printf(sc->dev,
 		    "Embedded implementations not supported by this driver.\n");
 		return (ENXIO);
 	}
 
 	val = (reg & IDR1_CMDQS_M) >> IDR1_CMDQS_S;
 	sc->cmdq.size_log2 = val;
 	if (bootverbose)
 		device_printf(sc->dev, "CMD queue bits %d\n", val);
 
 	val = (reg & IDR1_EVENTQS_M) >> IDR1_EVENTQS_S;
 	sc->evtq.size_log2 = val;
 	if (bootverbose)
 		device_printf(sc->dev, "EVENT queue bits %d\n", val);
 
 	if (sc->features & SMMU_FEATURE_PRI) {
 		val = (reg & IDR1_PRIQS_M) >> IDR1_PRIQS_S;
 		sc->priq.size_log2 = val;
 		if (bootverbose)
 			device_printf(sc->dev, "PRI queue bits %d\n", val);
 	}
 
 	sc->ssid_bits = (reg & IDR1_SSIDSIZE_M) >> IDR1_SSIDSIZE_S;
 	sc->sid_bits = (reg & IDR1_SIDSIZE_M) >> IDR1_SIDSIZE_S;
 
 	if (sc->sid_bits <= STRTAB_SPLIT)
 		sc->features &= ~SMMU_FEATURE_2_LVL_STREAM_TABLE;
 
 	if (bootverbose) {
 		device_printf(sc->dev, "SSID bits %d\n", sc->ssid_bits);
 		device_printf(sc->dev, "SID bits %d\n", sc->sid_bits);
 	}
 
 	/* IDR3 */
 	reg = bus_read_4(sc->res[0], SMMU_IDR3);
 	if (reg & IDR3_RIL)
 		sc->features |= SMMU_FEATURE_RANGE_INV;
 
 	/* IDR5 */
 	reg = bus_read_4(sc->res[0], SMMU_IDR5);
 
 	switch (reg & IDR5_OAS_M) {
 	case IDR5_OAS_32:
 		sc->oas = 32;
 		break;
 	case IDR5_OAS_36:
 		sc->oas = 36;
 		break;
 	case IDR5_OAS_40:
 		sc->oas = 40;
 		break;
 	case IDR5_OAS_42:
 		sc->oas = 42;
 		break;
 	case IDR5_OAS_44:
 		sc->oas = 44;
 		break;
 	case IDR5_OAS_48:
 		sc->oas = 48;
 		break;
 	case IDR5_OAS_52:
 		sc->oas = 52;
 		break;
 	}
 
 	sc->pgsizes = 0;
 	if (reg & IDR5_GRAN64K)
 		sc->pgsizes |= 64 * 1024;
 	if (reg & IDR5_GRAN16K)
 		sc->pgsizes |= 16 * 1024;
 	if (reg & IDR5_GRAN4K)
 		sc->pgsizes |= 4 * 1024;
 
 	if ((reg & IDR5_VAX_M) == IDR5_VAX_52)
 		sc->features |= SMMU_FEATURE_VAX;
 
 	return (0);
 }
 
 static void
 smmu_init_asids(struct smmu_softc *sc)
 {
 
 	sc->asid_set_size = (1 << sc->asid_bits);
 	sc->asid_set = bit_alloc(sc->asid_set_size, M_SMMU, M_WAITOK);
 	mtx_init(&sc->asid_set_mutex, "asid set", NULL, MTX_SPIN);
 }
 
 static int
 smmu_asid_alloc(struct smmu_softc *sc, int *new_asid)
 {
 
 	mtx_lock_spin(&sc->asid_set_mutex);
 	bit_ffc(sc->asid_set, sc->asid_set_size, new_asid);
 	if (*new_asid == -1) {
 		mtx_unlock_spin(&sc->asid_set_mutex);
 		return (ENOMEM);
 	}
 	bit_set(sc->asid_set, *new_asid);
 	mtx_unlock_spin(&sc->asid_set_mutex);
 
 	return (0);
 }
 
 static void
 smmu_asid_free(struct smmu_softc *sc, int asid)
 {
 
 	mtx_lock_spin(&sc->asid_set_mutex);
 	bit_clear(sc->asid_set, asid);
 	mtx_unlock_spin(&sc->asid_set_mutex);
 }
 
 /*
  * Device interface.
  */
 int
 smmu_attach(device_t dev)
 {
 	struct smmu_softc *sc;
 	int error;
 
 	sc = device_get_softc(dev);
 	sc->dev = dev;
 
 	mtx_init(&sc->sc_mtx, device_get_nameunit(sc->dev), "smmu", MTX_DEF);
 
 	error = smmu_setup_interrupts(sc);
 	if (error) {
 		bus_release_resources(dev, smmu_spec, sc->res);
 		return (ENXIO);
 	}
 
 	error = smmu_check_features(sc);
 	if (error) {
 		device_printf(dev, "Some features are required "
 		    "but not supported by hardware.\n");
 		return (ENXIO);
 	}
 
 	smmu_init_asids(sc);
 
 	error = smmu_init_queues(sc);
 	if (error) {
 		device_printf(dev, "Couldn't allocate queues.\n");
 		return (ENXIO);
 	}
 
 	error = smmu_init_strtab(sc);
 	if (error) {
 		device_printf(dev, "Couldn't allocate strtab.\n");
 		return (ENXIO);
 	}
 
 	error = smmu_reset(sc);
 	if (error) {
 		device_printf(dev, "Couldn't reset SMMU.\n");
 		return (ENXIO);
 	}
 
 	return (0);
 }
 
 int
 smmu_detach(device_t dev)
 {
 	struct smmu_softc *sc;
 
 	sc = device_get_softc(dev);
 
 	bus_release_resources(dev, smmu_spec, sc->res);
 
 	return (0);
 }
 
 static int
 smmu_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
 {
 	struct smmu_softc *sc;
 
 	sc = device_get_softc(dev);
 
 	device_printf(sc->dev, "%s\n", __func__);
 
 	return (ENOENT);
 }
 
 static int
 smmu_unmap(device_t dev, struct iommu_domain *iodom,
     vm_offset_t va, bus_size_t size)
 {
 	struct smmu_domain *domain;
 	struct smmu_softc *sc;
 	int err;
 	int i;
 
 	sc = device_get_softc(dev);
 
 	domain = (struct smmu_domain *)iodom;
 
 	err = 0;
 
 	dprintf("%s: %lx, %ld, domain %d\n", __func__, va, size, domain->asid);
 
 	for (i = 0; i < size; i += PAGE_SIZE) {
 		if (smmu_pmap_remove(&domain->p, va) == 0) {
 			/* pmap entry removed, invalidate TLB. */
 			smmu_tlbi_va(sc, va, domain->asid);
 		} else {
 			err = ENOENT;
 			break;
 		}
 		va += PAGE_SIZE;
 	}
 
 	smmu_sync(sc);
 
 	return (err);
 }
 
 static int
 smmu_map(device_t dev, struct iommu_domain *iodom,
     vm_offset_t va, vm_page_t *ma, vm_size_t size,
     vm_prot_t prot)
 {
 	struct smmu_domain *domain;
 	struct smmu_softc *sc;
 	vm_paddr_t pa;
 	int error;
 	int i;
 
 	sc = device_get_softc(dev);
 
 	domain = (struct smmu_domain *)iodom;
 
 	dprintf("%s: %lx -> %lx, %ld, domain %d\n", __func__, va, pa, size,
 	    domain->asid);
 
 	for (i = 0; size > 0; size -= PAGE_SIZE) {
 		pa = VM_PAGE_TO_PHYS(ma[i++]);
 		error = smmu_pmap_enter(&domain->p, va, pa, prot, 0);
 		if (error)
 			return (error);
 		smmu_tlbi_va(sc, va, domain->asid);
 		va += PAGE_SIZE;
 	}
 
 	smmu_sync(sc);
 
 	return (0);
 }
 
 static struct iommu_domain *
 smmu_domain_alloc(device_t dev, struct iommu_unit *iommu)
 {
 	struct iommu_domain *iodom;
 	struct smmu_domain *domain;
 	struct smmu_unit *unit;
 	struct smmu_softc *sc;
 	int error;
 	int new_asid;
 
 	sc = device_get_softc(dev);
 
 	unit = (struct smmu_unit *)iommu;
 
 	domain = malloc(sizeof(*domain), M_SMMU, M_WAITOK | M_ZERO);
 
 	error = smmu_asid_alloc(sc, &new_asid);
 	if (error) {
 		free(domain, M_SMMU);
 		device_printf(sc->dev,
 		    "Could not allocate ASID for a new domain.\n");
 		return (NULL);
 	}
 
 	domain->asid = (uint16_t)new_asid;
 
 	smmu_pmap_pinit(&domain->p);
 
 	error = smmu_init_cd(sc, domain);
 	if (error) {
 		free(domain, M_SMMU);
 		device_printf(sc->dev, "Could not initialize CD\n");
 		return (NULL);
 	}
 
 	smmu_tlbi_asid(sc, domain->asid);
 
 	LIST_INIT(&domain->ctx_list);
 
 	IOMMU_LOCK(iommu);
 	LIST_INSERT_HEAD(&unit->domain_list, domain, next);
 	IOMMU_UNLOCK(iommu);
 
 	iodom = &domain->iodom;
 
 	/*
 	 * Use 48-bit address space regardless of VAX bit
 	 * as we need 64k IOMMU_PAGE_SIZE for 52-bit space.
 	 */
 	iodom->end = MAXADDR_48BIT;
 
 	return (iodom);
 }
 
 static void
 smmu_domain_free(device_t dev, struct iommu_domain *iodom)
 {
 	struct smmu_domain *domain;
 	struct smmu_softc *sc;
 	struct smmu_cd *cd;
 
 	sc = device_get_softc(dev);
 
 	domain = (struct smmu_domain *)iodom;
 
 	LIST_REMOVE(domain, next);
 
 	cd = domain->cd;
 
 	smmu_pmap_remove_pages(&domain->p);
 	smmu_pmap_release(&domain->p);
 
 	smmu_tlbi_asid(sc, domain->asid);
 	smmu_asid_free(sc, domain->asid);
 
-	contigfree(cd->vaddr, cd->size, M_SMMU);
+	free(cd->vaddr, M_SMMU);
 	free(cd, M_SMMU);
 
 	free(domain, M_SMMU);
 }
 
 static int
 smmu_set_buswide(device_t dev, struct smmu_domain *domain,
     struct smmu_ctx *ctx)
 {
 	struct smmu_softc *sc;
 	int i;
 
 	sc = device_get_softc(dev);
 
 	for (i = 0; i < PCI_SLOTMAX; i++)
 		smmu_init_ste(sc, domain->cd, (ctx->sid | i), ctx->bypass);
 
 	return (0);
 }
 
 static int
 smmu_pci_get_sid(device_t child, u_int *xref0, u_int *sid0)
 {
 	struct pci_id_ofw_iommu pi;
 	int err;
 
 	err = pci_get_id(child, PCI_ID_OFW_IOMMU, (uintptr_t *)&pi);
 	if (err == 0) {
 		if (sid0)
 			*sid0 = pi.id;
 		if (xref0)
 			*xref0 = pi.xref;
 	}
 
 	return (err);
 }
 
 static struct iommu_ctx *
 smmu_ctx_alloc(device_t dev, struct iommu_domain *iodom, device_t child,
     bool disabled)
 {
 	struct smmu_domain *domain;
 	struct smmu_ctx *ctx;
 
 	domain = (struct smmu_domain *)iodom;
 
 	ctx = malloc(sizeof(struct smmu_ctx), M_SMMU, M_WAITOK | M_ZERO);
 	ctx->dev = child;
 	ctx->domain = domain;
 	if (disabled)
 		ctx->bypass = true;
 
 	IOMMU_DOMAIN_LOCK(iodom);
 	LIST_INSERT_HEAD(&domain->ctx_list, ctx, next);
 	IOMMU_DOMAIN_UNLOCK(iodom);
 
 	return (&ctx->ioctx);
 }
 
 static int
 smmu_ctx_init(device_t dev, struct iommu_ctx *ioctx)
 {
 	struct smmu_domain *domain;
 	struct iommu_domain *iodom;
 	struct smmu_softc *sc;
 	struct smmu_ctx *ctx;
 	devclass_t pci_class;
 	u_int sid;
 	int err;
 
 	ctx = (struct smmu_ctx *)ioctx;
 
 	sc = device_get_softc(dev);
 
 	domain = ctx->domain;
 	iodom = (struct iommu_domain *)domain;
 
 	pci_class = devclass_find("pci");
 	if (device_get_devclass(device_get_parent(ctx->dev)) == pci_class) {
 		err = smmu_pci_get_sid(ctx->dev, NULL, &sid);
 		if (err)
 			return (err);
 
 		ioctx->rid = pci_get_rid(dev);
 		ctx->sid = sid;
 		ctx->vendor = pci_get_vendor(ctx->dev);
 		ctx->device = pci_get_device(ctx->dev);
 	}
 
 	if (sc->features & SMMU_FEATURE_2_LVL_STREAM_TABLE) {
 		err = smmu_init_l1_entry(sc, ctx->sid);
 		if (err)
 			return (err);
 	}
 
 	/*
 	 * Neoverse N1 SDP:
 	 * 0x800 xhci
 	 * 0x700 re
 	 * 0x600 sata
 	 */
 
 	smmu_init_ste(sc, domain->cd, ctx->sid, ctx->bypass);
 
 	if (device_get_devclass(device_get_parent(ctx->dev)) == pci_class)
 		if (iommu_is_buswide_ctx(iodom->iommu, pci_get_bus(ctx->dev)))
 			smmu_set_buswide(dev, domain, ctx);
 
 	return (0);
 }
 
 static void
 smmu_ctx_free(device_t dev, struct iommu_ctx *ioctx)
 {
 	struct smmu_softc *sc;
 	struct smmu_ctx *ctx;
 
 	IOMMU_ASSERT_LOCKED(ioctx->domain->iommu);
 
 	sc = device_get_softc(dev);
 	ctx = (struct smmu_ctx *)ioctx;
 
 	smmu_deinit_ste(sc, ctx->sid);
 
 	LIST_REMOVE(ctx, next);
 
 	free(ctx, M_SMMU);
 }
 
 struct smmu_ctx *
 smmu_ctx_lookup_by_sid(device_t dev, u_int sid)
 {
 	struct smmu_softc *sc;
 	struct smmu_domain *domain;
 	struct smmu_unit *unit;
 	struct smmu_ctx *ctx;
 
 	sc = device_get_softc(dev);
 
 	unit = &sc->unit;
 
 	LIST_FOREACH(domain, &unit->domain_list, next) {
 		LIST_FOREACH(ctx, &domain->ctx_list, next) {
 			if (ctx->sid == sid)
 				return (ctx);
 		}
 	}
 
 	return (NULL);
 }
 
 static struct iommu_ctx *
 smmu_ctx_lookup(device_t dev, device_t child)
 {
 	struct iommu_unit *iommu __diagused;
 	struct smmu_softc *sc;
 	struct smmu_domain *domain;
 	struct smmu_unit *unit;
 	struct smmu_ctx *ctx;
 
 	sc = device_get_softc(dev);
 
 	unit = &sc->unit;
 	iommu = &unit->iommu;
 
 	IOMMU_ASSERT_LOCKED(iommu);
 
 	LIST_FOREACH(domain, &unit->domain_list, next) {
 		IOMMU_DOMAIN_LOCK(&domain->iodom);
 		LIST_FOREACH(ctx, &domain->ctx_list, next) {
 			if (ctx->dev == child) {
 				IOMMU_DOMAIN_UNLOCK(&domain->iodom);
 				return (&ctx->ioctx);
 			}
 		}
 		IOMMU_DOMAIN_UNLOCK(&domain->iodom);
 	}
 
 	return (NULL);
 }
 
 static int
 smmu_find(device_t dev, device_t child)
 {
 	struct smmu_softc *sc;
 	u_int xref;
 	int err;
 
 	sc = device_get_softc(dev);
 
 	err = smmu_pci_get_sid(child, &xref, NULL);
 	if (err)
 		return (ENOENT);
 
 	/* Check if xref is ours. */
 	if (xref != sc->xref)
 		return (EFAULT);
 
 	return (0);
 }
 
 #ifdef FDT
 static int
 smmu_ofw_md_data(device_t dev, struct iommu_ctx *ioctx, pcell_t *cells,
     int ncells)
 {
 	struct smmu_ctx *ctx;
 
 	ctx = (struct smmu_ctx *)ioctx;
 
 	if (ncells != 1)
 		return (-1);
 
 	ctx->sid = cells[0];
 
 	return (0);
 }
 #endif
 
 static device_method_t smmu_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_detach,	smmu_detach),
 
 	/* SMMU interface */
 	DEVMETHOD(iommu_find,		smmu_find),
 	DEVMETHOD(iommu_map,		smmu_map),
 	DEVMETHOD(iommu_unmap,		smmu_unmap),
 	DEVMETHOD(iommu_domain_alloc,	smmu_domain_alloc),
 	DEVMETHOD(iommu_domain_free,	smmu_domain_free),
 	DEVMETHOD(iommu_ctx_alloc,	smmu_ctx_alloc),
 	DEVMETHOD(iommu_ctx_init,	smmu_ctx_init),
 	DEVMETHOD(iommu_ctx_free,	smmu_ctx_free),
 	DEVMETHOD(iommu_ctx_lookup,	smmu_ctx_lookup),
 #ifdef FDT
 	DEVMETHOD(iommu_ofw_md_data,	smmu_ofw_md_data),
 #endif
 
 	/* Bus interface */
 	DEVMETHOD(bus_read_ivar,	smmu_read_ivar),
 
 	/* End */
 	DEVMETHOD_END
 };
 
 DEFINE_CLASS_0(smmu, smmu_driver, smmu_methods, sizeof(struct smmu_softc));
diff --git a/sys/arm64/iommu/smmuvar.h b/sys/arm64/iommu/smmuvar.h
index c32b17abc9bc..60fad8f87531 100644
--- a/sys/arm64/iommu/smmuvar.h
+++ b/sys/arm64/iommu/smmuvar.h
@@ -1,188 +1,186 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2019-2020 Ruslan Bukin <br@bsdpad.com>
  *
  * This software was developed by SRI International and the University of
  * Cambridge Computer Laboratory (Department of Computer Science and
  * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the
  * DARPA SSITH research programme.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef	_ARM64_IOMMU_SMMUVAR_H_
 #define	_ARM64_IOMMU_SMMUVAR_H_
 
 #include <arm64/iommu/iommu_pmap.h>
 
 #define	SMMU_DEVSTR		"ARM System Memory Management Unit"
 #define	SMMU_LOCK(_sc)		mtx_lock(&(_sc)->sc_mtx)
 #define	SMMU_UNLOCK(_sc)	mtx_unlock(&(_sc)->sc_mtx)
 
 DECLARE_CLASS(smmu_driver);
 
 struct smmu_unit {
 	struct iommu_unit		iommu;
 	LIST_HEAD(, smmu_domain)	domain_list;
 	LIST_ENTRY(smmu_unit)		next;
 	device_t			dev;
 	intptr_t			xref;
 };
 
 struct smmu_domain {
 	struct iommu_domain		iodom;
 	LIST_HEAD(, smmu_ctx)		ctx_list;
 	LIST_ENTRY(smmu_domain)	next;
 	u_int entries_cnt;
 	struct smmu_cd			*cd;
 	struct smmu_pmap		p;
 	uint16_t			asid;
 };
 
 struct smmu_ctx {
 	struct iommu_ctx		ioctx;
 	struct smmu_domain		*domain;
 	LIST_ENTRY(smmu_ctx)		next;
 	device_t			dev;
 	bool				bypass;
 	int				sid;
 	uint16_t			vendor;
 	uint16_t			device;
 };
 
 struct smmu_queue_local_copy {
 	union {
 		uint64_t val;
 		struct {
 			uint32_t prod;
 			uint32_t cons;
 		};
 	};
 };
 
 struct smmu_cd {
 	vm_paddr_t paddr;
-	vm_size_t size;
 	void *vaddr;
 };
 
 struct smmu_queue {
 	struct smmu_queue_local_copy lc;
 	vm_paddr_t paddr;
 	void *vaddr;
 	uint32_t prod_off;
 	uint32_t cons_off;
 	int size_log2;
 	uint64_t base;
 };
 
 struct smmu_cmdq_entry {
 	uint8_t opcode;
 	union {
 		struct {
 			uint16_t asid;
 			uint16_t vmid;
 			vm_offset_t addr;
 			bool leaf;
 		} tlbi;
 		struct {
 			uint32_t sid;
 			uint32_t ssid;
 			bool leaf;
 		} cfgi;
 		struct {
 			uint32_t sid;
 		} prefetch;
 		struct {
 			uint64_t msiaddr;
 		} sync;
 	};
 };
 
 struct l1_desc {
 	uint8_t		span;
-	size_t		size;
 	void		*va;
 	vm_paddr_t	pa;
 };
 
 struct smmu_strtab {
 	void		*vaddr;
 	uint64_t	base;
 	uint32_t	base_cfg;
 	uint32_t	num_l1_entries;
 	struct l1_desc	*l1;
 };
 
 struct smmu_softc {
 	device_t		dev;
 	struct resource		*res[5];
 	void			*intr_cookie[3];
 	uint32_t		ias; /* Intermediate Physical Address */
 	uint32_t		oas; /* Physical Address */
 	uint32_t		asid_bits;
 	uint32_t		vmid_bits;
 	uint32_t		sid_bits;
 	uint32_t		ssid_bits;
 	uint32_t		pgsizes;
 	uint32_t		features;
 #define	SMMU_FEATURE_2_LVL_STREAM_TABLE		(1 << 0)
 #define	SMMU_FEATURE_2_LVL_CD			(1 << 1)
 #define	SMMU_FEATURE_TT_LE			(1 << 2)
 #define	SMMU_FEATURE_TT_BE			(1 << 3)
 #define	SMMU_FEATURE_SEV			(1 << 4)
 #define	SMMU_FEATURE_MSI			(1 << 5)
 #define	SMMU_FEATURE_HYP			(1 << 6)
 #define	SMMU_FEATURE_ATS			(1 << 7)
 #define	SMMU_FEATURE_PRI			(1 << 8)
 #define	SMMU_FEATURE_STALL_FORCE		(1 << 9)
 #define	SMMU_FEATURE_STALL			(1 << 10)
 #define	SMMU_FEATURE_S1P			(1 << 11)
 #define	SMMU_FEATURE_S2P			(1 << 12)
 #define	SMMU_FEATURE_VAX			(1 << 13)
 #define	SMMU_FEATURE_COHERENCY			(1 << 14)
 #define	SMMU_FEATURE_RANGE_INV			(1 << 15)
 	struct smmu_queue cmdq;
 	struct smmu_queue evtq;
 	struct smmu_queue priq;
 	struct smmu_strtab strtab;
 	int				sync;
 	struct mtx			sc_mtx;
 	bitstr_t			*asid_set;
 	int				asid_set_size;
 	struct mtx			asid_set_mutex;
 	struct smmu_unit		unit;
 	uintptr_t			xref;
 };
 
 MALLOC_DECLARE(M_SMMU);
 
 /* Device methods */
 int smmu_attach(device_t dev);
 int smmu_detach(device_t dev);
 
 struct smmu_ctx *smmu_ctx_lookup_by_sid(device_t dev, u_int sid);
 bool smmu_quirks_check(device_t dev, u_int sid, uint8_t event_id,
     uintptr_t input_addr);
 
 #endif /* _ARM64_IOMMU_SMMUVAR_H_ */
diff --git a/sys/compat/x86bios/x86bios.c b/sys/compat/x86bios/x86bios.c
index 0eba97a59f5d..41b72080177c 100644
--- a/sys/compat/x86bios/x86bios.c
+++ b/sys/compat/x86bios/x86bios.c
@@ -1,862 +1,862 @@
 /*-
  * Copyright (c) 2009 Alex Keda <admin@lissyara.su>
  * Copyright (c) 2009-2010 Jung-uk Kim <jkim@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 AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 #include "opt_x86bios.h"
 
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 
 #include <contrib/x86emu/x86emu.h>
 #include <contrib/x86emu/x86emu_regs.h>
 #include <compat/x86bios/x86bios.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #ifdef __amd64__
 #define	X86BIOS_NATIVE_ARCH
 #endif
 #ifdef __i386__
 #define	X86BIOS_NATIVE_VM86
 #endif
 
 #define	X86BIOS_MEM_SIZE	0x00100000	/* 1M */
 
 #define	X86BIOS_TRACE(h, n, r)	do {					\
 	printf(__STRING(h)						\
 	    " (ax=0x%04x bx=0x%04x cx=0x%04x dx=0x%04x es=0x%04x di=0x%04x)\n",\
 	    (n), (r)->R_AX, (r)->R_BX, (r)->R_CX, (r)->R_DX,		\
 	    (r)->R_ES, (r)->R_DI);					\
 } while (0)
 
 static struct mtx x86bios_lock;
 
 static SYSCTL_NODE(_debug, OID_AUTO, x86bios, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL,
     "x86bios debugging");
 static int x86bios_trace_call;
 SYSCTL_INT(_debug_x86bios, OID_AUTO, call, CTLFLAG_RWTUN, &x86bios_trace_call, 0,
     "Trace far function calls");
 static int x86bios_trace_int;
 SYSCTL_INT(_debug_x86bios, OID_AUTO, int, CTLFLAG_RWTUN, &x86bios_trace_int, 0,
     "Trace software interrupt handlers");
 
 #ifdef X86BIOS_NATIVE_VM86
 
 #include <machine/vm86.h>
 #include <machine/vmparam.h>
 #include <machine/pc/bios.h>
 
 struct vm86context x86bios_vmc;
 
 static void
 x86bios_emu2vmf(struct x86emu_regs *regs, struct vm86frame *vmf)
 {
 
 	vmf->vmf_ds = regs->R_DS;
 	vmf->vmf_es = regs->R_ES;
 	vmf->vmf_ax = regs->R_AX;
 	vmf->vmf_bx = regs->R_BX;
 	vmf->vmf_cx = regs->R_CX;
 	vmf->vmf_dx = regs->R_DX;
 	vmf->vmf_bp = regs->R_BP;
 	vmf->vmf_si = regs->R_SI;
 	vmf->vmf_di = regs->R_DI;
 }
 
 static void
 x86bios_vmf2emu(struct vm86frame *vmf, struct x86emu_regs *regs)
 {
 
 	regs->R_DS = vmf->vmf_ds;
 	regs->R_ES = vmf->vmf_es;
 	regs->R_FLG = vmf->vmf_flags;
 	regs->R_AX = vmf->vmf_ax;
 	regs->R_BX = vmf->vmf_bx;
 	regs->R_CX = vmf->vmf_cx;
 	regs->R_DX = vmf->vmf_dx;
 	regs->R_BP = vmf->vmf_bp;
 	regs->R_SI = vmf->vmf_si;
 	regs->R_DI = vmf->vmf_di;
 }
 
 void *
 x86bios_alloc(uint32_t *offset, size_t size, int flags)
 {
 	void *vaddr;
 	u_int i;
 
 	if (offset == NULL || size == 0)
 		return (NULL);
 	vaddr = contigmalloc(size, M_DEVBUF, flags, 0, X86BIOS_MEM_SIZE,
 	    PAGE_SIZE, 0);
 	if (vaddr != NULL) {
 		*offset = vtophys(vaddr);
 		mtx_lock(&x86bios_lock);
 		for (i = 0; i < atop(round_page(size)); i++)
 			vm86_addpage(&x86bios_vmc, atop(*offset) + i,
 			    (vm_offset_t)vaddr + ptoa(i));
 		mtx_unlock(&x86bios_lock);
 	}
 
 	return (vaddr);
 }
 
 void
 x86bios_free(void *addr, size_t size)
 {
 	vm_paddr_t paddr;
 	int i, nfree;
 
 	if (addr == NULL || size == 0)
 		return;
 	paddr = vtophys(addr);
 	if (paddr >= X86BIOS_MEM_SIZE || (paddr & PAGE_MASK) != 0)
 		return;
 	mtx_lock(&x86bios_lock);
 	for (i = 0; i < x86bios_vmc.npages; i++)
 		if (x86bios_vmc.pmap[i].kva == (vm_offset_t)addr)
 			break;
 	if (i >= x86bios_vmc.npages) {
 		mtx_unlock(&x86bios_lock);
 		return;
 	}
 	nfree = atop(round_page(size));
 	bzero(x86bios_vmc.pmap + i, sizeof(*x86bios_vmc.pmap) * nfree);
 	if (i + nfree == x86bios_vmc.npages) {
 		x86bios_vmc.npages -= nfree;
 		while (--i >= 0 && x86bios_vmc.pmap[i].kva == 0)
 			x86bios_vmc.npages--;
 	}
 	mtx_unlock(&x86bios_lock);
-	contigfree(addr, size, M_DEVBUF);
+	free(addr, M_DEVBUF);
 }
 
 void
 x86bios_init_regs(struct x86regs *regs)
 {
 
 	bzero(regs, sizeof(*regs));
 }
 
 void
 x86bios_call(struct x86regs *regs, uint16_t seg, uint16_t off)
 {
 	struct vm86frame vmf;
 
 	if (x86bios_trace_call)
 		X86BIOS_TRACE(Calling 0x%06x, (seg << 4) + off, regs);
 
 	bzero(&vmf, sizeof(vmf));
 	x86bios_emu2vmf((struct x86emu_regs *)regs, &vmf);
 	vmf.vmf_cs = seg;
 	vmf.vmf_ip = off;
 	mtx_lock(&x86bios_lock);
 	vm86_datacall(-1, &vmf, &x86bios_vmc);
 	mtx_unlock(&x86bios_lock);
 	x86bios_vmf2emu(&vmf, (struct x86emu_regs *)regs);
 
 	if (x86bios_trace_call)
 		X86BIOS_TRACE(Exiting 0x%06x, (seg << 4) + off, regs);
 }
 
 uint32_t
 x86bios_get_intr(int intno)
 {
 
 	return (readl(BIOS_PADDRTOVADDR(intno * 4)));
 }
 
 void
 x86bios_set_intr(int intno, uint32_t saddr)
 {
 
 	writel(BIOS_PADDRTOVADDR(intno * 4), saddr);
 }
 
 void
 x86bios_intr(struct x86regs *regs, int intno)
 {
 	struct vm86frame vmf;
 
 	if (x86bios_trace_int)
 		X86BIOS_TRACE(Calling INT 0x%02x, intno, regs);
 
 	bzero(&vmf, sizeof(vmf));
 	x86bios_emu2vmf((struct x86emu_regs *)regs, &vmf);
 	mtx_lock(&x86bios_lock);
 	vm86_datacall(intno, &vmf, &x86bios_vmc);
 	mtx_unlock(&x86bios_lock);
 	x86bios_vmf2emu(&vmf, (struct x86emu_regs *)regs);
 
 	if (x86bios_trace_int)
 		X86BIOS_TRACE(Exiting INT 0x%02x, intno, regs);
 }
 
 void *
 x86bios_offset(uint32_t offset)
 {
 	vm_offset_t addr;
 
 	addr = vm86_getaddr(&x86bios_vmc, X86BIOS_PHYSTOSEG(offset),
 	    X86BIOS_PHYSTOOFF(offset));
 	if (addr == 0)
 		addr = BIOS_PADDRTOVADDR(offset);
 
 	return ((void *)addr);
 }
 
 static int
 x86bios_init(void)
 {
 
 	mtx_init(&x86bios_lock, "x86bios lock", NULL, MTX_DEF);
 	bzero(&x86bios_vmc, sizeof(x86bios_vmc));
 
 	return (0);
 }
 
 static int
 x86bios_uninit(void)
 {
 
 	mtx_destroy(&x86bios_lock);
 
 	return (0);
 }
 
 #else
 
 #include <machine/iodev.h>
 
 #define	X86BIOS_PAGE_SIZE	0x00001000	/* 4K */
 
 #define	X86BIOS_IVT_SIZE	0x00000500	/* 1K + 256 (BDA) */
 
 #define	X86BIOS_IVT_BASE	0x00000000
 #define	X86BIOS_RAM_BASE	0x00001000
 #define	X86BIOS_ROM_BASE	0x000a0000
 
 #define	X86BIOS_ROM_SIZE	(X86BIOS_MEM_SIZE - x86bios_rom_phys)
 #define	X86BIOS_SEG_SIZE	X86BIOS_PAGE_SIZE
 
 #define	X86BIOS_PAGES		(X86BIOS_MEM_SIZE / X86BIOS_PAGE_SIZE)
 
 #define	X86BIOS_R_SS		_pad2
 #define	X86BIOS_R_SP		_pad3.I16_reg.x_reg
 
 static struct x86emu x86bios_emu;
 
 static void *x86bios_ivt;
 static void *x86bios_rom;
 static void *x86bios_seg;
 
 static vm_offset_t *x86bios_map;
 
 static vm_paddr_t x86bios_rom_phys;
 static vm_paddr_t x86bios_seg_phys;
 
 static int x86bios_fault;
 static uint32_t x86bios_fault_addr;
 static uint16_t x86bios_fault_cs;
 static uint16_t x86bios_fault_ip;
 
 static void
 x86bios_set_fault(struct x86emu *emu, uint32_t addr)
 {
 
 	x86bios_fault = 1;
 	x86bios_fault_addr = addr;
 	x86bios_fault_cs = emu->x86.R_CS;
 	x86bios_fault_ip = emu->x86.R_IP;
 	x86emu_halt_sys(emu);
 }
 
 static void *
 x86bios_get_pages(uint32_t offset, size_t size)
 {
 	vm_offset_t addr;
 
 	if (offset + size > X86BIOS_MEM_SIZE + X86BIOS_IVT_SIZE)
 		return (NULL);
 
 	if (offset >= X86BIOS_MEM_SIZE)
 		offset -= X86BIOS_MEM_SIZE;
 	addr = x86bios_map[offset / X86BIOS_PAGE_SIZE];
 	if (addr != 0)
 		addr += offset % X86BIOS_PAGE_SIZE;
 
 	return ((void *)addr);
 }
 
 static void
 x86bios_set_pages(vm_offset_t va, vm_paddr_t pa, size_t size)
 {
 	int i, j;
 
 	for (i = pa / X86BIOS_PAGE_SIZE, j = 0;
 	    j < howmany(size, X86BIOS_PAGE_SIZE); i++, j++)
 		x86bios_map[i] = va + j * X86BIOS_PAGE_SIZE;
 }
 
 static uint8_t
 x86bios_emu_rdb(struct x86emu *emu, uint32_t addr)
 {
 	uint8_t *va;
 
 	va = x86bios_get_pages(addr, sizeof(*va));
 	if (va == NULL)
 		x86bios_set_fault(emu, addr);
 
 	return (*va);
 }
 
 static uint16_t
 x86bios_emu_rdw(struct x86emu *emu, uint32_t addr)
 {
 	uint16_t *va;
 
 	va = x86bios_get_pages(addr, sizeof(*va));
 	if (va == NULL)
 		x86bios_set_fault(emu, addr);
 
 #ifndef __NO_STRICT_ALIGNMENT
 	if ((addr & 1) != 0)
 		return (le16dec(va));
 	else
 #endif
 	return (le16toh(*va));
 }
 
 static uint32_t
 x86bios_emu_rdl(struct x86emu *emu, uint32_t addr)
 {
 	uint32_t *va;
 
 	va = x86bios_get_pages(addr, sizeof(*va));
 	if (va == NULL)
 		x86bios_set_fault(emu, addr);
 
 #ifndef __NO_STRICT_ALIGNMENT
 	if ((addr & 3) != 0)
 		return (le32dec(va));
 	else
 #endif
 	return (le32toh(*va));
 }
 
 static void
 x86bios_emu_wrb(struct x86emu *emu, uint32_t addr, uint8_t val)
 {
 	uint8_t *va;
 
 	va = x86bios_get_pages(addr, sizeof(*va));
 	if (va == NULL)
 		x86bios_set_fault(emu, addr);
 
 	*va = val;
 }
 
 static void
 x86bios_emu_wrw(struct x86emu *emu, uint32_t addr, uint16_t val)
 {
 	uint16_t *va;
 
 	va = x86bios_get_pages(addr, sizeof(*va));
 	if (va == NULL)
 		x86bios_set_fault(emu, addr);
 
 #ifndef __NO_STRICT_ALIGNMENT
 	if ((addr & 1) != 0)
 		le16enc(va, val);
 	else
 #endif
 	*va = htole16(val);
 }
 
 static void
 x86bios_emu_wrl(struct x86emu *emu, uint32_t addr, uint32_t val)
 {
 	uint32_t *va;
 
 	va = x86bios_get_pages(addr, sizeof(*va));
 	if (va == NULL)
 		x86bios_set_fault(emu, addr);
 
 #ifndef __NO_STRICT_ALIGNMENT
 	if ((addr & 3) != 0)
 		le32enc(va, val);
 	else
 #endif
 	*va = htole32(val);
 }
 
 static uint8_t
 x86bios_emu_inb(struct x86emu *emu, uint16_t port)
 {
 
 #ifndef X86BIOS_NATIVE_ARCH
 	if (port == 0xb2) /* APM scratch register */
 		return (0);
 	if (port >= 0x80 && port < 0x88) /* POST status register */
 		return (0);
 #endif
 
 	return (iodev_read_1(port));
 }
 
 static uint16_t
 x86bios_emu_inw(struct x86emu *emu, uint16_t port)
 {
 	uint16_t val;
 
 #ifndef X86BIOS_NATIVE_ARCH
 	if (port >= 0x80 && port < 0x88) /* POST status register */
 		return (0);
 
 	if ((port & 1) != 0) {
 		val = iodev_read_1(port);
 		val |= iodev_read_1(port + 1) << 8;
 	} else
 #endif
 	val = iodev_read_2(port);
 
 	return (val);
 }
 
 static uint32_t
 x86bios_emu_inl(struct x86emu *emu, uint16_t port)
 {
 	uint32_t val;
 
 #ifndef X86BIOS_NATIVE_ARCH
 	if (port >= 0x80 && port < 0x88) /* POST status register */
 		return (0);
 
 	if ((port & 1) != 0) {
 		val = iodev_read_1(port);
 		val |= iodev_read_2(port + 1) << 8;
 		val |= iodev_read_1(port + 3) << 24;
 	} else if ((port & 2) != 0) {
 		val = iodev_read_2(port);
 		val |= iodev_read_2(port + 2) << 16;
 	} else
 #endif
 	val = iodev_read_4(port);
 
 	return (val);
 }
 
 static void
 x86bios_emu_outb(struct x86emu *emu, uint16_t port, uint8_t val)
 {
 
 #ifndef X86BIOS_NATIVE_ARCH
 	if (port == 0xb2) /* APM scratch register */
 		return;
 	if (port >= 0x80 && port < 0x88) /* POST status register */
 		return;
 #endif
 
 	iodev_write_1(port, val);
 }
 
 static void
 x86bios_emu_outw(struct x86emu *emu, uint16_t port, uint16_t val)
 {
 
 #ifndef X86BIOS_NATIVE_ARCH
 	if (port >= 0x80 && port < 0x88) /* POST status register */
 		return;
 
 	if ((port & 1) != 0) {
 		iodev_write_1(port, val);
 		iodev_write_1(port + 1, val >> 8);
 	} else
 #endif
 	iodev_write_2(port, val);
 }
 
 static void
 x86bios_emu_outl(struct x86emu *emu, uint16_t port, uint32_t val)
 {
 
 #ifndef X86BIOS_NATIVE_ARCH
 	if (port >= 0x80 && port < 0x88) /* POST status register */
 		return;
 
 	if ((port & 1) != 0) {
 		iodev_write_1(port, val);
 		iodev_write_2(port + 1, val >> 8);
 		iodev_write_1(port + 3, val >> 24);
 	} else if ((port & 2) != 0) {
 		iodev_write_2(port, val);
 		iodev_write_2(port + 2, val >> 16);
 	} else
 #endif
 	iodev_write_4(port, val);
 }
 
 void *
 x86bios_alloc(uint32_t *offset, size_t size, int flags)
 {
 	void *vaddr;
 
 	if (offset == NULL || size == 0)
 		return (NULL);
 	vaddr = contigmalloc(size, M_DEVBUF, flags, X86BIOS_RAM_BASE,
 	    x86bios_rom_phys, X86BIOS_PAGE_SIZE, 0);
 	if (vaddr != NULL) {
 		*offset = vtophys(vaddr);
 		mtx_lock(&x86bios_lock);
 		x86bios_set_pages((vm_offset_t)vaddr, *offset, size);
 		mtx_unlock(&x86bios_lock);
 	}
 
 	return (vaddr);
 }
 
 void
 x86bios_free(void *addr, size_t size)
 {
 	vm_paddr_t paddr;
 
 	if (addr == NULL || size == 0)
 		return;
 	paddr = vtophys(addr);
 	if (paddr < X86BIOS_RAM_BASE || paddr >= x86bios_rom_phys ||
 	    paddr % X86BIOS_PAGE_SIZE != 0)
 		return;
 	mtx_lock(&x86bios_lock);
 	bzero(x86bios_map + paddr / X86BIOS_PAGE_SIZE,
 	    sizeof(*x86bios_map) * howmany(size, X86BIOS_PAGE_SIZE));
 	mtx_unlock(&x86bios_lock);
-	contigfree(addr, size, M_DEVBUF);
+	free(addr, M_DEVBUF);
 }
 
 void
 x86bios_init_regs(struct x86regs *regs)
 {
 
 	bzero(regs, sizeof(*regs));
 	regs->X86BIOS_R_SS = X86BIOS_PHYSTOSEG(x86bios_seg_phys);
 	regs->X86BIOS_R_SP = X86BIOS_PAGE_SIZE - 2;
 }
 
 void
 x86bios_call(struct x86regs *regs, uint16_t seg, uint16_t off)
 {
 
 	if (x86bios_trace_call)
 		X86BIOS_TRACE(Calling 0x%06x, (seg << 4) + off, regs);
 
 	mtx_lock(&x86bios_lock);
 	memcpy((struct x86regs *)&x86bios_emu.x86, regs, sizeof(*regs));
 	x86bios_fault = 0;
 	spinlock_enter();
 	x86emu_exec_call(&x86bios_emu, seg, off);
 	spinlock_exit();
 	memcpy(regs, &x86bios_emu.x86, sizeof(*regs));
 	mtx_unlock(&x86bios_lock);
 
 	if (x86bios_trace_call) {
 		X86BIOS_TRACE(Exiting 0x%06x, (seg << 4) + off, regs);
 		if (x86bios_fault)
 			printf("Page fault at 0x%06x from 0x%04x:0x%04x.\n",
 			    x86bios_fault_addr, x86bios_fault_cs,
 			    x86bios_fault_ip);
 	}
 }
 
 uint32_t
 x86bios_get_intr(int intno)
 {
 
 	return (le32toh(*((uint32_t *)x86bios_ivt + intno)));
 }
 
 void
 x86bios_set_intr(int intno, uint32_t saddr)
 {
 
 	*((uint32_t *)x86bios_ivt + intno) = htole32(saddr);
 }
 
 void
 x86bios_intr(struct x86regs *regs, int intno)
 {
 
 	if (intno < 0 || intno > 255)
 		return;
 
 	if (x86bios_trace_int)
 		X86BIOS_TRACE(Calling INT 0x%02x, intno, regs);
 
 	mtx_lock(&x86bios_lock);
 	memcpy((struct x86regs *)&x86bios_emu.x86, regs, sizeof(*regs));
 	x86bios_fault = 0;
 	spinlock_enter();
 	x86emu_exec_intr(&x86bios_emu, intno);
 	spinlock_exit();
 	memcpy(regs, &x86bios_emu.x86, sizeof(*regs));
 	mtx_unlock(&x86bios_lock);
 
 	if (x86bios_trace_int) {
 		X86BIOS_TRACE(Exiting INT 0x%02x, intno, regs);
 		if (x86bios_fault)
 			printf("Page fault at 0x%06x from 0x%04x:0x%04x.\n",
 			    x86bios_fault_addr, x86bios_fault_cs,
 			    x86bios_fault_ip);
 	}
 }
 
 void *
 x86bios_offset(uint32_t offset)
 {
 
 	return (x86bios_get_pages(offset, 1));
 }
 
 static __inline void
 x86bios_unmap_mem(void)
 {
 
 	if (x86bios_map != NULL) {
 		free(x86bios_map, M_DEVBUF);
 		x86bios_map = NULL;
 	}
 	if (x86bios_ivt != NULL) {
 #ifdef X86BIOS_NATIVE_ARCH
 		pmap_unmapbios(x86bios_ivt, X86BIOS_IVT_SIZE);
 #else
 		free(x86bios_ivt, M_DEVBUF);
 		x86bios_ivt = NULL;
 #endif
 	}
 	if (x86bios_rom != NULL)
 		pmap_unmapdev(x86bios_rom, X86BIOS_ROM_SIZE);
 	if (x86bios_seg != NULL) {
-		contigfree(x86bios_seg, X86BIOS_SEG_SIZE, M_DEVBUF);
+		free(x86bios_seg, M_DEVBUF);
 		x86bios_seg = NULL;
 	}
 }
 
 static __inline int
 x86bios_map_mem(void)
 {
 
 	x86bios_map = malloc(sizeof(*x86bios_map) * X86BIOS_PAGES, M_DEVBUF,
 	    M_NOWAIT | M_ZERO);
 	if (x86bios_map == NULL)
 		goto fail;
 
 #ifdef X86BIOS_NATIVE_ARCH
 	x86bios_ivt = pmap_mapbios(X86BIOS_IVT_BASE, X86BIOS_IVT_SIZE);
 
 	/* Probe EBDA via BDA. */
 	x86bios_rom_phys = *(uint16_t *)((caddr_t)x86bios_ivt + 0x40e);
 	x86bios_rom_phys = x86bios_rom_phys << 4;
 	if (x86bios_rom_phys != 0 && x86bios_rom_phys < X86BIOS_ROM_BASE &&
 	    X86BIOS_ROM_BASE - x86bios_rom_phys <= 128 * 1024)
 		x86bios_rom_phys =
 		    rounddown(x86bios_rom_phys, X86BIOS_PAGE_SIZE);
 	else
 #else
 	x86bios_ivt = malloc(X86BIOS_IVT_SIZE, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (x86bios_ivt == NULL)
 		goto fail;
 #endif
 
 	x86bios_rom_phys = X86BIOS_ROM_BASE;
 	x86bios_rom = pmap_mapdev(x86bios_rom_phys, X86BIOS_ROM_SIZE);
 	if (x86bios_rom == NULL)
 		goto fail;
 #ifdef X86BIOS_NATIVE_ARCH
 	/* Change attribute for EBDA. */
 	if (x86bios_rom_phys < X86BIOS_ROM_BASE &&
 	    pmap_change_attr((vm_offset_t)x86bios_rom,
 	    X86BIOS_ROM_BASE - x86bios_rom_phys, PAT_WRITE_BACK) != 0)
 		goto fail;
 #endif
 
 	x86bios_seg = contigmalloc(X86BIOS_SEG_SIZE, M_DEVBUF, M_NOWAIT,
 	    X86BIOS_RAM_BASE, x86bios_rom_phys, X86BIOS_PAGE_SIZE, 0);
 	if (x86bios_seg == NULL)
 	    goto fail;
 	x86bios_seg_phys = vtophys(x86bios_seg);
 
 	x86bios_set_pages((vm_offset_t)x86bios_ivt, X86BIOS_IVT_BASE,
 	    X86BIOS_IVT_SIZE);
 	x86bios_set_pages((vm_offset_t)x86bios_rom, x86bios_rom_phys,
 	    X86BIOS_ROM_SIZE);
 	x86bios_set_pages((vm_offset_t)x86bios_seg, x86bios_seg_phys,
 	    X86BIOS_SEG_SIZE);
 
 	if (bootverbose) {
 		printf("x86bios:  IVT 0x%06jx-0x%06jx at %p\n",
 		    (vm_paddr_t)X86BIOS_IVT_BASE,
 		    (vm_paddr_t)X86BIOS_IVT_SIZE + X86BIOS_IVT_BASE - 1,
 		    x86bios_ivt);
 		printf("x86bios: SSEG 0x%06jx-0x%06jx at %p\n",
 		    x86bios_seg_phys,
 		    (vm_paddr_t)X86BIOS_SEG_SIZE + x86bios_seg_phys - 1,
 		    x86bios_seg);
 		if (x86bios_rom_phys < X86BIOS_ROM_BASE)
 			printf("x86bios: EBDA 0x%06jx-0x%06jx at %p\n",
 			    x86bios_rom_phys, (vm_paddr_t)X86BIOS_ROM_BASE - 1,
 			    x86bios_rom);
 		printf("x86bios:  ROM 0x%06jx-0x%06jx at %p\n",
 		    (vm_paddr_t)X86BIOS_ROM_BASE,
 		    (vm_paddr_t)X86BIOS_MEM_SIZE - X86BIOS_SEG_SIZE - 1,
 		    (caddr_t)x86bios_rom + X86BIOS_ROM_BASE - x86bios_rom_phys);
 	}
 
 	return (0);
 
 fail:
 	x86bios_unmap_mem();
 
 	return (1);
 }
 
 static int
 x86bios_init(void)
 {
 
 	mtx_init(&x86bios_lock, "x86bios lock", NULL, MTX_DEF);
 
 	if (x86bios_map_mem() != 0)
 		return (ENOMEM);
 
 	bzero(&x86bios_emu, sizeof(x86bios_emu));
 
 	x86bios_emu.emu_rdb = x86bios_emu_rdb;
 	x86bios_emu.emu_rdw = x86bios_emu_rdw;
 	x86bios_emu.emu_rdl = x86bios_emu_rdl;
 	x86bios_emu.emu_wrb = x86bios_emu_wrb;
 	x86bios_emu.emu_wrw = x86bios_emu_wrw;
 	x86bios_emu.emu_wrl = x86bios_emu_wrl;
 
 	x86bios_emu.emu_inb = x86bios_emu_inb;
 	x86bios_emu.emu_inw = x86bios_emu_inw;
 	x86bios_emu.emu_inl = x86bios_emu_inl;
 	x86bios_emu.emu_outb = x86bios_emu_outb;
 	x86bios_emu.emu_outw = x86bios_emu_outw;
 	x86bios_emu.emu_outl = x86bios_emu_outl;
 
 	return (0);
 }
 
 static int
 x86bios_uninit(void)
 {
 
 	x86bios_unmap_mem();
 	mtx_destroy(&x86bios_lock);
 
 	return (0);
 }
 
 #endif
 
 void *
 x86bios_get_orm(uint32_t offset)
 {
 	uint8_t *p;
 
 	/* Does the shadow ROM contain BIOS POST code for x86? */
 	p = x86bios_offset(offset);
 	if (p == NULL || p[0] != 0x55 || p[1] != 0xaa ||
 	    (p[3] != 0xe9 && p[3] != 0xeb))
 		return (NULL);
 
 	return (p);
 }
 
 int
 x86bios_match_device(uint32_t offset, device_t dev)
 {
 	uint8_t *p;
 	uint16_t device, vendor;
 	uint8_t class, progif, subclass;
 
 	/* Does the shadow ROM contain BIOS POST code for x86? */
 	p = x86bios_get_orm(offset);
 	if (p == NULL)
 		return (0);
 
 	/* Does it contain PCI data structure? */
 	p += le16toh(*(uint16_t *)(p + 0x18));
 	if (bcmp(p, "PCIR", 4) != 0 ||
 	    le16toh(*(uint16_t *)(p + 0x0a)) < 0x18 || *(p + 0x14) != 0)
 		return (0);
 
 	/* Does it match the vendor, device, and classcode? */
 	vendor = le16toh(*(uint16_t *)(p + 0x04));
 	device = le16toh(*(uint16_t *)(p + 0x06));
 	progif = *(p + 0x0d);
 	subclass = *(p + 0x0e);
 	class = *(p + 0x0f);
 	if (vendor != pci_get_vendor(dev) || device != pci_get_device(dev) ||
 	    class != pci_get_class(dev) || subclass != pci_get_subclass(dev) ||
 	    progif != pci_get_progif(dev))
 		return (0);
 
 	return (1);
 }
 
 static int
 x86bios_modevent(module_t mod __unused, int type, void *data __unused)
 {
 
 	switch (type) {
 	case MOD_LOAD:
 		return (x86bios_init());
 	case MOD_UNLOAD:
 		return (x86bios_uninit());
 	default:
 		return (ENOTSUP);
 	}
 }
 
 static moduledata_t x86bios_mod = {
 	"x86bios",
 	x86bios_modevent,
 	NULL,
 };
 
 DECLARE_MODULE(x86bios, x86bios_mod, SI_SUB_CPU, SI_ORDER_ANY);
 MODULE_VERSION(x86bios, 1);
diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index b710a542a10f..b63c0aaf634a 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -1,2372 +1,2372 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2000 Doug Rabson
  * Copyright (c) 2000 Ruslan Ermilov
  * Copyright (c) 2011 The FreeBSD Foundation
  * All rights reserved.
  *
  * Portions of this software were developed by Konstantin Belousov
  * under sponsorship from the FreeBSD Foundation.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 /*
  * Fixes for 830/845G support: David Dawes <dawes@xfree86.org>
  * 852GM/855GM/865G support added by David Dawes <dawes@xfree86.org>
  *
  * This is generic Intel GTT handling code, morphed from the AGP
  * bridge code.
  */
 
 #include <sys/cdefs.h>
 #if 0
 #define	KTR_AGP_I810	KTR_DEV
 #else
 #define	KTR_AGP_I810	0
 #endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/rwlock.h>
 
 #include <dev/agp/agppriv.h>
 #include <dev/agp/agpreg.h>
 #include <dev/agp/agp_i810.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pci_private.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <machine/md_var.h>
 #include <sys/rman.h>
 
 MALLOC_DECLARE(M_AGP);
 
 struct agp_i810_match;
 
 static int agp_i810_check_active(device_t bridge_dev);
 static int agp_i830_check_active(device_t bridge_dev);
 static int agp_i915_check_active(device_t bridge_dev);
 
 static void agp_82852_set_desc(device_t dev,
     const struct agp_i810_match *match);
 static void agp_i810_set_desc(device_t dev, const struct agp_i810_match *match);
 
 static void agp_i810_dump_regs(device_t dev);
 static void agp_i830_dump_regs(device_t dev);
 static void agp_i855_dump_regs(device_t dev);
 static void agp_i915_dump_regs(device_t dev);
 static void agp_i965_dump_regs(device_t dev);
 
 static int agp_i810_get_stolen_size(device_t dev);
 static int agp_i830_get_stolen_size(device_t dev);
 static int agp_i915_get_stolen_size(device_t dev);
 
 static int agp_i810_get_gtt_mappable_entries(device_t dev);
 static int agp_i830_get_gtt_mappable_entries(device_t dev);
 static int agp_i915_get_gtt_mappable_entries(device_t dev);
 
 static int agp_i810_get_gtt_total_entries(device_t dev);
 static int agp_i965_get_gtt_total_entries(device_t dev);
 static int agp_gen5_get_gtt_total_entries(device_t dev);
 
 static int agp_i810_install_gatt(device_t dev);
 static int agp_i830_install_gatt(device_t dev);
 static int agp_i965_install_gatt(device_t dev);
 static int agp_g4x_install_gatt(device_t dev);
 
 static void agp_i810_deinstall_gatt(device_t dev);
 static void agp_i830_deinstall_gatt(device_t dev);
 
 static void agp_i810_install_gtt_pte(device_t dev, u_int index,
     vm_offset_t physical, int flags);
 static void agp_i830_install_gtt_pte(device_t dev, u_int index,
     vm_offset_t physical, int flags);
 static void agp_i915_install_gtt_pte(device_t dev, u_int index,
     vm_offset_t physical, int flags);
 static void agp_i965_install_gtt_pte(device_t dev, u_int index,
     vm_offset_t physical, int flags);
 static void agp_g4x_install_gtt_pte(device_t dev, u_int index,
     vm_offset_t physical, int flags);
 
 static void agp_i810_write_gtt(device_t dev, u_int index, uint32_t pte);
 static void agp_i915_write_gtt(device_t dev, u_int index, uint32_t pte);
 static void agp_i965_write_gtt(device_t dev, u_int index, uint32_t pte);
 static void agp_g4x_write_gtt(device_t dev, u_int index, uint32_t pte);
 
 static u_int32_t agp_i810_read_gtt_pte(device_t dev, u_int index);
 static u_int32_t agp_i915_read_gtt_pte(device_t dev, u_int index);
 static u_int32_t agp_i965_read_gtt_pte(device_t dev, u_int index);
 static u_int32_t agp_g4x_read_gtt_pte(device_t dev, u_int index);
 
 static vm_paddr_t agp_i810_read_gtt_pte_paddr(device_t dev, u_int index);
 static vm_paddr_t agp_i915_read_gtt_pte_paddr(device_t dev, u_int index);
 
 static int agp_i810_set_aperture(device_t dev, u_int32_t aperture);
 static int agp_i830_set_aperture(device_t dev, u_int32_t aperture);
 static int agp_i915_set_aperture(device_t dev, u_int32_t aperture);
 
 static int agp_i810_chipset_flush_setup(device_t dev);
 static int agp_i915_chipset_flush_setup(device_t dev);
 static int agp_i965_chipset_flush_setup(device_t dev);
 
 static void agp_i810_chipset_flush_teardown(device_t dev);
 static void agp_i915_chipset_flush_teardown(device_t dev);
 static void agp_i965_chipset_flush_teardown(device_t dev);
 
 static void agp_i810_chipset_flush(device_t dev);
 static void agp_i830_chipset_flush(device_t dev);
 static void agp_i915_chipset_flush(device_t dev);
 
 enum {
 	CHIP_I810,	/* i810/i815 */
 	CHIP_I830,	/* 830M/845G */
 	CHIP_I855,	/* 852GM/855GM/865G */
 	CHIP_I915,	/* 915G/915GM */
 	CHIP_I965,	/* G965 */
 	CHIP_G33,	/* G33/Q33/Q35 */
 	CHIP_IGD,	/* Pineview */
 	CHIP_G4X,	/* G45/Q45 */
 };
 
 /* The i810 through i855 have the registers at BAR 1, and the GATT gets
  * allocated by us.  The i915 has registers in BAR 0 and the GATT is at the
  * start of the stolen memory, and should only be accessed by the OS through
  * BAR 3.  The G965 has registers and GATT in the same BAR (0) -- first 512KB
  * is registers, second 512KB is GATT.
  */
 static struct resource_spec agp_i810_res_spec[] = {
 	{ SYS_RES_MEMORY, AGP_I810_MMADR, RF_ACTIVE | RF_SHAREABLE },
 	{ -1, 0 }
 };
 
 static struct resource_spec agp_i915_res_spec[] = {
 	{ SYS_RES_MEMORY, AGP_I915_MMADR, RF_ACTIVE | RF_SHAREABLE },
 	{ SYS_RES_MEMORY, AGP_I915_GTTADR, RF_ACTIVE | RF_SHAREABLE },
 	{ -1, 0 }
 };
 
 static struct resource_spec agp_i965_res_spec[] = {
 	{ SYS_RES_MEMORY, AGP_I965_GTTMMADR, RF_ACTIVE | RF_SHAREABLE },
 	{ SYS_RES_MEMORY, AGP_I965_APBASE, RF_ACTIVE | RF_SHAREABLE },
 	{ -1, 0 }
 };
 
 struct agp_i810_softc {
 	struct agp_softc agp;
 	u_int32_t initial_aperture;	/* aperture size at startup */
 	struct agp_gatt *gatt;
 	u_int32_t dcache_size;		/* i810 only */
 	u_int32_t stolen;		/* number of i830/845 gtt
 					   entries for stolen memory */
 	u_int stolen_size;		/* BIOS-reserved graphics memory */
 	u_int gtt_total_entries;	/* Total number of gtt ptes */
 	u_int gtt_mappable_entries;	/* Number of gtt ptes mappable by CPU */
 	device_t bdev;			/* bridge device */
 	void *argb_cursor;		/* contigmalloc area for ARGB cursor */
 	struct resource *sc_res[2];
 	const struct agp_i810_match *match;
 	int sc_flush_page_rid;
 	struct resource *sc_flush_page_res;
 	void *sc_flush_page_vaddr;
 	int sc_bios_allocated_flush_page;
 };
 
 static device_t intel_agp;
 
 struct agp_i810_driver {
 	int chiptype;
 	int gen;
 	int busdma_addr_mask_sz;
 	struct resource_spec *res_spec;
 	int (*check_active)(device_t);
 	void (*set_desc)(device_t, const struct agp_i810_match *);
 	void (*dump_regs)(device_t);
 	int (*get_stolen_size)(device_t);
 	int (*get_gtt_total_entries)(device_t);
 	int (*get_gtt_mappable_entries)(device_t);
 	int (*install_gatt)(device_t);
 	void (*deinstall_gatt)(device_t);
 	void (*write_gtt)(device_t, u_int, uint32_t);
 	void (*install_gtt_pte)(device_t, u_int, vm_offset_t, int);
 	u_int32_t (*read_gtt_pte)(device_t, u_int);
 	vm_paddr_t (*read_gtt_pte_paddr)(device_t , u_int);
 	int (*set_aperture)(device_t, u_int32_t);
 	int (*chipset_flush_setup)(device_t);
 	void (*chipset_flush_teardown)(device_t);
 	void (*chipset_flush)(device_t);
 };
 
 static struct {
 	struct intel_gtt base;
 } intel_private;
 
 static const struct agp_i810_driver agp_i810_i810_driver = {
 	.chiptype = CHIP_I810,
 	.gen = 1,
 	.busdma_addr_mask_sz = 32,
 	.res_spec = agp_i810_res_spec,
 	.check_active = agp_i810_check_active,
 	.set_desc = agp_i810_set_desc,
 	.dump_regs = agp_i810_dump_regs,
 	.get_stolen_size = agp_i810_get_stolen_size,
 	.get_gtt_mappable_entries = agp_i810_get_gtt_mappable_entries,
 	.get_gtt_total_entries = agp_i810_get_gtt_total_entries,
 	.install_gatt = agp_i810_install_gatt,
 	.deinstall_gatt = agp_i810_deinstall_gatt,
 	.write_gtt = agp_i810_write_gtt,
 	.install_gtt_pte = agp_i810_install_gtt_pte,
 	.read_gtt_pte = agp_i810_read_gtt_pte,
 	.read_gtt_pte_paddr = agp_i810_read_gtt_pte_paddr,
 	.set_aperture = agp_i810_set_aperture,
 	.chipset_flush_setup = agp_i810_chipset_flush_setup,
 	.chipset_flush_teardown = agp_i810_chipset_flush_teardown,
 	.chipset_flush = agp_i810_chipset_flush,
 };
 
 static const struct agp_i810_driver agp_i810_i815_driver = {
 	.chiptype = CHIP_I810,
 	.gen = 2,
 	.busdma_addr_mask_sz = 32,
 	.res_spec = agp_i810_res_spec,
 	.check_active = agp_i810_check_active,
 	.set_desc = agp_i810_set_desc,
 	.dump_regs = agp_i810_dump_regs,
 	.get_stolen_size = agp_i810_get_stolen_size,
 	.get_gtt_mappable_entries = agp_i830_get_gtt_mappable_entries,
 	.get_gtt_total_entries = agp_i810_get_gtt_total_entries,
 	.install_gatt = agp_i810_install_gatt,
 	.deinstall_gatt = agp_i810_deinstall_gatt,
 	.write_gtt = agp_i810_write_gtt,
 	.install_gtt_pte = agp_i810_install_gtt_pte,
 	.read_gtt_pte = agp_i810_read_gtt_pte,
 	.read_gtt_pte_paddr = agp_i810_read_gtt_pte_paddr,
 	.set_aperture = agp_i810_set_aperture,
 	.chipset_flush_setup = agp_i810_chipset_flush_setup,
 	.chipset_flush_teardown = agp_i810_chipset_flush_teardown,
 	.chipset_flush = agp_i830_chipset_flush,
 };
 
 static const struct agp_i810_driver agp_i810_i830_driver = {
 	.chiptype = CHIP_I830,
 	.gen = 2,
 	.busdma_addr_mask_sz = 32,
 	.res_spec = agp_i810_res_spec,
 	.check_active = agp_i830_check_active,
 	.set_desc = agp_i810_set_desc,
 	.dump_regs = agp_i830_dump_regs,
 	.get_stolen_size = agp_i830_get_stolen_size,
 	.get_gtt_mappable_entries = agp_i830_get_gtt_mappable_entries,
 	.get_gtt_total_entries = agp_i810_get_gtt_total_entries,
 	.install_gatt = agp_i830_install_gatt,
 	.deinstall_gatt = agp_i830_deinstall_gatt,
 	.write_gtt = agp_i810_write_gtt,
 	.install_gtt_pte = agp_i830_install_gtt_pte,
 	.read_gtt_pte = agp_i810_read_gtt_pte,
 	.read_gtt_pte_paddr = agp_i810_read_gtt_pte_paddr,
 	.set_aperture = agp_i830_set_aperture,
 	.chipset_flush_setup = agp_i810_chipset_flush_setup,
 	.chipset_flush_teardown = agp_i810_chipset_flush_teardown,
 	.chipset_flush = agp_i830_chipset_flush,
 };
 
 static const struct agp_i810_driver agp_i810_i855_driver = {
 	.chiptype = CHIP_I855,
 	.gen = 2,
 	.busdma_addr_mask_sz = 32,
 	.res_spec = agp_i810_res_spec,
 	.check_active = agp_i830_check_active,
 	.set_desc = agp_82852_set_desc,
 	.dump_regs = agp_i855_dump_regs,
 	.get_stolen_size = agp_i915_get_stolen_size,
 	.get_gtt_mappable_entries = agp_i915_get_gtt_mappable_entries,
 	.get_gtt_total_entries = agp_i810_get_gtt_total_entries,
 	.install_gatt = agp_i830_install_gatt,
 	.deinstall_gatt = agp_i830_deinstall_gatt,
 	.write_gtt = agp_i810_write_gtt,
 	.install_gtt_pte = agp_i830_install_gtt_pte,
 	.read_gtt_pte = agp_i810_read_gtt_pte,
 	.read_gtt_pte_paddr = agp_i810_read_gtt_pte_paddr,
 	.set_aperture = agp_i830_set_aperture,
 	.chipset_flush_setup = agp_i810_chipset_flush_setup,
 	.chipset_flush_teardown = agp_i810_chipset_flush_teardown,
 	.chipset_flush = agp_i830_chipset_flush,
 };
 
 static const struct agp_i810_driver agp_i810_i865_driver = {
 	.chiptype = CHIP_I855,
 	.gen = 2,
 	.busdma_addr_mask_sz = 32,
 	.res_spec = agp_i810_res_spec,
 	.check_active = agp_i830_check_active,
 	.set_desc = agp_i810_set_desc,
 	.dump_regs = agp_i855_dump_regs,
 	.get_stolen_size = agp_i915_get_stolen_size,
 	.get_gtt_mappable_entries = agp_i915_get_gtt_mappable_entries,
 	.get_gtt_total_entries = agp_i810_get_gtt_total_entries,
 	.install_gatt = agp_i830_install_gatt,
 	.deinstall_gatt = agp_i830_deinstall_gatt,
 	.write_gtt = agp_i810_write_gtt,
 	.install_gtt_pte = agp_i830_install_gtt_pte,
 	.read_gtt_pte = agp_i810_read_gtt_pte,
 	.read_gtt_pte_paddr = agp_i810_read_gtt_pte_paddr,
 	.set_aperture = agp_i915_set_aperture,
 	.chipset_flush_setup = agp_i810_chipset_flush_setup,
 	.chipset_flush_teardown = agp_i810_chipset_flush_teardown,
 	.chipset_flush = agp_i830_chipset_flush,
 };
 
 static const struct agp_i810_driver agp_i810_i915_driver = {
 	.chiptype = CHIP_I915,
 	.gen = 3,
 	.busdma_addr_mask_sz = 32,
 	.res_spec = agp_i915_res_spec,
 	.check_active = agp_i915_check_active,
 	.set_desc = agp_i810_set_desc,
 	.dump_regs = agp_i915_dump_regs,
 	.get_stolen_size = agp_i915_get_stolen_size,
 	.get_gtt_mappable_entries = agp_i915_get_gtt_mappable_entries,
 	.get_gtt_total_entries = agp_i810_get_gtt_total_entries,
 	.install_gatt = agp_i830_install_gatt,
 	.deinstall_gatt = agp_i830_deinstall_gatt,
 	.write_gtt = agp_i915_write_gtt,
 	.install_gtt_pte = agp_i915_install_gtt_pte,
 	.read_gtt_pte = agp_i915_read_gtt_pte,
 	.read_gtt_pte_paddr = agp_i915_read_gtt_pte_paddr,
 	.set_aperture = agp_i915_set_aperture,
 	.chipset_flush_setup = agp_i915_chipset_flush_setup,
 	.chipset_flush_teardown = agp_i915_chipset_flush_teardown,
 	.chipset_flush = agp_i915_chipset_flush,
 };
 
 static const struct agp_i810_driver agp_i810_g33_driver = {
 	.chiptype = CHIP_G33,
 	.gen = 3,
 	.busdma_addr_mask_sz = 36,
 	.res_spec = agp_i915_res_spec,
 	.check_active = agp_i915_check_active,
 	.set_desc = agp_i810_set_desc,
 	.dump_regs = agp_i965_dump_regs,
 	.get_stolen_size = agp_i915_get_stolen_size,
 	.get_gtt_mappable_entries = agp_i915_get_gtt_mappable_entries,
 	.get_gtt_total_entries = agp_i965_get_gtt_total_entries,
 	.install_gatt = agp_i830_install_gatt,
 	.deinstall_gatt = agp_i830_deinstall_gatt,
 	.write_gtt = agp_i915_write_gtt,
 	.install_gtt_pte = agp_i915_install_gtt_pte,
 	.read_gtt_pte = agp_i915_read_gtt_pte,
 	.read_gtt_pte_paddr = agp_i915_read_gtt_pte_paddr,
 	.set_aperture = agp_i915_set_aperture,
 	.chipset_flush_setup = agp_i965_chipset_flush_setup,
 	.chipset_flush_teardown = agp_i965_chipset_flush_teardown,
 	.chipset_flush = agp_i915_chipset_flush,
 };
 
 static const struct agp_i810_driver agp_i810_igd_driver = {
 	.chiptype = CHIP_IGD,
 	.gen = 3,
 	.busdma_addr_mask_sz = 36,
 	.res_spec = agp_i915_res_spec,
 	.check_active = agp_i915_check_active,
 	.set_desc = agp_i810_set_desc,
 	.dump_regs = agp_i915_dump_regs,
 	.get_stolen_size = agp_i915_get_stolen_size,
 	.get_gtt_mappable_entries = agp_i915_get_gtt_mappable_entries,
 	.get_gtt_total_entries = agp_i965_get_gtt_total_entries,
 	.install_gatt = agp_i830_install_gatt,
 	.deinstall_gatt = agp_i830_deinstall_gatt,
 	.write_gtt = agp_i915_write_gtt,
 	.install_gtt_pte = agp_i915_install_gtt_pte,
 	.read_gtt_pte = agp_i915_read_gtt_pte,
 	.read_gtt_pte_paddr = agp_i915_read_gtt_pte_paddr,
 	.set_aperture = agp_i915_set_aperture,
 	.chipset_flush_setup = agp_i965_chipset_flush_setup,
 	.chipset_flush_teardown = agp_i965_chipset_flush_teardown,
 	.chipset_flush = agp_i915_chipset_flush,
 };
 
 static const struct agp_i810_driver agp_i810_g965_driver = {
 	.chiptype = CHIP_I965,
 	.gen = 4,
 	.busdma_addr_mask_sz = 36,
 	.res_spec = agp_i965_res_spec,
 	.check_active = agp_i915_check_active,
 	.set_desc = agp_i810_set_desc,
 	.dump_regs = agp_i965_dump_regs,
 	.get_stolen_size = agp_i915_get_stolen_size,
 	.get_gtt_mappable_entries = agp_i915_get_gtt_mappable_entries,
 	.get_gtt_total_entries = agp_i965_get_gtt_total_entries,
 	.install_gatt = agp_i965_install_gatt,
 	.deinstall_gatt = agp_i830_deinstall_gatt,
 	.write_gtt = agp_i965_write_gtt,
 	.install_gtt_pte = agp_i965_install_gtt_pte,
 	.read_gtt_pte = agp_i965_read_gtt_pte,
 	.read_gtt_pte_paddr = agp_i915_read_gtt_pte_paddr,
 	.set_aperture = agp_i915_set_aperture,
 	.chipset_flush_setup = agp_i965_chipset_flush_setup,
 	.chipset_flush_teardown = agp_i965_chipset_flush_teardown,
 	.chipset_flush = agp_i915_chipset_flush,
 };
 
 static const struct agp_i810_driver agp_i810_g4x_driver = {
 	.chiptype = CHIP_G4X,
 	.gen = 5,
 	.busdma_addr_mask_sz = 36,
 	.res_spec = agp_i965_res_spec,
 	.check_active = agp_i915_check_active,
 	.set_desc = agp_i810_set_desc,
 	.dump_regs = agp_i965_dump_regs,
 	.get_stolen_size = agp_i915_get_stolen_size,
 	.get_gtt_mappable_entries = agp_i915_get_gtt_mappable_entries,
 	.get_gtt_total_entries = agp_gen5_get_gtt_total_entries,
 	.install_gatt = agp_g4x_install_gatt,
 	.deinstall_gatt = agp_i830_deinstall_gatt,
 	.write_gtt = agp_g4x_write_gtt,
 	.install_gtt_pte = agp_g4x_install_gtt_pte,
 	.read_gtt_pte = agp_g4x_read_gtt_pte,
 	.read_gtt_pte_paddr = agp_i915_read_gtt_pte_paddr,
 	.set_aperture = agp_i915_set_aperture,
 	.chipset_flush_setup = agp_i965_chipset_flush_setup,
 	.chipset_flush_teardown = agp_i965_chipset_flush_teardown,
 	.chipset_flush = agp_i915_chipset_flush,
 };
 
 /* For adding new devices, devid is the id of the graphics controller
  * (pci:0:2:0, for example).  The placeholder (usually at pci:0:2:1) for the
  * second head should never be added.  The bridge_offset is the offset to
  * subtract from devid to get the id of the hostb that the device is on.
  */
 static const struct agp_i810_match {
 	int devid;
 	char *name;
 	const struct agp_i810_driver *driver;
 } agp_i810_matches[] = {
 	{
 		.devid = 0x71218086,
 		.name = "Intel 82810 (i810 GMCH) SVGA controller",
 		.driver = &agp_i810_i810_driver
 	},
 	{
 		.devid = 0x71238086,
 		.name = "Intel 82810-DC100 (i810-DC100 GMCH) SVGA controller",
 		.driver = &agp_i810_i810_driver
 	},
 	{
 		.devid = 0x71258086,
 		.name = "Intel 82810E (i810E GMCH) SVGA controller",
 		.driver = &agp_i810_i810_driver
 	},
 	{
 		.devid = 0x11328086,
 		.name = "Intel 82815 (i815 GMCH) SVGA controller",
 		.driver = &agp_i810_i815_driver
 	},
 	{
 		.devid = 0x35778086,
 		.name = "Intel 82830M (830M GMCH) SVGA controller",
 		.driver = &agp_i810_i830_driver
 	},
 	{
 		.devid = 0x25628086,
 		.name = "Intel 82845M (845M GMCH) SVGA controller",
 		.driver = &agp_i810_i830_driver
 	},
 	{
 		.devid = 0x35828086,
 		.name = "Intel 82852/855GM SVGA controller",
 		.driver = &agp_i810_i855_driver
 	},
 	{
 		.devid = 0x25728086,
 		.name = "Intel 82865G (865G GMCH) SVGA controller",
 		.driver = &agp_i810_i865_driver
 	},
 	{
 		.devid = 0x25828086,
 		.name = "Intel 82915G (915G GMCH) SVGA controller",
 		.driver = &agp_i810_i915_driver
 	},
 	{
 		.devid = 0x258A8086,
 		.name = "Intel E7221 SVGA controller",
 		.driver = &agp_i810_i915_driver
 	},
 	{
 		.devid = 0x25928086,
 		.name = "Intel 82915GM (915GM GMCH) SVGA controller",
 		.driver = &agp_i810_i915_driver
 	},
 	{
 		.devid = 0x27728086,
 		.name = "Intel 82945G (945G GMCH) SVGA controller",
 		.driver = &agp_i810_i915_driver
 	},
 	{
 		.devid = 0x27A28086,
 		.name = "Intel 82945GM (945GM GMCH) SVGA controller",
 		.driver = &agp_i810_i915_driver
 	},
 	{
 		.devid = 0x27AE8086,
 		.name = "Intel 945GME SVGA controller",
 		.driver = &agp_i810_i915_driver
 	},
 	{
 		.devid = 0x29728086,
 		.name = "Intel 946GZ SVGA controller",
 		.driver = &agp_i810_g965_driver
 	},
 	{
 		.devid = 0x29828086,
 		.name = "Intel G965 SVGA controller",
 		.driver = &agp_i810_g965_driver
 	},
 	{
 		.devid = 0x29928086,
 		.name = "Intel Q965 SVGA controller",
 		.driver = &agp_i810_g965_driver
 	},
 	{
 		.devid = 0x29A28086,
 		.name = "Intel G965 SVGA controller",
 		.driver = &agp_i810_g965_driver
 	},
 	{
 		.devid = 0x29B28086,
 		.name = "Intel Q35 SVGA controller",
 		.driver = &agp_i810_g33_driver
 	},
 	{
 		.devid = 0x29C28086,
 		.name = "Intel G33 SVGA controller",
 		.driver = &agp_i810_g33_driver
 	},
 	{
 		.devid = 0x29D28086,
 		.name = "Intel Q33 SVGA controller",
 		.driver = &agp_i810_g33_driver
 	},
 	{
 		.devid = 0xA0018086,
 		.name = "Intel Pineview SVGA controller",
 		.driver = &agp_i810_igd_driver
 	},
 	{
 		.devid = 0xA0118086,
 		.name = "Intel Pineview (M) SVGA controller",
 		.driver = &agp_i810_igd_driver
 	},
 	{
 		.devid = 0x2A028086,
 		.name = "Intel GM965 SVGA controller",
 		.driver = &agp_i810_g965_driver
 	},
 	{
 		.devid = 0x2A128086,
 		.name = "Intel GME965 SVGA controller",
 		.driver = &agp_i810_g965_driver
 	},
 	{
 		.devid = 0x2A428086,
 		.name = "Intel GM45 SVGA controller",
 		.driver = &agp_i810_g4x_driver
 	},
 	{
 		.devid = 0x2E028086,
 		.name = "Intel Eaglelake SVGA controller",
 		.driver = &agp_i810_g4x_driver
 	},
 	{
 		.devid = 0x2E128086,
 		.name = "Intel Q45 SVGA controller",
 		.driver = &agp_i810_g4x_driver
 	},
 	{
 		.devid = 0x2E228086,
 		.name = "Intel G45 SVGA controller",
 		.driver = &agp_i810_g4x_driver
 	},
 	{
 		.devid = 0x2E328086,
 		.name = "Intel G41 SVGA controller",
 		.driver = &agp_i810_g4x_driver
 	},
 	{
 		.devid = 0x00428086,
 		.name = "Intel Ironlake (D) SVGA controller",
 		.driver = &agp_i810_g4x_driver
 	},
 	{
 		.devid = 0x00468086,
 		.name = "Intel Ironlake (M) SVGA controller",
 		.driver = &agp_i810_g4x_driver
 	},
 	{
 		.devid = 0,
 	}
 };
 
 static const struct agp_i810_match*
 agp_i810_match(device_t dev)
 {
 	int i, devid;
 
 	if (pci_get_class(dev) != PCIC_DISPLAY
 	    || (pci_get_subclass(dev) != PCIS_DISPLAY_VGA &&
 	    pci_get_subclass(dev) != PCIS_DISPLAY_OTHER))
 		return (NULL);
 
 	devid = pci_get_devid(dev);
 	for (i = 0; agp_i810_matches[i].devid != 0; i++) {
 		if (agp_i810_matches[i].devid == devid)
 			break;
 	}
 	if (agp_i810_matches[i].devid == 0)
 		return (NULL);
 	else
 		return (&agp_i810_matches[i]);
 }
 
 /*
  * Find bridge device.
  */
 static device_t
 agp_i810_find_bridge(device_t dev)
 {
 
 	return (pci_find_dbsf(0, 0, 0, 0));
 }
 
 static void
 agp_i810_identify(driver_t *driver, device_t parent)
 {
 
 	if (device_find_child(parent, "agp", -1) == NULL &&
 	    agp_i810_match(parent))
 		device_add_child(parent, "agp", DEVICE_UNIT_ANY);
 }
 
 static int
 agp_i810_check_active(device_t bridge_dev)
 {
 	u_int8_t smram;
 
 	smram = pci_read_config(bridge_dev, AGP_I810_SMRAM, 1);
 	if ((smram & AGP_I810_SMRAM_GMS) == AGP_I810_SMRAM_GMS_DISABLED)
 		return (ENXIO);
 	return (0);
 }
 
 static int
 agp_i830_check_active(device_t bridge_dev)
 {
 	int gcc1;
 
 	gcc1 = pci_read_config(bridge_dev, AGP_I830_GCC1, 1);
 	if ((gcc1 & AGP_I830_GCC1_DEV2) == AGP_I830_GCC1_DEV2_DISABLED)
 		return (ENXIO);
 	return (0);
 }
 
 static int
 agp_i915_check_active(device_t bridge_dev)
 {
 	int deven;
 
 	deven = pci_read_config(bridge_dev, AGP_I915_DEVEN, 4);
 	if ((deven & AGP_I915_DEVEN_D2F0) == AGP_I915_DEVEN_D2F0_DISABLED)
 		return (ENXIO);
 	return (0);
 }
 
 static void
 agp_82852_set_desc(device_t dev, const struct agp_i810_match *match)
 {
 
 	switch (pci_read_config(dev, AGP_I85X_CAPID, 1)) {
 	case AGP_I855_GME:
 		device_set_desc(dev,
 		    "Intel 82855GME (855GME GMCH) SVGA controller");
 		break;
 	case AGP_I855_GM:
 		device_set_desc(dev,
 		    "Intel 82855GM (855GM GMCH) SVGA controller");
 		break;
 	case AGP_I852_GME:
 		device_set_desc(dev,
 		    "Intel 82852GME (852GME GMCH) SVGA controller");
 		break;
 	case AGP_I852_GM:
 		device_set_desc(dev,
 		    "Intel 82852GM (852GM GMCH) SVGA controller");
 		break;
 	default:
 		device_set_desc(dev,
 		    "Intel 8285xM (85xGM GMCH) SVGA controller");
 		break;
 	}
 }
 
 static void
 agp_i810_set_desc(device_t dev, const struct agp_i810_match *match)
 {
 
 	device_set_desc(dev, match->name);
 }
 
 static int
 agp_i810_probe(device_t dev)
 {
 	device_t bdev;
 	const struct agp_i810_match *match;
 	int err;
 
 	if (resource_disabled("agp", device_get_unit(dev)))
 		return (ENXIO);
 	match = agp_i810_match(dev);
 	if (match == NULL)
 		return (ENXIO);
 
 	bdev = agp_i810_find_bridge(dev);
 	if (bdev == NULL) {
 		if (bootverbose)
 			printf("I810: can't find bridge device\n");
 		return (ENXIO);
 	}
 
 	/*
 	 * checking whether internal graphics device has been activated.
 	 */
 	err = match->driver->check_active(bdev);
 	if (err != 0) {
 		if (bootverbose)
 			printf("i810: disabled, not probing\n");
 		return (err);
 	}
 
 	match->driver->set_desc(dev, match);
 	return (BUS_PROBE_DEFAULT);
 }
 
 static void
 agp_i810_dump_regs(device_t dev)
 {
 	struct agp_i810_softc *sc = device_get_softc(dev);
 
 	device_printf(dev, "AGP_I810_PGTBL_CTL: %08x\n",
 	    bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL));
 	device_printf(dev, "AGP_I810_MISCC: 0x%04x\n",
 	    pci_read_config(sc->bdev, AGP_I810_MISCC, 2));
 }
 
 static void
 agp_i830_dump_regs(device_t dev)
 {
 	struct agp_i810_softc *sc = device_get_softc(dev);
 
 	device_printf(dev, "AGP_I810_PGTBL_CTL: %08x\n",
 	    bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL));
 	device_printf(dev, "AGP_I830_GCC1: 0x%02x\n",
 	    pci_read_config(sc->bdev, AGP_I830_GCC1, 1));
 }
 
 static void
 agp_i855_dump_regs(device_t dev)
 {
 	struct agp_i810_softc *sc = device_get_softc(dev);
 
 	device_printf(dev, "AGP_I810_PGTBL_CTL: %08x\n",
 	    bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL));
 	device_printf(dev, "AGP_I855_GCC1: 0x%02x\n",
 	    pci_read_config(sc->bdev, AGP_I855_GCC1, 1));
 }
 
 static void
 agp_i915_dump_regs(device_t dev)
 {
 	struct agp_i810_softc *sc = device_get_softc(dev);
 
 	device_printf(dev, "AGP_I810_PGTBL_CTL: %08x\n",
 	    bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL));
 	device_printf(dev, "AGP_I855_GCC1: 0x%02x\n",
 	    pci_read_config(sc->bdev, AGP_I855_GCC1, 1));
 	device_printf(dev, "AGP_I915_MSAC: 0x%02x\n",
 	    pci_read_config(sc->bdev, AGP_I915_MSAC, 1));
 }
 
 static void
 agp_i965_dump_regs(device_t dev)
 {
 	struct agp_i810_softc *sc = device_get_softc(dev);
 
 	device_printf(dev, "AGP_I965_PGTBL_CTL2: %08x\n",
 	    bus_read_4(sc->sc_res[0], AGP_I965_PGTBL_CTL2));
 	device_printf(dev, "AGP_I855_GCC1: 0x%02x\n",
 	    pci_read_config(sc->bdev, AGP_I855_GCC1, 1));
 	device_printf(dev, "AGP_I965_MSAC: 0x%02x\n",
 	    pci_read_config(sc->bdev, AGP_I965_MSAC, 1));
 }
 
 static int
 agp_i810_get_stolen_size(device_t dev)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(dev);
 	sc->stolen = 0;
 	sc->stolen_size = 0;
 	return (0);
 }
 
 static int
 agp_i830_get_stolen_size(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	unsigned int gcc1;
 
 	sc = device_get_softc(dev);
 
 	gcc1 = pci_read_config(sc->bdev, AGP_I830_GCC1, 1);
 	switch (gcc1 & AGP_I830_GCC1_GMS) {
 	case AGP_I830_GCC1_GMS_STOLEN_512:
 		sc->stolen = (512 - 132) * 1024 / 4096;
 		sc->stolen_size = 512 * 1024;
 		break;
 	case AGP_I830_GCC1_GMS_STOLEN_1024:
 		sc->stolen = (1024 - 132) * 1024 / 4096;
 		sc->stolen_size = 1024 * 1024;
 		break;
 	case AGP_I830_GCC1_GMS_STOLEN_8192:
 		sc->stolen = (8192 - 132) * 1024 / 4096;
 		sc->stolen_size = 8192 * 1024;
 		break;
 	default:
 		sc->stolen = 0;
 		device_printf(dev,
 		    "unknown memory configuration, disabling (GCC1 %x)\n",
 		    gcc1);
 		return (EINVAL);
 	}
 	return (0);
 }
 
 static int
 agp_i915_get_stolen_size(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	unsigned int gcc1, stolen, gtt_size;
 
 	sc = device_get_softc(dev);
 
 	/*
 	 * Stolen memory is set up at the beginning of the aperture by
 	 * the BIOS, consisting of the GATT followed by 4kb for the
 	 * BIOS display.
 	 */
 	switch (sc->match->driver->chiptype) {
 	case CHIP_I855:
 		gtt_size = 128;
 		break;
 	case CHIP_I915:
 		gtt_size = 256;
 		break;
 	case CHIP_I965:
 		switch (bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL) &
 			AGP_I810_PGTBL_SIZE_MASK) {
 		case AGP_I810_PGTBL_SIZE_128KB:
 			gtt_size = 128;
 			break;
 		case AGP_I810_PGTBL_SIZE_256KB:
 			gtt_size = 256;
 			break;
 		case AGP_I810_PGTBL_SIZE_512KB:
 			gtt_size = 512;
 			break;
 		case AGP_I965_PGTBL_SIZE_1MB:
 			gtt_size = 1024;
 			break;
 		case AGP_I965_PGTBL_SIZE_2MB:
 			gtt_size = 2048;
 			break;
 		case AGP_I965_PGTBL_SIZE_1_5MB:
 			gtt_size = 1024 + 512;
 			break;
 		default:
 			device_printf(dev, "Bad PGTBL size\n");
 			return (EINVAL);
 		}
 		break;
 	case CHIP_G33:
 		gcc1 = pci_read_config(sc->bdev, AGP_I855_GCC1, 2);
 		switch (gcc1 & AGP_G33_MGGC_GGMS_MASK) {
 		case AGP_G33_MGGC_GGMS_SIZE_1M:
 			gtt_size = 1024;
 			break;
 		case AGP_G33_MGGC_GGMS_SIZE_2M:
 			gtt_size = 2048;
 			break;
 		default:
 			device_printf(dev, "Bad PGTBL size\n");
 			return (EINVAL);
 		}
 		break;
 	case CHIP_IGD:
 	case CHIP_G4X:
 		gtt_size = 0;
 		break;
 	default:
 		device_printf(dev, "Bad chiptype\n");
 		return (EINVAL);
 	}
 
 	/* GCC1 is called MGGC on i915+ */
 	gcc1 = pci_read_config(sc->bdev, AGP_I855_GCC1, 1);
 	switch (gcc1 & AGP_I855_GCC1_GMS) {
 	case AGP_I855_GCC1_GMS_STOLEN_1M:
 		stolen = 1024;
 		break;
 	case AGP_I855_GCC1_GMS_STOLEN_4M:
 		stolen = 4 * 1024;
 		break;
 	case AGP_I855_GCC1_GMS_STOLEN_8M:
 		stolen = 8 * 1024;
 		break;
 	case AGP_I855_GCC1_GMS_STOLEN_16M:
 		stolen = 16 * 1024;
 		break;
 	case AGP_I855_GCC1_GMS_STOLEN_32M:
 		stolen = 32 * 1024;
 		break;
 	case AGP_I915_GCC1_GMS_STOLEN_48M:
 		stolen = sc->match->driver->gen > 2 ? 48 * 1024 : 0;
 		break;
 	case AGP_I915_GCC1_GMS_STOLEN_64M:
 		stolen = sc->match->driver->gen > 2 ? 64 * 1024 : 0;
 		break;
 	case AGP_G33_GCC1_GMS_STOLEN_128M:
 		stolen = sc->match->driver->gen > 2 ? 128 * 1024 : 0;
 		break;
 	case AGP_G33_GCC1_GMS_STOLEN_256M:
 		stolen = sc->match->driver->gen > 2 ? 256 * 1024 : 0;
 		break;
 	case AGP_G4X_GCC1_GMS_STOLEN_96M:
 		if (sc->match->driver->chiptype == CHIP_I965 ||
 		    sc->match->driver->chiptype == CHIP_G4X)
 			stolen = 96 * 1024;
 		else
 			stolen = 0;
 		break;
 	case AGP_G4X_GCC1_GMS_STOLEN_160M:
 		if (sc->match->driver->chiptype == CHIP_I965 ||
 		    sc->match->driver->chiptype == CHIP_G4X)
 			stolen = 160 * 1024;
 		else
 			stolen = 0;
 		break;
 	case AGP_G4X_GCC1_GMS_STOLEN_224M:
 		if (sc->match->driver->chiptype == CHIP_I965 ||
 		    sc->match->driver->chiptype == CHIP_G4X)
 			stolen = 224 * 1024;
 		else
 			stolen = 0;
 		break;
 	case AGP_G4X_GCC1_GMS_STOLEN_352M:
 		if (sc->match->driver->chiptype == CHIP_I965 ||
 		    sc->match->driver->chiptype == CHIP_G4X)
 			stolen = 352 * 1024;
 		else
 			stolen = 0;
 		break;
 	default:
 		device_printf(dev,
 		    "unknown memory configuration, disabling (GCC1 %x)\n",
 		    gcc1);
 		return (EINVAL);
 	}
 
 	gtt_size += 4;
 	sc->stolen_size = stolen * 1024;
 	sc->stolen = (stolen - gtt_size) * 1024 / 4096;
 
 	return (0);
 }
 
 static int
 agp_i810_get_gtt_mappable_entries(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	uint32_t ap;
 	uint16_t miscc;
 
 	sc = device_get_softc(dev);
 	miscc = pci_read_config(sc->bdev, AGP_I810_MISCC, 2);
 	if ((miscc & AGP_I810_MISCC_WINSIZE) == AGP_I810_MISCC_WINSIZE_32)
 		ap = 32;
 	else
 		ap = 64;
 	sc->gtt_mappable_entries = (ap * 1024 * 1024) >> AGP_PAGE_SHIFT;
 	return (0);
 }
 
 static int
 agp_i830_get_gtt_mappable_entries(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	uint32_t ap;
 	uint16_t gmch_ctl;
 
 	sc = device_get_softc(dev);
 	gmch_ctl = pci_read_config(sc->bdev, AGP_I830_GCC1, 2);
 	if ((gmch_ctl & AGP_I830_GCC1_GMASIZE) == AGP_I830_GCC1_GMASIZE_64)
 		ap = 64;
 	else
 		ap = 128;
 	sc->gtt_mappable_entries = (ap * 1024 * 1024) >> AGP_PAGE_SHIFT;
 	return (0);
 }
 
 static int
 agp_i915_get_gtt_mappable_entries(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	uint32_t ap;
 
 	sc = device_get_softc(dev);
 	ap = AGP_GET_APERTURE(dev);
 	sc->gtt_mappable_entries = ap >> AGP_PAGE_SHIFT;
 	return (0);
 }
 
 static int
 agp_i810_get_gtt_total_entries(device_t dev)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(dev);
 	sc->gtt_total_entries = sc->gtt_mappable_entries;
 	return (0);
 }
 
 static int
 agp_i965_get_gtt_total_entries(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	uint32_t pgetbl_ctl;
 	int error;
 
 	sc = device_get_softc(dev);
 	error = 0;
 	pgetbl_ctl = bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL);
 	switch (pgetbl_ctl & AGP_I810_PGTBL_SIZE_MASK) {
 	case AGP_I810_PGTBL_SIZE_128KB:
 		sc->gtt_total_entries = 128 * 1024 / 4;
 		break;
 	case AGP_I810_PGTBL_SIZE_256KB:
 		sc->gtt_total_entries = 256 * 1024 / 4;
 		break;
 	case AGP_I810_PGTBL_SIZE_512KB:
 		sc->gtt_total_entries = 512 * 1024 / 4;
 		break;
 	/* GTT pagetable sizes bigger than 512KB are not possible on G33! */
 	case AGP_I810_PGTBL_SIZE_1MB:
 		sc->gtt_total_entries = 1024 * 1024 / 4;
 		break;
 	case AGP_I810_PGTBL_SIZE_2MB:
 		sc->gtt_total_entries = 2 * 1024 * 1024 / 4;
 		break;
 	case AGP_I810_PGTBL_SIZE_1_5MB:
 		sc->gtt_total_entries = (1024 + 512) * 1024 / 4;
 		break;
 	default:
 		device_printf(dev, "Unknown page table size\n");
 		error = ENXIO;
 	}
 	return (error);
 }
 
 static void
 agp_gen5_adjust_pgtbl_size(device_t dev, uint32_t sz)
 {
 	struct agp_i810_softc *sc;
 	uint32_t pgetbl_ctl, pgetbl_ctl2;
 
 	sc = device_get_softc(dev);
 
 	/* Disable per-process page table. */
 	pgetbl_ctl2 = bus_read_4(sc->sc_res[0], AGP_I965_PGTBL_CTL2);
 	pgetbl_ctl2 &= ~AGP_I810_PGTBL_ENABLED;
 	bus_write_4(sc->sc_res[0], AGP_I965_PGTBL_CTL2, pgetbl_ctl2);
 
 	/* Write the new ggtt size. */
 	pgetbl_ctl = bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL);
 	pgetbl_ctl &= ~AGP_I810_PGTBL_SIZE_MASK;
 	pgetbl_ctl |= sz;
 	bus_write_4(sc->sc_res[0], AGP_I810_PGTBL_CTL, pgetbl_ctl);
 }
 
 static int
 agp_gen5_get_gtt_total_entries(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	uint16_t gcc1;
 
 	sc = device_get_softc(dev);
 
 	gcc1 = pci_read_config(sc->bdev, AGP_I830_GCC1, 2);
 	switch (gcc1 & AGP_G4x_GCC1_SIZE_MASK) {
 	case AGP_G4x_GCC1_SIZE_1M:
 	case AGP_G4x_GCC1_SIZE_VT_1M:
 		agp_gen5_adjust_pgtbl_size(dev, AGP_I810_PGTBL_SIZE_1MB);
 		break;
 	case AGP_G4x_GCC1_SIZE_VT_1_5M:
 		agp_gen5_adjust_pgtbl_size(dev, AGP_I810_PGTBL_SIZE_1_5MB);
 		break;
 	case AGP_G4x_GCC1_SIZE_2M:
 	case AGP_G4x_GCC1_SIZE_VT_2M:
 		agp_gen5_adjust_pgtbl_size(dev, AGP_I810_PGTBL_SIZE_2MB);
 		break;
 	default:
 		device_printf(dev, "Unknown page table size\n");
 		return (ENXIO);
 	}
 
 	return (agp_i965_get_gtt_total_entries(dev));
 }
 
 static int
 agp_i810_install_gatt(device_t dev)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(dev);
 
 	/* Some i810s have on-chip memory called dcache. */
 	if ((bus_read_1(sc->sc_res[0], AGP_I810_DRT) & AGP_I810_DRT_POPULATED)
 	    != 0)
 		sc->dcache_size = 4 * 1024 * 1024;
 	else
 		sc->dcache_size = 0;
 
 	/* According to the specs the gatt on the i810 must be 64k. */
 	sc->gatt->ag_virtual = kmem_alloc_contig(64 * 1024, M_NOWAIT |
 	    M_ZERO, 0, ~0, PAGE_SIZE, 0, VM_MEMATTR_WRITE_COMBINING);
 	if (sc->gatt->ag_virtual == NULL) {
 		if (bootverbose)
 			device_printf(dev, "contiguous allocation failed\n");
 		return (ENOMEM);
 	}
 
 	sc->gatt->ag_physical = vtophys((vm_offset_t)sc->gatt->ag_virtual);
 	/* Install the GATT. */
 	bus_write_4(sc->sc_res[0], AGP_I810_PGTBL_CTL,
 	    sc->gatt->ag_physical | 1);
 	return (0);
 }
 
 static void
 agp_i830_install_gatt_init(struct agp_i810_softc *sc)
 {
 	uint32_t pgtblctl;
 
 	/*
 	 * The i830 automatically initializes the 128k gatt on boot.
 	 * GATT address is already in there, make sure it's enabled.
 	 */
 	pgtblctl = bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL);
 	pgtblctl |= 1;
 	bus_write_4(sc->sc_res[0], AGP_I810_PGTBL_CTL, pgtblctl);
 
 	sc->gatt->ag_physical = pgtblctl & ~1;
 }
 
 static int
 agp_i830_install_gatt(device_t dev)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(dev);
 	agp_i830_install_gatt_init(sc);
 	return (0);
 }
 
 static int
 agp_gen4_install_gatt(device_t dev, const vm_size_t gtt_offset)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(dev);
 	pmap_change_attr((vm_offset_t)rman_get_virtual(sc->sc_res[0]) +
 	    gtt_offset, rman_get_size(sc->sc_res[0]) - gtt_offset,
 	    VM_MEMATTR_WRITE_COMBINING);
 	agp_i830_install_gatt_init(sc);
 	return (0);
 }
 
 static int
 agp_i965_install_gatt(device_t dev)
 {
 
 	return (agp_gen4_install_gatt(dev, 512 * 1024));
 }
 
 static int
 agp_g4x_install_gatt(device_t dev)
 {
 
 	return (agp_gen4_install_gatt(dev, 2 * 1024 * 1024));
 }
 
 static int
 agp_i810_attach(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	int error;
 
 	sc = device_get_softc(dev);
 	sc->bdev = agp_i810_find_bridge(dev);
 	if (sc->bdev == NULL)
 		return (ENOENT);
 
 	sc->match = agp_i810_match(dev);
 
 	agp_set_aperture_resource(dev, sc->match->driver->gen <= 2 ?
 	    AGP_APBASE : AGP_I915_GMADR);
 	error = agp_generic_attach(dev);
 	if (error)
 		return (error);
 
 	if (ptoa((vm_paddr_t)Maxmem) >
 	    (1ULL << sc->match->driver->busdma_addr_mask_sz) - 1) {
 		device_printf(dev, "agp_i810 does not support physical "
 		    "memory above %ju.\n", (uintmax_t)(1ULL <<
 		    sc->match->driver->busdma_addr_mask_sz) - 1);
 		return (ENOENT);
 	}
 
 	if (bus_alloc_resources(dev, sc->match->driver->res_spec, sc->sc_res)) {
 		agp_generic_detach(dev);
 		return (ENODEV);
 	}
 
 	sc->initial_aperture = AGP_GET_APERTURE(dev);
 	sc->gatt = malloc(sizeof(struct agp_gatt), M_AGP, M_WAITOK);
 	sc->gatt->ag_entries = AGP_GET_APERTURE(dev) >> AGP_PAGE_SHIFT;
 
 	if ((error = sc->match->driver->get_stolen_size(dev)) != 0 ||
 	    (error = sc->match->driver->install_gatt(dev)) != 0 ||
 	    (error = sc->match->driver->get_gtt_mappable_entries(dev)) != 0 ||
 	    (error = sc->match->driver->get_gtt_total_entries(dev)) != 0 ||
 	    (error = sc->match->driver->chipset_flush_setup(dev)) != 0) {
 		bus_release_resources(dev, sc->match->driver->res_spec,
 		    sc->sc_res);
 		free(sc->gatt, M_AGP);
 		agp_generic_detach(dev);
 		return (error);
 	}
 
 	intel_agp = dev;
 	device_printf(dev, "aperture size is %dM",
 	    sc->initial_aperture / 1024 / 1024);
 	if (sc->stolen > 0)
 		printf(", detected %dk stolen memory\n", sc->stolen * 4);
 	else
 		printf("\n");
 	if (bootverbose) {
 		sc->match->driver->dump_regs(dev);
 		device_printf(dev, "Mappable GTT entries: %d\n",
 		    sc->gtt_mappable_entries);
 		device_printf(dev, "Total GTT entries: %d\n",
 		    sc->gtt_total_entries);
 	}
 	return (0);
 }
 
 static void
 agp_i810_deinstall_gatt(device_t dev)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(dev);
 	bus_write_4(sc->sc_res[0], AGP_I810_PGTBL_CTL, 0);
 	kmem_free(sc->gatt->ag_virtual, 64 * 1024);
 }
 
 static void
 agp_i830_deinstall_gatt(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	unsigned int pgtblctl;
 
 	sc = device_get_softc(dev);
 	pgtblctl = bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL);
 	pgtblctl &= ~1;
 	bus_write_4(sc->sc_res[0], AGP_I810_PGTBL_CTL, pgtblctl);
 }
 
 static int
 agp_i810_detach(device_t dev)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(dev);
 	agp_free_cdev(dev);
 
 	/* Clear the GATT base. */
 	sc->match->driver->deinstall_gatt(dev);
 
 	sc->match->driver->chipset_flush_teardown(dev);
 
 	/* Put the aperture back the way it started. */
 	AGP_SET_APERTURE(dev, sc->initial_aperture);
 
 	free(sc->gatt, M_AGP);
 	bus_release_resources(dev, sc->match->driver->res_spec, sc->sc_res);
 	agp_free_res(dev);
 
 	return (0);
 }
 
 static int
 agp_i810_resume(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	sc = device_get_softc(dev);
 
 	AGP_SET_APERTURE(dev, sc->initial_aperture);
 
 	/* Install the GATT. */
 	bus_write_4(sc->sc_res[0], AGP_I810_PGTBL_CTL,
 	sc->gatt->ag_physical | 1);
 
 	return (bus_generic_resume(dev));
 }
 
 /**
  * Sets the PCI resource size of the aperture on i830-class and below chipsets,
  * while returning failure on later chipsets when an actual change is
  * requested.
  *
  * This whole function is likely bogus, as the kernel would probably need to
  * reconfigure the placement of the AGP aperture if a larger size is requested,
  * which doesn't happen currently.
  */
 static int
 agp_i810_set_aperture(device_t dev, u_int32_t aperture)
 {
 	struct agp_i810_softc *sc;
 	u_int16_t miscc;
 
 	sc = device_get_softc(dev);
 	/*
 	 * Double check for sanity.
 	 */
 	if (aperture != 32 * 1024 * 1024 && aperture != 64 * 1024 * 1024) {
 		device_printf(dev, "bad aperture size %d\n", aperture);
 		return (EINVAL);
 	}
 
 	miscc = pci_read_config(sc->bdev, AGP_I810_MISCC, 2);
 	miscc &= ~AGP_I810_MISCC_WINSIZE;
 	if (aperture == 32 * 1024 * 1024)
 		miscc |= AGP_I810_MISCC_WINSIZE_32;
 	else
 		miscc |= AGP_I810_MISCC_WINSIZE_64;
 
 	pci_write_config(sc->bdev, AGP_I810_MISCC, miscc, 2);
 	return (0);
 }
 
 static int
 agp_i830_set_aperture(device_t dev, u_int32_t aperture)
 {
 	struct agp_i810_softc *sc;
 	u_int16_t gcc1;
 
 	sc = device_get_softc(dev);
 
 	if (aperture != 64 * 1024 * 1024 &&
 	    aperture != 128 * 1024 * 1024) {
 		device_printf(dev, "bad aperture size %d\n", aperture);
 		return (EINVAL);
 	}
 	gcc1 = pci_read_config(sc->bdev, AGP_I830_GCC1, 2);
 	gcc1 &= ~AGP_I830_GCC1_GMASIZE;
 	if (aperture == 64 * 1024 * 1024)
 		gcc1 |= AGP_I830_GCC1_GMASIZE_64;
 	else
 		gcc1 |= AGP_I830_GCC1_GMASIZE_128;
 
 	pci_write_config(sc->bdev, AGP_I830_GCC1, gcc1, 2);
 	return (0);
 }
 
 static int
 agp_i915_set_aperture(device_t dev, u_int32_t aperture)
 {
 
 	return (agp_generic_set_aperture(dev, aperture));
 }
 
 static int
 agp_i810_method_set_aperture(device_t dev, u_int32_t aperture)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(dev);
 	return (sc->match->driver->set_aperture(dev, aperture));
 }
 
 /**
  * Writes a GTT entry mapping the page at the given offset from the
  * beginning of the aperture to the given physical address.  Setup the
  * caching mode according to flags.
  *
  * For gen 1, 2 and 3, GTT start is located at AGP_I810_GTT offset
  * from corresponding BAR start. For gen 4, offset is 512KB +
  * AGP_I810_GTT, for gen 5 and 6 it is 2MB + AGP_I810_GTT.
  *
  * Also, the bits of the physical page address above 4GB needs to be
  * placed into bits 40-32 of PTE.
  */
 static void
 agp_i810_install_gtt_pte(device_t dev, u_int index, vm_offset_t physical,
     int flags)
 {
 	uint32_t pte;
 
 	pte = (u_int32_t)physical | I810_PTE_VALID;
 	if (flags == AGP_DCACHE_MEMORY)
 		pte |= I810_PTE_LOCAL;
 	else if (flags == AGP_USER_CACHED_MEMORY)
 		pte |= I830_PTE_SYSTEM_CACHED;
 	agp_i810_write_gtt(dev, index, pte);
 }
 
 static void
 agp_i810_write_gtt(device_t dev, u_int index, uint32_t pte)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(dev);
 	bus_write_4(sc->sc_res[0], AGP_I810_GTT + index * 4, pte);
 	CTR2(KTR_AGP_I810, "810_pte %x %x", index, pte);
 }
 
 static void
 agp_i830_install_gtt_pte(device_t dev, u_int index, vm_offset_t physical,
     int flags)
 {
 	uint32_t pte;
 
 	pte = (u_int32_t)physical | I810_PTE_VALID;
 	if (flags == AGP_USER_CACHED_MEMORY)
 		pte |= I830_PTE_SYSTEM_CACHED;
 	agp_i810_write_gtt(dev, index, pte);
 }
 
 static void
 agp_i915_install_gtt_pte(device_t dev, u_int index, vm_offset_t physical,
     int flags)
 {
 	uint32_t pte;
 
 	pte = (u_int32_t)physical | I810_PTE_VALID;
 	if (flags == AGP_USER_CACHED_MEMORY)
 		pte |= I830_PTE_SYSTEM_CACHED;
 	pte |= (physical & 0x0000000f00000000ull) >> 28;
 	agp_i915_write_gtt(dev, index, pte);
 }
 
 static void
 agp_i915_write_gtt(device_t dev, u_int index, uint32_t pte)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(dev);
 	bus_write_4(sc->sc_res[1], index * 4, pte);
 	CTR2(KTR_AGP_I810, "915_pte %x %x", index, pte);
 }
 
 static void
 agp_i965_install_gtt_pte(device_t dev, u_int index, vm_offset_t physical,
     int flags)
 {
 	uint32_t pte;
 
 	pte = (u_int32_t)physical | I810_PTE_VALID;
 	if (flags == AGP_USER_CACHED_MEMORY)
 		pte |= I830_PTE_SYSTEM_CACHED;
 	pte |= (physical & 0x0000000f00000000ull) >> 28;
 	agp_i965_write_gtt(dev, index, pte);
 }
 
 static void
 agp_i965_write_gtt(device_t dev, u_int index, uint32_t pte)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(dev);
 	bus_write_4(sc->sc_res[0], index * 4 + (512 * 1024), pte);
 	CTR2(KTR_AGP_I810, "965_pte %x %x", index, pte);
 }
 
 static void
 agp_g4x_install_gtt_pte(device_t dev, u_int index, vm_offset_t physical,
     int flags)
 {
 	uint32_t pte;
 
 	pte = (u_int32_t)physical | I810_PTE_VALID;
 	if (flags == AGP_USER_CACHED_MEMORY)
 		pte |= I830_PTE_SYSTEM_CACHED;
 	pte |= (physical & 0x0000000f00000000ull) >> 28;
 	agp_g4x_write_gtt(dev, index, pte);
 }
 
 static void
 agp_g4x_write_gtt(device_t dev, u_int index, uint32_t pte)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(dev);
 	bus_write_4(sc->sc_res[0], index * 4 + (2 * 1024 * 1024), pte);
 	CTR2(KTR_AGP_I810, "g4x_pte %x %x", index, pte);
 }
 
 static int
 agp_i810_bind_page(device_t dev, vm_offset_t offset, vm_offset_t physical)
 {
 	struct agp_i810_softc *sc = device_get_softc(dev);
 	u_int index;
 
 	if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) {
 		device_printf(dev, "failed: offset is 0x%08jx, "
 		    "shift is %d, entries is %d\n", (intmax_t)offset,
 		    AGP_PAGE_SHIFT, sc->gatt->ag_entries);
 		return (EINVAL);
 	}
 	index = offset >> AGP_PAGE_SHIFT;
 	if (sc->stolen != 0 && index < sc->stolen) {
 		device_printf(dev, "trying to bind into stolen memory\n");
 		return (EINVAL);
 	}
 	sc->match->driver->install_gtt_pte(dev, index, physical, 0);
 	return (0);
 }
 
 static int
 agp_i810_unbind_page(device_t dev, vm_offset_t offset)
 {
 	struct agp_i810_softc *sc;
 	u_int index;
 
 	sc = device_get_softc(dev);
 	if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT))
 		return (EINVAL);
 	index = offset >> AGP_PAGE_SHIFT;
 	if (sc->stolen != 0 && index < sc->stolen) {
 		device_printf(dev, "trying to unbind from stolen memory\n");
 		return (EINVAL);
 	}
 	sc->match->driver->install_gtt_pte(dev, index, 0, 0);
 	return (0);
 }
 
 static u_int32_t
 agp_i810_read_gtt_pte(device_t dev, u_int index)
 {
 	struct agp_i810_softc *sc;
 	u_int32_t pte;
 
 	sc = device_get_softc(dev);
 	pte = bus_read_4(sc->sc_res[0], AGP_I810_GTT + index * 4);
 	return (pte);
 }
 
 static u_int32_t
 agp_i915_read_gtt_pte(device_t dev, u_int index)
 {
 	struct agp_i810_softc *sc;
 	u_int32_t pte;
 
 	sc = device_get_softc(dev);
 	pte = bus_read_4(sc->sc_res[1], index * 4);
 	return (pte);
 }
 
 static u_int32_t
 agp_i965_read_gtt_pte(device_t dev, u_int index)
 {
 	struct agp_i810_softc *sc;
 	u_int32_t pte;
 
 	sc = device_get_softc(dev);
 	pte = bus_read_4(sc->sc_res[0], index * 4 + (512 * 1024));
 	return (pte);
 }
 
 static u_int32_t
 agp_g4x_read_gtt_pte(device_t dev, u_int index)
 {
 	struct agp_i810_softc *sc;
 	u_int32_t pte;
 
 	sc = device_get_softc(dev);
 	pte = bus_read_4(sc->sc_res[0], index * 4 + (2 * 1024 * 1024));
 	return (pte);
 }
 
 static vm_paddr_t
 agp_i810_read_gtt_pte_paddr(device_t dev, u_int index)
 {
 	struct agp_i810_softc *sc;
 	u_int32_t pte;
 	vm_paddr_t res;
 
 	sc = device_get_softc(dev);
 	pte = sc->match->driver->read_gtt_pte(dev, index);
 	res = pte & ~PAGE_MASK;
 	return (res);
 }
 
 static vm_paddr_t
 agp_i915_read_gtt_pte_paddr(device_t dev, u_int index)
 {
 	struct agp_i810_softc *sc;
 	u_int32_t pte;
 	vm_paddr_t res;
 
 	sc = device_get_softc(dev);
 	pte = sc->match->driver->read_gtt_pte(dev, index);
 	res = (pte & ~PAGE_MASK) | ((pte & 0xf0) << 28);
 	return (res);
 }
 
 /*
  * Writing via memory mapped registers already flushes all TLBs.
  */
 static void
 agp_i810_flush_tlb(device_t dev)
 {
 }
 
 static int
 agp_i810_enable(device_t dev, u_int32_t mode)
 {
 
 	return (0);
 }
 
 static struct agp_memory *
 agp_i810_alloc_memory(device_t dev, int type, vm_size_t size)
 {
 	struct agp_i810_softc *sc;
 	struct agp_memory *mem;
 	vm_page_t m;
 
 	sc = device_get_softc(dev);
 
 	if ((size & (AGP_PAGE_SIZE - 1)) != 0 ||
 	    sc->agp.as_allocated + size > sc->agp.as_maxmem)
 		return (0);
 
 	if (type == 1) {
 		/*
 		 * Mapping local DRAM into GATT.
 		 */
 		if (sc->match->driver->chiptype != CHIP_I810)
 			return (0);
 		if (size != sc->dcache_size)
 			return (0);
 	} else if (type == 2) {
 		/*
 		 * Type 2 is the contiguous physical memory type, that hands
 		 * back a physical address.  This is used for cursors on i810.
 		 * Hand back as many single pages with physical as the user
 		 * wants, but only allow one larger allocation (ARGB cursor)
 		 * for simplicity.
 		 */
 		if (size != AGP_PAGE_SIZE) {
 			if (sc->argb_cursor != NULL)
 				return (0);
 
 			/* Allocate memory for ARGB cursor, if we can. */
 			sc->argb_cursor = contigmalloc(size, M_AGP,
 			   0, 0, ~0, PAGE_SIZE, 0);
 			if (sc->argb_cursor == NULL)
 				return (0);
 		}
 	}
 
 	mem = malloc(sizeof *mem, M_AGP, M_WAITOK);
 	mem->am_id = sc->agp.as_nextid++;
 	mem->am_size = size;
 	mem->am_type = type;
 	if (type != 1 && (type != 2 || size == AGP_PAGE_SIZE))
 		mem->am_obj = vm_object_allocate(OBJT_SWAP,
 		    atop(round_page(size)));
 	else
 		mem->am_obj = 0;
 
 	if (type == 2) {
 		if (size == AGP_PAGE_SIZE) {
 			/*
 			 * Allocate and wire down the page now so that we can
 			 * get its physical address.
 			 */
 			VM_OBJECT_WLOCK(mem->am_obj);
 			m = vm_page_grab(mem->am_obj, 0, VM_ALLOC_NOBUSY |
 			    VM_ALLOC_WIRED | VM_ALLOC_ZERO);
 			VM_OBJECT_WUNLOCK(mem->am_obj);
 			mem->am_physical = VM_PAGE_TO_PHYS(m);
 		} else {
 			/* Our allocation is already nicely wired down for us.
 			 * Just grab the physical address.
 			 */
 			mem->am_physical = vtophys(sc->argb_cursor);
 		}
 	} else
 		mem->am_physical = 0;
 
 	mem->am_offset = 0;
 	mem->am_is_bound = 0;
 	TAILQ_INSERT_TAIL(&sc->agp.as_memory, mem, am_link);
 	sc->agp.as_allocated += size;
 
 	return (mem);
 }
 
 static int
 agp_i810_free_memory(device_t dev, struct agp_memory *mem)
 {
 	struct agp_i810_softc *sc;
 	vm_page_t m;
 
 	if (mem->am_is_bound)
 		return (EBUSY);
 
 	sc = device_get_softc(dev);
 
 	if (mem->am_type == 2) {
 		if (mem->am_size == AGP_PAGE_SIZE) {
 			/*
 			 * Unwire the page which we wired in alloc_memory.
 			 */
 			VM_OBJECT_WLOCK(mem->am_obj);
 			m = vm_page_lookup(mem->am_obj, 0);
 			vm_page_unwire(m, PQ_INACTIVE);
 			VM_OBJECT_WUNLOCK(mem->am_obj);
 		} else {
-			contigfree(sc->argb_cursor, mem->am_size, M_AGP);
+			free(sc->argb_cursor, M_AGP);
 			sc->argb_cursor = NULL;
 		}
 	}
 
 	sc->agp.as_allocated -= mem->am_size;
 	TAILQ_REMOVE(&sc->agp.as_memory, mem, am_link);
 	if (mem->am_obj)
 		vm_object_deallocate(mem->am_obj);
 	free(mem, M_AGP);
 	return (0);
 }
 
 static int
 agp_i810_bind_memory(device_t dev, struct agp_memory *mem, vm_offset_t offset)
 {
 	struct agp_i810_softc *sc;
 	vm_offset_t i;
 
 	/* Do some sanity checks first. */
 	if ((offset & (AGP_PAGE_SIZE - 1)) != 0 ||
 	    offset + mem->am_size > AGP_GET_APERTURE(dev)) {
 		device_printf(dev, "binding memory at bad offset %#x\n",
 		    (int)offset);
 		return (EINVAL);
 	}
 
 	sc = device_get_softc(dev);
 	if (mem->am_type == 2 && mem->am_size != AGP_PAGE_SIZE) {
 		mtx_lock(&sc->agp.as_lock);
 		if (mem->am_is_bound) {
 			mtx_unlock(&sc->agp.as_lock);
 			return (EINVAL);
 		}
 		/* The memory's already wired down, just stick it in the GTT. */
 		for (i = 0; i < mem->am_size; i += AGP_PAGE_SIZE) {
 			sc->match->driver->install_gtt_pte(dev, (offset + i) >>
 			    AGP_PAGE_SHIFT, mem->am_physical + i, 0);
 		}
 		mem->am_offset = offset;
 		mem->am_is_bound = 1;
 		mtx_unlock(&sc->agp.as_lock);
 		return (0);
 	}
 
 	if (mem->am_type != 1)
 		return (agp_generic_bind_memory(dev, mem, offset));
 
 	/*
 	 * Mapping local DRAM into GATT.
 	 */
 	if (sc->match->driver->chiptype != CHIP_I810)
 		return (EINVAL);
 	for (i = 0; i < mem->am_size; i += AGP_PAGE_SIZE)
 		bus_write_4(sc->sc_res[0],
 		    AGP_I810_GTT + (i >> AGP_PAGE_SHIFT) * 4, i | 3);
 
 	return (0);
 }
 
 static int
 agp_i810_unbind_memory(device_t dev, struct agp_memory *mem)
 {
 	struct agp_i810_softc *sc;
 	vm_offset_t i;
 
 	sc = device_get_softc(dev);
 
 	if (mem->am_type == 2 && mem->am_size != AGP_PAGE_SIZE) {
 		mtx_lock(&sc->agp.as_lock);
 		if (!mem->am_is_bound) {
 			mtx_unlock(&sc->agp.as_lock);
 			return (EINVAL);
 		}
 
 		for (i = 0; i < mem->am_size; i += AGP_PAGE_SIZE) {
 			sc->match->driver->install_gtt_pte(dev,
 			    (mem->am_offset + i) >> AGP_PAGE_SHIFT, 0, 0);
 		}
 		mem->am_is_bound = 0;
 		mtx_unlock(&sc->agp.as_lock);
 		return (0);
 	}
 
 	if (mem->am_type != 1)
 		return (agp_generic_unbind_memory(dev, mem));
 
 	if (sc->match->driver->chiptype != CHIP_I810)
 		return (EINVAL);
 	for (i = 0; i < mem->am_size; i += AGP_PAGE_SIZE) {
 		sc->match->driver->install_gtt_pte(dev, i >> AGP_PAGE_SHIFT,
 		    0, 0);
 	}
 	return (0);
 }
 
 static device_method_t agp_i810_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_identify,	agp_i810_identify),
 	DEVMETHOD(device_probe,		agp_i810_probe),
 	DEVMETHOD(device_attach,	agp_i810_attach),
 	DEVMETHOD(device_detach,	agp_i810_detach),
 	DEVMETHOD(device_suspend,	bus_generic_suspend),
 	DEVMETHOD(device_resume,	agp_i810_resume),
 
 	/* AGP interface */
 	DEVMETHOD(agp_get_aperture,	agp_generic_get_aperture),
 	DEVMETHOD(agp_set_aperture,	agp_i810_method_set_aperture),
 	DEVMETHOD(agp_bind_page,	agp_i810_bind_page),
 	DEVMETHOD(agp_unbind_page,	agp_i810_unbind_page),
 	DEVMETHOD(agp_flush_tlb,	agp_i810_flush_tlb),
 	DEVMETHOD(agp_enable,		agp_i810_enable),
 	DEVMETHOD(agp_alloc_memory,	agp_i810_alloc_memory),
 	DEVMETHOD(agp_free_memory,	agp_i810_free_memory),
 	DEVMETHOD(agp_bind_memory,	agp_i810_bind_memory),
 	DEVMETHOD(agp_unbind_memory,	agp_i810_unbind_memory),
 	DEVMETHOD(agp_chipset_flush,	agp_intel_gtt_chipset_flush),
 	{ 0, 0 }
 };
 
 static driver_t agp_i810_driver = {
 	"agp",
 	agp_i810_methods,
 	sizeof(struct agp_i810_softc),
 };
 
 DRIVER_MODULE(agp_i810, vgapci, agp_i810_driver, 0, 0);
 MODULE_DEPEND(agp_i810, agp, 1, 1, 1);
 MODULE_DEPEND(agp_i810, pci, 1, 1, 1);
 
 void
 agp_intel_gtt_clear_range(device_t dev, u_int first_entry, u_int num_entries)
 {
 	struct agp_i810_softc *sc;
 	u_int i;
 
 	sc = device_get_softc(dev);
 	for (i = 0; i < num_entries; i++)
 		sc->match->driver->install_gtt_pte(dev, first_entry + i,
 		    VM_PAGE_TO_PHYS(bogus_page), 0);
 	sc->match->driver->read_gtt_pte(dev, first_entry + num_entries - 1);
 }
 
 void
 agp_intel_gtt_insert_pages(device_t dev, u_int first_entry, u_int num_entries,
     vm_page_t *pages, u_int flags)
 {
 	struct agp_i810_softc *sc;
 	u_int i;
 
 	sc = device_get_softc(dev);
 	for (i = 0; i < num_entries; i++) {
 		MPASS(pages[i]->valid == VM_PAGE_BITS_ALL);
 		MPASS(pages[i]->ref_count > 0);
 		sc->match->driver->install_gtt_pte(dev, first_entry + i,
 		    VM_PAGE_TO_PHYS(pages[i]), flags);
 	}
 	sc->match->driver->read_gtt_pte(dev, first_entry + num_entries - 1);
 }
 
 struct intel_gtt
 agp_intel_gtt_get(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	struct intel_gtt res;
 
 	sc = device_get_softc(dev);
 	res.stolen_size = sc->stolen_size;
 	res.gtt_total_entries = sc->gtt_total_entries;
 	res.gtt_mappable_entries = sc->gtt_mappable_entries;
 	res.do_idle_maps = 0;
 	res.scratch_page_dma = VM_PAGE_TO_PHYS(bogus_page);
 	if (sc->agp.as_aperture != NULL)
 		res.gma_bus_addr = rman_get_start(sc->agp.as_aperture);
 	else
 		res.gma_bus_addr = 0;
 	return (res);
 }
 
 static int
 agp_i810_chipset_flush_setup(device_t dev)
 {
 
 	return (0);
 }
 
 static void
 agp_i810_chipset_flush_teardown(device_t dev)
 {
 
 	/* Nothing to do. */
 }
 
 static void
 agp_i810_chipset_flush(device_t dev)
 {
 
 	/* Nothing to do. */
 }
 
 static void
 agp_i830_chipset_flush(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	uint32_t hic;
 	int i;
 
 	sc = device_get_softc(dev);
 	pmap_invalidate_cache();
 	hic = bus_read_4(sc->sc_res[0], AGP_I830_HIC);
 	bus_write_4(sc->sc_res[0], AGP_I830_HIC, hic | (1U << 31));
 	for (i = 0; i < 20000 /* 1 sec */; i++) {
 		hic = bus_read_4(sc->sc_res[0], AGP_I830_HIC);
 		if ((hic & (1U << 31)) == 0)
 			break;
 		DELAY(50);
 	}
 }
 
 static int
 agp_i915_chipset_flush_alloc_page(device_t dev, uint64_t start, uint64_t end)
 {
 	struct agp_i810_softc *sc;
 	device_t vga;
 
 	sc = device_get_softc(dev);
 	vga = device_get_parent(dev);
 	sc->sc_flush_page_rid = 100;
 	sc->sc_flush_page_res = BUS_ALLOC_RESOURCE(device_get_parent(vga), dev,
 	    SYS_RES_MEMORY, &sc->sc_flush_page_rid, start, end, PAGE_SIZE,
 	    RF_ACTIVE);
 	if (sc->sc_flush_page_res == NULL) {
 		device_printf(dev, "Failed to allocate flush page at 0x%jx\n",
 		    (uintmax_t)start);
 		return (EINVAL);
 	}
 	sc->sc_flush_page_vaddr = rman_get_virtual(sc->sc_flush_page_res);
 	if (bootverbose) {
 		device_printf(dev, "Allocated flush page phys 0x%jx virt %p\n",
 		    (uintmax_t)rman_get_start(sc->sc_flush_page_res),
 		    sc->sc_flush_page_vaddr);
 	}
 	return (0);
 }
 
 static void
 agp_i915_chipset_flush_free_page(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	device_t vga;
 
 	sc = device_get_softc(dev);
 	vga = device_get_parent(dev);
 	if (sc->sc_flush_page_res == NULL)
 		return;
 	BUS_DEACTIVATE_RESOURCE(device_get_parent(vga), dev,
 	    sc->sc_flush_page_res);
 	BUS_RELEASE_RESOURCE(device_get_parent(vga), dev,
 	    sc->sc_flush_page_res);
 }
 
 static int
 agp_i915_chipset_flush_setup(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	uint32_t temp;
 	int error;
 
 	sc = device_get_softc(dev);
 	temp = pci_read_config(sc->bdev, AGP_I915_IFPADDR, 4);
 	if ((temp & 1) != 0) {
 		temp &= ~1;
 		if (bootverbose)
 			device_printf(dev,
 			    "Found already configured flush page at 0x%jx\n",
 			    (uintmax_t)temp);
 		sc->sc_bios_allocated_flush_page = 1;
 		/*
 		 * In the case BIOS initialized the flush pointer (?)
 		 * register, expect that BIOS also set up the resource
 		 * for the page.
 		 */
 		error = agp_i915_chipset_flush_alloc_page(dev, temp,
 		    temp + PAGE_SIZE - 1);
 		if (error != 0)
 			return (error);
 	} else {
 		sc->sc_bios_allocated_flush_page = 0;
 		error = agp_i915_chipset_flush_alloc_page(dev, 0, 0xffffffff);
 		if (error != 0)
 			return (error);
 		temp = rman_get_start(sc->sc_flush_page_res);
 		pci_write_config(sc->bdev, AGP_I915_IFPADDR, temp | 1, 4);
 	}
 	return (0);
 }
 
 static void
 agp_i915_chipset_flush_teardown(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	uint32_t temp;
 
 	sc = device_get_softc(dev);
 	if (sc->sc_flush_page_res == NULL)
 		return;
 	if (!sc->sc_bios_allocated_flush_page) {
 		temp = pci_read_config(sc->bdev, AGP_I915_IFPADDR, 4);
 		temp &= ~1;
 		pci_write_config(sc->bdev, AGP_I915_IFPADDR, temp, 4);
 	}		
 	agp_i915_chipset_flush_free_page(dev);
 }
 
 static int
 agp_i965_chipset_flush_setup(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	uint64_t temp;
 	uint32_t temp_hi, temp_lo;
 	int error;
 
 	sc = device_get_softc(dev);
 
 	temp_hi = pci_read_config(sc->bdev, AGP_I965_IFPADDR + 4, 4);
 	temp_lo = pci_read_config(sc->bdev, AGP_I965_IFPADDR, 4);
 
 	if ((temp_lo & 1) != 0) {
 		temp = ((uint64_t)temp_hi << 32) | (temp_lo & ~1);
 		if (bootverbose)
 			device_printf(dev,
 			    "Found already configured flush page at 0x%jx\n",
 			    (uintmax_t)temp);
 		sc->sc_bios_allocated_flush_page = 1;
 		/*
 		 * In the case BIOS initialized the flush pointer (?)
 		 * register, expect that BIOS also set up the resource
 		 * for the page.
 		 */
 		error = agp_i915_chipset_flush_alloc_page(dev, temp,
 		    temp + PAGE_SIZE - 1);
 		if (error != 0)
 			return (error);
 	} else {
 		sc->sc_bios_allocated_flush_page = 0;
 		error = agp_i915_chipset_flush_alloc_page(dev, 0, ~0);
 		if (error != 0)
 			return (error);
 		temp = rman_get_start(sc->sc_flush_page_res);
 		pci_write_config(sc->bdev, AGP_I965_IFPADDR + 4,
 		    (temp >> 32) & UINT32_MAX, 4);
 		pci_write_config(sc->bdev, AGP_I965_IFPADDR,
 		    (temp & UINT32_MAX) | 1, 4);
 	}
 	return (0);
 }
 
 static void
 agp_i965_chipset_flush_teardown(device_t dev)
 {
 	struct agp_i810_softc *sc;
 	uint32_t temp_lo;
 
 	sc = device_get_softc(dev);
 	if (sc->sc_flush_page_res == NULL)
 		return;
 	if (!sc->sc_bios_allocated_flush_page) {
 		temp_lo = pci_read_config(sc->bdev, AGP_I965_IFPADDR, 4);
 		temp_lo &= ~1;
 		pci_write_config(sc->bdev, AGP_I965_IFPADDR, temp_lo, 4);
 	}
 	agp_i915_chipset_flush_free_page(dev);
 }
 
 static void
 agp_i915_chipset_flush(device_t dev)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(dev);
 	*(uint32_t *)sc->sc_flush_page_vaddr = 1;
 }
 
 int
 agp_intel_gtt_chipset_flush(device_t dev)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(dev);
 	sc->match->driver->chipset_flush(dev);
 	return (0);
 }
 
 void
 agp_intel_gtt_unmap_memory(device_t dev, struct sglist *sg_list)
 {
 }
 
 int
 agp_intel_gtt_map_memory(device_t dev, vm_page_t *pages, u_int num_entries,
     struct sglist **sg_list)
 {
 #if 0
 	struct agp_i810_softc *sc;
 #endif
 	struct sglist *sg;
 	int i;
 #if 0
 	int error;
 	bus_dma_tag_t dmat;
 #endif
 
 	if (*sg_list != NULL)
 		return (0);
 #if 0
 	sc = device_get_softc(dev);
 #endif
 	sg = sglist_alloc(num_entries, M_WAITOK /* XXXKIB */);
 	for (i = 0; i < num_entries; i++) {
 		sg->sg_segs[i].ss_paddr = VM_PAGE_TO_PHYS(pages[i]);
 		sg->sg_segs[i].ss_len = PAGE_SIZE;
 	}
 
 #if 0
 	error = bus_dma_tag_create(bus_get_dma_tag(dev),
 	    1 /* alignment */, 0 /* boundary */,
 	    1ULL << sc->match->busdma_addr_mask_sz /* lowaddr */,
 	    BUS_SPACE_MAXADDR /* highaddr */,
             NULL /* filtfunc */, NULL /* filtfuncarg */,
 	    BUS_SPACE_MAXADDR /* maxsize */,
 	    BUS_SPACE_UNRESTRICTED /* nsegments */,
 	    BUS_SPACE_MAXADDR /* maxsegsz */,
 	    0 /* flags */, NULL /* lockfunc */, NULL /* lockfuncarg */,
 	    &dmat);
 	if (error != 0) {
 		sglist_free(sg);
 		return (error);
 	}
 	/* XXXKIB */
 #endif
 	*sg_list = sg;
 	return (0);
 }
 
 static void
 agp_intel_gtt_install_pte(device_t dev, u_int index, vm_paddr_t addr,
     u_int flags)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(dev);
 	sc->match->driver->install_gtt_pte(dev, index, addr, flags);
 }
 
 void
 agp_intel_gtt_insert_sg_entries(device_t dev, struct sglist *sg_list,
     u_int first_entry, u_int flags)
 {
 	struct agp_i810_softc *sc;
 	vm_paddr_t spaddr;
 	size_t slen;
 	u_int i, j;
 
 	sc = device_get_softc(dev);
 	for (i = j = 0; j < sg_list->sg_nseg; j++) {
 		spaddr = sg_list->sg_segs[i].ss_paddr;
 		slen = sg_list->sg_segs[i].ss_len;
 		for (; slen > 0; i++) {
 			sc->match->driver->install_gtt_pte(dev, first_entry + i,
 			    spaddr, flags);
 			spaddr += AGP_PAGE_SIZE;
 			slen -= AGP_PAGE_SIZE;
 		}
 	}
 	sc->match->driver->read_gtt_pte(dev, first_entry + i - 1);
 }
 
 void
 intel_gtt_clear_range(u_int first_entry, u_int num_entries)
 {
 
 	agp_intel_gtt_clear_range(intel_agp, first_entry, num_entries);
 }
 
 void
 intel_gtt_insert_pages(u_int first_entry, u_int num_entries, vm_page_t *pages,
     u_int flags)
 {
 
 	agp_intel_gtt_insert_pages(intel_agp, first_entry, num_entries,
 	    pages, flags);
 }
 
 struct intel_gtt *
 intel_gtt_get(void)
 {
 
 	intel_private.base = agp_intel_gtt_get(intel_agp);
 	return (&intel_private.base);
 }
 
 int
 intel_gtt_chipset_flush(void)
 {
 
 	return (agp_intel_gtt_chipset_flush(intel_agp));
 }
 
 void
 intel_gtt_unmap_memory(struct sglist *sg_list)
 {
 
 	agp_intel_gtt_unmap_memory(intel_agp, sg_list);
 }
 
 int
 intel_gtt_map_memory(vm_page_t *pages, u_int num_entries,
     struct sglist **sg_list)
 {
 
 	return (agp_intel_gtt_map_memory(intel_agp, pages, num_entries,
 	    sg_list));
 }
 
 void
 intel_gtt_insert_sg_entries(struct sglist *sg_list, u_int first_entry,
     u_int flags)
 {
 
 	agp_intel_gtt_insert_sg_entries(intel_agp, sg_list, first_entry, flags);
 }
 
 void
 intel_gtt_install_pte(u_int index, vm_paddr_t addr, u_int flags)
 {
 
 	agp_intel_gtt_install_pte(intel_agp, index, addr, flags);
 }
 
 device_t
 intel_gtt_get_bridge_device(void)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(intel_agp);
 	return (sc->bdev);
 }
 
 vm_paddr_t
 intel_gtt_read_pte_paddr(u_int entry)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(intel_agp);
 	return (sc->match->driver->read_gtt_pte_paddr(intel_agp, entry));
 }
 
 u_int32_t
 intel_gtt_read_pte(u_int entry)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(intel_agp);
 	return (sc->match->driver->read_gtt_pte(intel_agp, entry));
 }
 
 void
 intel_gtt_write(u_int entry, uint32_t val)
 {
 	struct agp_i810_softc *sc;
 
 	sc = device_get_softc(intel_agp);
 	return (sc->match->driver->write_gtt(intel_agp, entry, val));
 }
diff --git a/sys/dev/bwn/if_bwn.c b/sys/dev/bwn/if_bwn.c
index 742ed63a92aa..0f44c3c94672 100644
--- a/sys/dev/bwn/if_bwn.c
+++ b/sys/dev/bwn/if_bwn.c
@@ -1,7747 +1,7739 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2009-2010 Weongyo Jeong <weongyo@freebsd.org>
  * Copyright (c) 2016 Landon Fuller <landonf@FreeBSD.org>
  * Copyright (c) 2017 The FreeBSD Foundation
  * All rights reserved.
  * 
  * Portions of this software were developed by Landon Fuller
  * under sponsorship from the FreeBSD Foundation.
  *
  * 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,
  *    without modification.
  * 2. Redistributions in binary form must reproduce at minimum a disclaimer
  *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
  *    redistribution must be conditioned upon including a substantially
  *    similar Disclaimer requirement for further binary redistribution.
  *
  * NO WARRANTY
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
  * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
  * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
  */
 
 #include <sys/cdefs.h>
 /*
  * The Broadcom Wireless LAN controller driver.
  */
 
 #include "opt_bwn.h"
 #include "opt_wlan.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/gpio.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/firmware.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_llc.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_radiotap.h>
 #include <net80211/ieee80211_regdomain.h>
 #include <net80211/ieee80211_phy.h>
 #include <net80211/ieee80211_ratectl.h>
 
 #include <dev/bhnd/bhnd.h>
 #include <dev/bhnd/bhnd_ids.h>
 
 #include <dev/bhnd/cores/chipc/chipc.h>
 #include <dev/bhnd/cores/pmu/bhnd_pmu.h>
 
 #include <dev/bwn/if_bwnreg.h>
 #include <dev/bwn/if_bwnvar.h>
 
 #include <dev/bwn/if_bwn_debug.h>
 #include <dev/bwn/if_bwn_misc.h>
 #include <dev/bwn/if_bwn_util.h>
 #include <dev/bwn/if_bwn_phy_common.h>
 #include <dev/bwn/if_bwn_phy_g.h>
 #include <dev/bwn/if_bwn_phy_lp.h>
 #include <dev/bwn/if_bwn_phy_n.h>
 
 #include "bhnd_nvram_map.h"
 
 #include "gpio_if.h"
 
 static SYSCTL_NODE(_hw, OID_AUTO, bwn, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
     "Broadcom driver parameters");
 
 /*
  * Tunable & sysctl variables.
  */
 
 #ifdef BWN_DEBUG
 static	int bwn_debug = 0;
 SYSCTL_INT(_hw_bwn, OID_AUTO, debug, CTLFLAG_RWTUN, &bwn_debug, 0,
     "Broadcom debugging printfs");
 #endif
 
 static int	bwn_bfp = 0;		/* use "Bad Frames Preemption" */
 SYSCTL_INT(_hw_bwn, OID_AUTO, bfp, CTLFLAG_RW, &bwn_bfp, 0,
     "uses Bad Frames Preemption");
 static int	bwn_bluetooth = 1;
 SYSCTL_INT(_hw_bwn, OID_AUTO, bluetooth, CTLFLAG_RW, &bwn_bluetooth, 0,
     "turns on Bluetooth Coexistence");
 static int	bwn_hwpctl = 0;
 SYSCTL_INT(_hw_bwn, OID_AUTO, hwpctl, CTLFLAG_RW, &bwn_hwpctl, 0,
     "uses H/W power control");
 static int	bwn_usedma = 1;
 SYSCTL_INT(_hw_bwn, OID_AUTO, usedma, CTLFLAG_RD, &bwn_usedma, 0,
     "uses DMA");
 TUNABLE_INT("hw.bwn.usedma", &bwn_usedma);
 static int	bwn_wme = 1;
 SYSCTL_INT(_hw_bwn, OID_AUTO, wme, CTLFLAG_RW, &bwn_wme, 0,
     "uses WME support");
 
 static void	bwn_attach_pre(struct bwn_softc *);
 static int	bwn_attach_post(struct bwn_softc *);
 static int	bwn_retain_bus_providers(struct bwn_softc *sc);
 static void	bwn_release_bus_providers(struct bwn_softc *sc);
 static void	bwn_sprom_bugfixes(device_t);
 static int	bwn_init(struct bwn_softc *);
 static void	bwn_parent(struct ieee80211com *);
 static void	bwn_start(struct bwn_softc *);
 static int	bwn_transmit(struct ieee80211com *, struct mbuf *);
 static int	bwn_attach_core(struct bwn_mac *);
 static int	bwn_phy_getinfo(struct bwn_mac *, int);
 static int	bwn_chiptest(struct bwn_mac *);
 static int	bwn_setup_channels(struct bwn_mac *, int, int);
 static void	bwn_shm_ctlword(struct bwn_mac *, uint16_t,
 		    uint16_t);
 static void	bwn_addchannels(struct ieee80211_channel [], int, int *,
 		    const struct bwn_channelinfo *, const uint8_t []);
 static int	bwn_raw_xmit(struct ieee80211_node *, struct mbuf *,
 		    const struct ieee80211_bpf_params *);
 static void	bwn_updateslot(struct ieee80211com *);
 static void	bwn_update_promisc(struct ieee80211com *);
 static void	bwn_wme_init(struct bwn_mac *);
 static int	bwn_wme_update(struct ieee80211com *);
 static void	bwn_wme_clear(struct bwn_softc *);
 static void	bwn_wme_load(struct bwn_mac *);
 static void	bwn_wme_loadparams(struct bwn_mac *,
 		    const struct wmeParams *, uint16_t);
 static void	bwn_scan_start(struct ieee80211com *);
 static void	bwn_scan_end(struct ieee80211com *);
 static void	bwn_set_channel(struct ieee80211com *);
 static struct ieee80211vap *bwn_vap_create(struct ieee80211com *,
 		    const char [IFNAMSIZ], int, enum ieee80211_opmode, int,
 		    const uint8_t [IEEE80211_ADDR_LEN],
 		    const uint8_t [IEEE80211_ADDR_LEN]);
 static void	bwn_vap_delete(struct ieee80211vap *);
 static void	bwn_stop(struct bwn_softc *);
 static int	bwn_core_forceclk(struct bwn_mac *, bool);
 static int	bwn_core_init(struct bwn_mac *);
 static void	bwn_core_start(struct bwn_mac *);
 static void	bwn_core_exit(struct bwn_mac *);
 static void	bwn_bt_disable(struct bwn_mac *);
 static int	bwn_chip_init(struct bwn_mac *);
 static void	bwn_set_txretry(struct bwn_mac *, int, int);
 static void	bwn_rate_init(struct bwn_mac *);
 static void	bwn_set_phytxctl(struct bwn_mac *);
 static void	bwn_spu_setdelay(struct bwn_mac *, int);
 static void	bwn_bt_enable(struct bwn_mac *);
 static void	bwn_set_macaddr(struct bwn_mac *);
 static void	bwn_crypt_init(struct bwn_mac *);
 static void	bwn_chip_exit(struct bwn_mac *);
 static int	bwn_fw_fillinfo(struct bwn_mac *);
 static int	bwn_fw_loaducode(struct bwn_mac *);
 static int	bwn_gpio_init(struct bwn_mac *);
 static int	bwn_fw_loadinitvals(struct bwn_mac *);
 static int	bwn_phy_init(struct bwn_mac *);
 static void	bwn_set_txantenna(struct bwn_mac *, int);
 static void	bwn_set_opmode(struct bwn_mac *);
 static void	bwn_rate_write(struct bwn_mac *, uint16_t, int);
 static uint8_t	bwn_plcp_getcck(const uint8_t);
 static uint8_t	bwn_plcp_getofdm(const uint8_t);
 static void	bwn_pio_init(struct bwn_mac *);
 static uint16_t	bwn_pio_idx2base(struct bwn_mac *, int);
 static void	bwn_pio_set_txqueue(struct bwn_mac *, struct bwn_pio_txqueue *,
 		    int);
 static void	bwn_pio_setupqueue_rx(struct bwn_mac *,
 		    struct bwn_pio_rxqueue *, int);
 static void	bwn_destroy_queue_tx(struct bwn_pio_txqueue *);
 static uint16_t	bwn_pio_read_2(struct bwn_mac *, struct bwn_pio_txqueue *,
 		    uint16_t);
 static void	bwn_pio_cancel_tx_packets(struct bwn_pio_txqueue *);
 static int	bwn_pio_rx(struct bwn_pio_rxqueue *);
 static uint8_t	bwn_pio_rxeof(struct bwn_pio_rxqueue *);
 static void	bwn_pio_handle_txeof(struct bwn_mac *,
 		    const struct bwn_txstatus *);
 static uint16_t	bwn_pio_rx_read_2(struct bwn_pio_rxqueue *, uint16_t);
 static uint32_t	bwn_pio_rx_read_4(struct bwn_pio_rxqueue *, uint16_t);
 static void	bwn_pio_rx_write_2(struct bwn_pio_rxqueue *, uint16_t,
 		    uint16_t);
 static void	bwn_pio_rx_write_4(struct bwn_pio_rxqueue *, uint16_t,
 		    uint32_t);
 static int	bwn_pio_tx_start(struct bwn_mac *, struct ieee80211_node *,
 		    struct mbuf **);
 static struct bwn_pio_txqueue *bwn_pio_select(struct bwn_mac *, uint8_t);
 static uint32_t	bwn_pio_write_multi_4(struct bwn_mac *,
 		    struct bwn_pio_txqueue *, uint32_t, const void *, int);
 static void	bwn_pio_write_4(struct bwn_mac *, struct bwn_pio_txqueue *,
 		    uint16_t, uint32_t);
 static uint16_t	bwn_pio_write_multi_2(struct bwn_mac *,
 		    struct bwn_pio_txqueue *, uint16_t, const void *, int);
 static uint16_t	bwn_pio_write_mbuf_2(struct bwn_mac *,
 		    struct bwn_pio_txqueue *, uint16_t, struct mbuf *);
 static struct bwn_pio_txqueue *bwn_pio_parse_cookie(struct bwn_mac *,
 		    uint16_t, struct bwn_pio_txpkt **);
 static void	bwn_dma_init(struct bwn_mac *);
 static void	bwn_dma_rxdirectfifo(struct bwn_mac *, int, uint8_t);
 static uint16_t	bwn_dma_base(int, int);
 static void	bwn_dma_ringfree(struct bwn_dma_ring **);
 static void	bwn_dma_32_getdesc(struct bwn_dma_ring *,
 		    int, struct bwn_dmadesc_generic **,
 		    struct bwn_dmadesc_meta **);
 static void	bwn_dma_32_setdesc(struct bwn_dma_ring *,
 		    struct bwn_dmadesc_generic *, bus_addr_t, uint16_t, int,
 		    int, int);
 static void	bwn_dma_32_start_transfer(struct bwn_dma_ring *, int);
 static void	bwn_dma_32_suspend(struct bwn_dma_ring *);
 static void	bwn_dma_32_resume(struct bwn_dma_ring *);
 static int	bwn_dma_32_get_curslot(struct bwn_dma_ring *);
 static void	bwn_dma_32_set_curslot(struct bwn_dma_ring *, int);
 static void	bwn_dma_64_getdesc(struct bwn_dma_ring *,
 		    int, struct bwn_dmadesc_generic **,
 		    struct bwn_dmadesc_meta **);
 static void	bwn_dma_64_setdesc(struct bwn_dma_ring *,
 		    struct bwn_dmadesc_generic *, bus_addr_t, uint16_t, int,
 		    int, int);
 static void	bwn_dma_64_start_transfer(struct bwn_dma_ring *, int);
 static void	bwn_dma_64_suspend(struct bwn_dma_ring *);
 static void	bwn_dma_64_resume(struct bwn_dma_ring *);
 static int	bwn_dma_64_get_curslot(struct bwn_dma_ring *);
 static void	bwn_dma_64_set_curslot(struct bwn_dma_ring *, int);
 static int	bwn_dma_allocringmemory(struct bwn_dma_ring *);
 static void	bwn_dma_setup(struct bwn_dma_ring *);
 static void	bwn_dma_free_ringmemory(struct bwn_dma_ring *);
 static void	bwn_dma_cleanup(struct bwn_dma_ring *);
 static void	bwn_dma_free_descbufs(struct bwn_dma_ring *);
 static int	bwn_dma_tx_reset(struct bwn_mac *, uint16_t, int);
 static void	bwn_dma_rx(struct bwn_dma_ring *);
 static int	bwn_dma_rx_reset(struct bwn_mac *, uint16_t, int);
 static void	bwn_dma_free_descbuf(struct bwn_dma_ring *,
 		    struct bwn_dmadesc_meta *);
 static void	bwn_dma_set_redzone(struct bwn_dma_ring *, struct mbuf *);
 static void	bwn_dma_ring_addr(void *, bus_dma_segment_t *, int, int);
 static int	bwn_dma_freeslot(struct bwn_dma_ring *);
 static int	bwn_dma_nextslot(struct bwn_dma_ring *, int);
 static void	bwn_dma_rxeof(struct bwn_dma_ring *, int *);
 static int	bwn_dma_newbuf(struct bwn_dma_ring *,
 		    struct bwn_dmadesc_generic *, struct bwn_dmadesc_meta *,
 		    int);
 static void	bwn_dma_buf_addr(void *, bus_dma_segment_t *, int,
 		    bus_size_t, int);
 static uint8_t	bwn_dma_check_redzone(struct bwn_dma_ring *, struct mbuf *);
 static void	bwn_ratectl_tx_complete(const struct ieee80211_node *,
 		    const struct bwn_txstatus *);
 static void	bwn_dma_handle_txeof(struct bwn_mac *,
 		    const struct bwn_txstatus *);
 static int	bwn_dma_tx_start(struct bwn_mac *, struct ieee80211_node *,
 		    struct mbuf **);
 static int	bwn_dma_getslot(struct bwn_dma_ring *);
 static struct bwn_dma_ring *bwn_dma_select(struct bwn_mac *,
 		    uint8_t);
 static int	bwn_dma_attach(struct bwn_mac *);
 static struct bwn_dma_ring *bwn_dma_ringsetup(struct bwn_mac *,
 		    int, int);
 static struct bwn_dma_ring *bwn_dma_parse_cookie(struct bwn_mac *,
 		    const struct bwn_txstatus *, uint16_t, int *);
 static void	bwn_dma_free(struct bwn_mac *);
 static int	bwn_fw_gets(struct bwn_mac *, enum bwn_fwtype);
 static int	bwn_fw_get(struct bwn_mac *, enum bwn_fwtype,
 		    const char *, struct bwn_fwfile *);
 static void	bwn_release_firmware(struct bwn_mac *);
 static void	bwn_do_release_fw(struct bwn_fwfile *);
 static uint16_t	bwn_fwcaps_read(struct bwn_mac *);
 static int	bwn_fwinitvals_write(struct bwn_mac *,
 		    const struct bwn_fwinitvals *, size_t, size_t);
 static uint16_t	bwn_ant2phy(int);
 static void	bwn_mac_write_bssid(struct bwn_mac *);
 static void	bwn_mac_setfilter(struct bwn_mac *, uint16_t,
 		    const uint8_t *);
 static void	bwn_key_dowrite(struct bwn_mac *, uint8_t, uint8_t,
 		    const uint8_t *, size_t, const uint8_t *);
 static void	bwn_key_macwrite(struct bwn_mac *, uint8_t,
 		    const uint8_t *);
 static void	bwn_key_write(struct bwn_mac *, uint8_t, uint8_t,
 		    const uint8_t *);
 static void	bwn_phy_exit(struct bwn_mac *);
 static void	bwn_core_stop(struct bwn_mac *);
 static int	bwn_switch_band(struct bwn_softc *,
 		    struct ieee80211_channel *);
 static int	bwn_phy_reset(struct bwn_mac *);
 static int	bwn_newstate(struct ieee80211vap *, enum ieee80211_state, int);
 static void	bwn_set_pretbtt(struct bwn_mac *);
 static int	bwn_intr(void *);
 static void	bwn_intrtask(void *, int);
 static void	bwn_restart(struct bwn_mac *, const char *);
 static void	bwn_intr_ucode_debug(struct bwn_mac *);
 static void	bwn_intr_tbtt_indication(struct bwn_mac *);
 static void	bwn_intr_atim_end(struct bwn_mac *);
 static void	bwn_intr_beacon(struct bwn_mac *);
 static void	bwn_intr_pmq(struct bwn_mac *);
 static void	bwn_intr_noise(struct bwn_mac *);
 static void	bwn_intr_txeof(struct bwn_mac *);
 static void	bwn_hwreset(void *, int);
 static void	bwn_handle_fwpanic(struct bwn_mac *);
 static void	bwn_load_beacon0(struct bwn_mac *);
 static void	bwn_load_beacon1(struct bwn_mac *);
 static uint32_t	bwn_jssi_read(struct bwn_mac *);
 static void	bwn_noise_gensample(struct bwn_mac *);
 static void	bwn_handle_txeof(struct bwn_mac *,
 		    const struct bwn_txstatus *);
 static void	bwn_rxeof(struct bwn_mac *, struct mbuf *, const void *);
 static void	bwn_phy_txpower_check(struct bwn_mac *, uint32_t);
 static int	bwn_tx_start(struct bwn_softc *, struct ieee80211_node *,
 		    struct mbuf *);
 static int	bwn_tx_isfull(struct bwn_softc *, struct mbuf *);
 static int	bwn_set_txhdr(struct bwn_mac *,
 		    struct ieee80211_node *, struct mbuf *, struct bwn_txhdr *,
 		    uint16_t);
 static void	bwn_plcp_genhdr(struct bwn_plcp4 *, const uint16_t,
 		    const uint8_t);
 static uint8_t	bwn_antenna_sanitize(struct bwn_mac *, uint8_t);
 static uint8_t	bwn_get_fbrate(uint8_t);
 static void	bwn_txpwr(void *, int);
 static void	bwn_tasks(void *);
 static void	bwn_task_15s(struct bwn_mac *);
 static void	bwn_task_30s(struct bwn_mac *);
 static void	bwn_task_60s(struct bwn_mac *);
 static int	bwn_plcp_get_ofdmrate(struct bwn_mac *, struct bwn_plcp6 *,
 		    uint8_t);
 static int	bwn_plcp_get_cckrate(struct bwn_mac *, struct bwn_plcp6 *);
 static void	bwn_rx_radiotap(struct bwn_mac *, struct mbuf *,
 		    const struct bwn_rxhdr4 *, struct bwn_plcp6 *, int,
 		    int, int);
 static void	bwn_tsf_read(struct bwn_mac *, uint64_t *);
 static void	bwn_set_slot_time(struct bwn_mac *, uint16_t);
 static void	bwn_watchdog(void *);
 static void	bwn_dma_stop(struct bwn_mac *);
 static void	bwn_pio_stop(struct bwn_mac *);
 static void	bwn_dma_ringstop(struct bwn_dma_ring **);
 static int	bwn_led_attach(struct bwn_mac *);
 static void	bwn_led_newstate(struct bwn_mac *, enum ieee80211_state);
 static void	bwn_led_event(struct bwn_mac *, int);
 static void	bwn_led_blink_start(struct bwn_mac *, int, int);
 static void	bwn_led_blink_next(void *);
 static void	bwn_led_blink_end(void *);
 static void	bwn_rfswitch(void *);
 static void	bwn_rf_turnon(struct bwn_mac *);
 static void	bwn_rf_turnoff(struct bwn_mac *);
 static void	bwn_sysctl_node(struct bwn_softc *);
 
 static const struct bwn_channelinfo bwn_chantable_bg = {
 	.channels = {
 		{ 2412,  1, 30 }, { 2417,  2, 30 }, { 2422,  3, 30 },
 		{ 2427,  4, 30 }, { 2432,  5, 30 }, { 2437,  6, 30 },
 		{ 2442,  7, 30 }, { 2447,  8, 30 }, { 2452,  9, 30 },
 		{ 2457, 10, 30 }, { 2462, 11, 30 }, { 2467, 12, 30 },
 		{ 2472, 13, 30 }, { 2484, 14, 30 } },
 	.nchannels = 14
 };
 
 static const struct bwn_channelinfo bwn_chantable_a = {
 	.channels = {
 		{ 5170,  34, 30 }, { 5180,  36, 30 }, { 5190,  38, 30 },
 		{ 5200,  40, 30 }, { 5210,  42, 30 }, { 5220,  44, 30 },
 		{ 5230,  46, 30 }, { 5240,  48, 30 }, { 5260,  52, 30 },
 		{ 5280,  56, 30 }, { 5300,  60, 30 }, { 5320,  64, 30 },
 		{ 5500, 100, 30 }, { 5520, 104, 30 }, { 5540, 108, 30 },
 		{ 5560, 112, 30 }, { 5580, 116, 30 }, { 5600, 120, 30 },
 		{ 5620, 124, 30 }, { 5640, 128, 30 }, { 5660, 132, 30 },
 		{ 5680, 136, 30 }, { 5700, 140, 30 }, { 5745, 149, 30 },
 		{ 5765, 153, 30 }, { 5785, 157, 30 }, { 5805, 161, 30 },
 		{ 5825, 165, 30 }, { 5920, 184, 30 }, { 5940, 188, 30 },
 		{ 5960, 192, 30 }, { 5980, 196, 30 }, { 6000, 200, 30 },
 		{ 6020, 204, 30 }, { 6040, 208, 30 }, { 6060, 212, 30 },
 		{ 6080, 216, 30 } },
 	.nchannels = 37
 };
 
 #if 0
 static const struct bwn_channelinfo bwn_chantable_n = {
 	.channels = {
 		{ 5160,  32, 30 }, { 5170,  34, 30 }, { 5180,  36, 30 },
 		{ 5190,  38, 30 }, { 5200,  40, 30 }, { 5210,  42, 30 },
 		{ 5220,  44, 30 }, { 5230,  46, 30 }, { 5240,  48, 30 },
 		{ 5250,  50, 30 }, { 5260,  52, 30 }, { 5270,  54, 30 },
 		{ 5280,  56, 30 }, { 5290,  58, 30 }, { 5300,  60, 30 },
 		{ 5310,  62, 30 }, { 5320,  64, 30 }, { 5330,  66, 30 },
 		{ 5340,  68, 30 }, { 5350,  70, 30 }, { 5360,  72, 30 },
 		{ 5370,  74, 30 }, { 5380,  76, 30 }, { 5390,  78, 30 },
 		{ 5400,  80, 30 }, { 5410,  82, 30 }, { 5420,  84, 30 },
 		{ 5430,  86, 30 }, { 5440,  88, 30 }, { 5450,  90, 30 },
 		{ 5460,  92, 30 }, { 5470,  94, 30 }, { 5480,  96, 30 },
 		{ 5490,  98, 30 }, { 5500, 100, 30 }, { 5510, 102, 30 },
 		{ 5520, 104, 30 }, { 5530, 106, 30 }, { 5540, 108, 30 },
 		{ 5550, 110, 30 }, { 5560, 112, 30 }, { 5570, 114, 30 },
 		{ 5580, 116, 30 }, { 5590, 118, 30 }, { 5600, 120, 30 },
 		{ 5610, 122, 30 }, { 5620, 124, 30 }, { 5630, 126, 30 },
 		{ 5640, 128, 30 }, { 5650, 130, 30 }, { 5660, 132, 30 },
 		{ 5670, 134, 30 }, { 5680, 136, 30 }, { 5690, 138, 30 },
 		{ 5700, 140, 30 }, { 5710, 142, 30 }, { 5720, 144, 30 },
 		{ 5725, 145, 30 }, { 5730, 146, 30 }, { 5735, 147, 30 },
 		{ 5740, 148, 30 }, { 5745, 149, 30 }, { 5750, 150, 30 },
 		{ 5755, 151, 30 }, { 5760, 152, 30 }, { 5765, 153, 30 },
 		{ 5770, 154, 30 }, { 5775, 155, 30 }, { 5780, 156, 30 },
 		{ 5785, 157, 30 }, { 5790, 158, 30 }, { 5795, 159, 30 },
 		{ 5800, 160, 30 }, { 5805, 161, 30 }, { 5810, 162, 30 },
 		{ 5815, 163, 30 }, { 5820, 164, 30 }, { 5825, 165, 30 },
 		{ 5830, 166, 30 }, { 5840, 168, 30 }, { 5850, 170, 30 },
 		{ 5860, 172, 30 }, { 5870, 174, 30 }, { 5880, 176, 30 },
 		{ 5890, 178, 30 }, { 5900, 180, 30 }, { 5910, 182, 30 },
 		{ 5920, 184, 30 }, { 5930, 186, 30 }, { 5940, 188, 30 },
 		{ 5950, 190, 30 }, { 5960, 192, 30 }, { 5970, 194, 30 },
 		{ 5980, 196, 30 }, { 5990, 198, 30 }, { 6000, 200, 30 },
 		{ 6010, 202, 30 }, { 6020, 204, 30 }, { 6030, 206, 30 },
 		{ 6040, 208, 30 }, { 6050, 210, 30 }, { 6060, 212, 30 },
 		{ 6070, 214, 30 }, { 6080, 216, 30 }, { 6090, 218, 30 },
 		{ 6100, 220, 30 }, { 6110, 222, 30 }, { 6120, 224, 30 },
 		{ 6130, 226, 30 }, { 6140, 228, 30 } },
 	.nchannels = 110
 };
 #endif
 
 #define	VENDOR_LED_ACT(vendor)				\
 {							\
 	.vid = PCI_VENDOR_##vendor,			\
 	.led_act = { BWN_VENDOR_LED_ACT_##vendor }	\
 }
 
 static const struct {
 	uint16_t	vid;
 	uint8_t		led_act[BWN_LED_MAX];
 } bwn_vendor_led_act[] = {
 	VENDOR_LED_ACT(HP_COMPAQ),
 	VENDOR_LED_ACT(ASUSTEK)
 };
 
 static const uint8_t bwn_default_led_act[BWN_LED_MAX] =
 	{ BWN_VENDOR_LED_ACT_DEFAULT };
 
 #undef VENDOR_LED_ACT
 
 static const char *bwn_led_vars[] = {
 	BHND_NVAR_LEDBH0,
 	BHND_NVAR_LEDBH1,
 	BHND_NVAR_LEDBH2,
 	BHND_NVAR_LEDBH3
 };
 
 static const struct {
 	int		on_dur;
 	int		off_dur;
 } bwn_led_duration[109] = {
 	[0]	= { 400, 100 },
 	[2]	= { 150, 75 },
 	[4]	= { 90, 45 },
 	[11]	= { 66, 34 },
 	[12]	= { 53, 26 },
 	[18]	= { 42, 21 },
 	[22]	= { 35, 17 },
 	[24]	= { 32, 16 },
 	[36]	= { 21, 10 },
 	[48]	= { 16, 8 },
 	[72]	= { 11, 5 },
 	[96]	= { 9, 4 },
 	[108]	= { 7, 3 }
 };
 
 static const uint16_t bwn_wme_shm_offsets[] = {
 	[0] = BWN_WME_BESTEFFORT,
 	[1] = BWN_WME_BACKGROUND,
 	[2] = BWN_WME_VOICE,
 	[3] = BWN_WME_VIDEO,
 };
 
 /* Supported D11 core revisions */
 #define	BWN_DEV(_hwrev)	{{					\
 	BHND_MATCH_CORE(BHND_MFGID_BCM, BHND_COREID_D11),	\
 	BHND_MATCH_CORE_REV(_hwrev),				\
 }}
 static const struct bhnd_device bwn_devices[] = {
 	BWN_DEV(HWREV_RANGE(5, 16)),
 	BWN_DEV(HWREV_EQ(23)),
 	BHND_DEVICE_END
 };
 
 /* D11 quirks when bridged via a PCI host bridge core */
 static const struct bhnd_device_quirk pci_bridge_quirks[] = {
 	BHND_CORE_QUIRK	(HWREV_LTE(10),	BWN_QUIRK_UCODE_SLOWCLOCK_WAR),
 	BHND_DEVICE_QUIRK_END
 };
 
 /* D11 quirks when bridged via a PCMCIA host bridge core */
 static const struct bhnd_device_quirk pcmcia_bridge_quirks[] = {
 	BHND_CORE_QUIRK	(HWREV_ANY,	BWN_QUIRK_NODMA),
 	BHND_DEVICE_QUIRK_END
 };
 
 /* Host bridge cores for which D11 quirk flags should be applied */
 static const struct bhnd_device bridge_devices[] = {
 	BHND_DEVICE(BCM, PCI,		NULL, pci_bridge_quirks),
 	BHND_DEVICE(BCM, PCMCIA,	NULL, pcmcia_bridge_quirks),
 	BHND_DEVICE_END
 };
 
 static int
 bwn_probe(device_t dev)
 {
 	const struct bhnd_device *id;
 
 	id = bhnd_device_lookup(dev, bwn_devices, sizeof(bwn_devices[0]));
 	if (id == NULL)
 		return (ENXIO);
 
 	bhnd_set_default_core_desc(dev);
 	return (BUS_PROBE_DEFAULT);
 }
 
 static int
 bwn_attach(device_t dev)
 {
 	struct bwn_mac		*mac;
 	struct bwn_softc	*sc;
 	device_t		 parent, hostb;
 	char			 chip_name[BHND_CHIPID_MAX_NAMELEN];
 	int			 error;
 
 	sc = device_get_softc(dev);
 	sc->sc_dev = dev;
 #ifdef BWN_DEBUG
 	sc->sc_debug = bwn_debug;
 #endif
 
 	mac = NULL;
 
 	/* Determine the driver quirks applicable to this device, including any
 	 * quirks specific to the bus host bridge core (if any) */
 	sc->sc_quirks = bhnd_device_quirks(dev, bwn_devices,
 	    sizeof(bwn_devices[0]));
 
 	parent = device_get_parent(dev);
 	if ((hostb = bhnd_bus_find_hostb_device(parent)) != NULL) {
 		sc->sc_quirks |= bhnd_device_quirks(hostb, bridge_devices,
 		    sizeof(bridge_devices[0]));
 	}
 
 	/* DMA explicitly disabled? */
 	if (!bwn_usedma)
 		sc->sc_quirks |= BWN_QUIRK_NODMA;
 
 	/* Fetch our chip identification and board info */
 	sc->sc_cid = *bhnd_get_chipid(dev);
 	if ((error = bhnd_read_board_info(dev, &sc->sc_board_info))) {
 		device_printf(sc->sc_dev, "couldn't read board info\n");
 		return (error);
 	}
 
 	/* Allocate our D11 register block and PMU state */
 	sc->sc_mem_rid = 0;
 	sc->sc_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
 	    &sc->sc_mem_rid, RF_ACTIVE);
 	if (sc->sc_mem_res == NULL) {
 		device_printf(sc->sc_dev, "couldn't allocate registers\n");
 		return (error);
 	}
 
 	if ((error = bhnd_alloc_pmu(sc->sc_dev))) {
 		bus_release_resource(sc->sc_dev, SYS_RES_MEMORY,
 		    sc->sc_mem_rid, sc->sc_mem_res);
 		return (error);
 	}
 
 	/* Retain references to all required bus service providers */
 	if ((error = bwn_retain_bus_providers(sc)))
 		goto fail;
 
 	/* Fetch mask of available antennas */
 	error = bhnd_nvram_getvar_uint8(sc->sc_dev, BHND_NVAR_AA2G,
 	    &sc->sc_ant2g);
 	if (error) {
 		device_printf(sc->sc_dev, "error determining 2GHz antenna "
 		    "availability from NVRAM: %d\n", error);
 		goto fail;
 	}
 
 	error = bhnd_nvram_getvar_uint8(sc->sc_dev, BHND_NVAR_AA5G,
 	    &sc->sc_ant5g);
 	if (error) {
 		device_printf(sc->sc_dev, "error determining 5GHz antenna "
 		    "availability from NVRAM: %d\n", error);
 		goto fail;
 	}
 
 	if ((sc->sc_flags & BWN_FLAG_ATTACHED) == 0) {
 		bwn_attach_pre(sc);
 		bwn_sprom_bugfixes(dev);
 		sc->sc_flags |= BWN_FLAG_ATTACHED;
 	}
 
 	mac = malloc(sizeof(*mac), M_DEVBUF, M_WAITOK | M_ZERO);
 	mac->mac_sc = sc;
 	mac->mac_status = BWN_MAC_STATUS_UNINIT;
 	if (bwn_bfp != 0)
 		mac->mac_flags |= BWN_MAC_FLAG_BADFRAME_PREEMP;
 
 	TASK_INIT(&mac->mac_hwreset, 0, bwn_hwreset, mac);
 	NET_TASK_INIT(&mac->mac_intrtask, 0, bwn_intrtask, mac);
 	TASK_INIT(&mac->mac_txpower, 0, bwn_txpwr, mac);
 
 	error = bwn_attach_core(mac);
 	if (error)
 		goto fail;
 	error = bwn_led_attach(mac);
 	if (error)
 		goto fail;
 
 	bhnd_format_chip_id(chip_name, sizeof(chip_name), sc->sc_cid.chip_id);
 	device_printf(sc->sc_dev, "WLAN (%s rev %u sromrev %u) "
 	    "PHY (analog %d type %d rev %d) RADIO (manuf %#x ver %#x rev %d)\n",
 	    chip_name, bhnd_get_hwrev(sc->sc_dev),
 	    sc->sc_board_info.board_srom_rev, mac->mac_phy.analog,
 	    mac->mac_phy.type, mac->mac_phy.rev, mac->mac_phy.rf_manuf,
 	    mac->mac_phy.rf_ver, mac->mac_phy.rf_rev);
 	if (mac->mac_flags & BWN_MAC_FLAG_DMA)
 		device_printf(sc->sc_dev, "DMA (%d bits)\n", mac->mac_dmatype);
 	else
 		device_printf(sc->sc_dev, "PIO\n");
 
 #ifdef	BWN_GPL_PHY
 	device_printf(sc->sc_dev,
 	    "Note: compiled with BWN_GPL_PHY; includes GPLv2 code\n");
 #endif
 
 	mac->mac_rid_irq = 0;
 	mac->mac_res_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ,
 	    &mac->mac_rid_irq, RF_ACTIVE | RF_SHAREABLE);
 
 	if (mac->mac_res_irq == NULL) {
 		device_printf(sc->sc_dev, "couldn't allocate IRQ resource\n");
 		error = ENXIO;
 		goto fail;
 	}
 
 	error = bus_setup_intr(dev, mac->mac_res_irq,
 	    INTR_TYPE_NET | INTR_MPSAFE, bwn_intr, NULL, mac,
 	    &mac->mac_intrhand);
 	if (error != 0) {
 		device_printf(sc->sc_dev, "couldn't setup interrupt (%d)\n",
 		    error);
 		goto fail;
 	}
 
 	TAILQ_INSERT_TAIL(&sc->sc_maclist, mac, mac_list);
 
 	/*
 	 * calls attach-post routine
 	 */
 	if ((sc->sc_flags & BWN_FLAG_ATTACHED) != 0)
 		bwn_attach_post(sc);
 
 	return (0);
 fail:
 	if (mac != NULL && mac->mac_res_irq != NULL) {
 		bus_release_resource(dev, SYS_RES_IRQ, mac->mac_rid_irq,
 		    mac->mac_res_irq);
 	}
 
 	free(mac, M_DEVBUF);
 	bhnd_release_pmu(dev);
 	bwn_release_bus_providers(sc);
 
 	if (sc->sc_mem_res != NULL) {
 		bus_release_resource(sc->sc_dev, SYS_RES_MEMORY,
 		    sc->sc_mem_rid, sc->sc_mem_res);
 	}
 
 	return (error);
 }
 
 static int
 bwn_retain_bus_providers(struct bwn_softc *sc)
 {
 	struct chipc_caps *ccaps;
 
 	sc->sc_chipc = bhnd_retain_provider(sc->sc_dev, BHND_SERVICE_CHIPC);
 	if (sc->sc_chipc == NULL) {
 		device_printf(sc->sc_dev, "ChipCommon device not found\n");
 		goto failed;
 	}
 
 	ccaps = BHND_CHIPC_GET_CAPS(sc->sc_chipc);
 
 	sc->sc_gpio = bhnd_retain_provider(sc->sc_dev, BHND_SERVICE_GPIO);
 	if (sc->sc_gpio == NULL) {
 		device_printf(sc->sc_dev, "GPIO device not found\n");
 		goto failed;
 	}
 
 	if (ccaps->pmu) {
 		sc->sc_pmu = bhnd_retain_provider(sc->sc_dev, BHND_SERVICE_PMU);
 		if (sc->sc_pmu == NULL) {
 			device_printf(sc->sc_dev, "PMU device not found\n");
 			goto failed;
 		}
 	}
 
 	return (0);
 
 failed:
 	bwn_release_bus_providers(sc);
 	return (ENXIO);
 }
 
 static void
 bwn_release_bus_providers(struct bwn_softc *sc)
 {
 #define	BWN_RELEASE_PROV(_sc, _prov, _service)	do {			\
 	if ((_sc)-> _prov != NULL) {					\
 		bhnd_release_provider((_sc)->sc_dev, (_sc)-> _prov,	\
 		    (_service));					\
 		(_sc)-> _prov = NULL;					\
 	}								\
 } while (0)
 
 	BWN_RELEASE_PROV(sc, sc_chipc, BHND_SERVICE_CHIPC);
 	BWN_RELEASE_PROV(sc, sc_gpio, BHND_SERVICE_GPIO);
 	BWN_RELEASE_PROV(sc, sc_pmu, BHND_SERVICE_PMU);
 
 #undef	BWN_RELEASE_PROV
 }
 
 static int
 bwn_attach_post(struct bwn_softc *sc)
 {
 	struct ieee80211com	*ic;
 	const char		*mac_varname;
 	u_int			 core_unit;
 	int			 error;
 
 	ic = &sc->sc_ic;
 
 	ic->ic_softc = sc;
 	ic->ic_name = device_get_nameunit(sc->sc_dev);
 	/* XXX not right but it's not used anywhere important */
 	ic->ic_phytype = IEEE80211_T_OFDM;
 	ic->ic_opmode = IEEE80211_M_STA;
 	ic->ic_caps =
 		  IEEE80211_C_STA		/* station mode supported */
 		| IEEE80211_C_MONITOR		/* monitor mode */
 		| IEEE80211_C_AHDEMO		/* adhoc demo mode */
 		| IEEE80211_C_SHPREAMBLE	/* short preamble supported */
 		| IEEE80211_C_SHSLOT		/* short slot time supported */
 		| IEEE80211_C_WME		/* WME/WMM supported */
 		| IEEE80211_C_WPA		/* capable of WPA1+WPA2 */
 #if 0
 		| IEEE80211_C_BGSCAN		/* capable of bg scanning */
 #endif
 		| IEEE80211_C_TXPMGT		/* capable of txpow mgt */
 		;
 
 	ic->ic_flags_ext |= IEEE80211_FEXT_SWBMISS;	/* s/w bmiss */
 
 	/* Determine the NVRAM variable containing our MAC address */
 	core_unit = bhnd_get_core_unit(sc->sc_dev);
 	mac_varname = NULL;
 	if (sc->sc_board_info.board_srom_rev <= 2) {
 		if (core_unit == 0) {
 			mac_varname = BHND_NVAR_IL0MACADDR;
 		} else if (core_unit == 1) {
 			mac_varname = BHND_NVAR_ET1MACADDR;
 		}
 	} else {
 		if (core_unit == 0) {
 			mac_varname = BHND_NVAR_MACADDR;
 		}
 	}
 
 	if (mac_varname == NULL) {
 		device_printf(sc->sc_dev, "missing MAC address variable for "
 		    "D11 core %u", core_unit);
 		return (ENXIO);
 	}
 
 	/* Read the MAC address from NVRAM */
 	error = bhnd_nvram_getvar_array(sc->sc_dev, mac_varname, ic->ic_macaddr,
 	    sizeof(ic->ic_macaddr), BHND_NVRAM_TYPE_UINT8_ARRAY);
 	if (error) {
 		device_printf(sc->sc_dev, "error reading %s: %d\n", mac_varname,
 		    error);
 		return (error);
 	}
 
 	/* call MI attach routine. */
 	ieee80211_ifattach(ic);
 
 	/* override default methods */
 	ic->ic_raw_xmit = bwn_raw_xmit;
 	ic->ic_updateslot = bwn_updateslot;
 	ic->ic_update_promisc = bwn_update_promisc;
 	ic->ic_wme.wme_update = bwn_wme_update;
 	ic->ic_scan_start = bwn_scan_start;
 	ic->ic_scan_end = bwn_scan_end;
 	ic->ic_set_channel = bwn_set_channel;
 	ic->ic_vap_create = bwn_vap_create;
 	ic->ic_vap_delete = bwn_vap_delete;
 	ic->ic_transmit = bwn_transmit;
 	ic->ic_parent = bwn_parent;
 
 	ieee80211_radiotap_attach(ic,
 	    &sc->sc_tx_th.wt_ihdr, sizeof(sc->sc_tx_th),
 	    BWN_TX_RADIOTAP_PRESENT,
 	    &sc->sc_rx_th.wr_ihdr, sizeof(sc->sc_rx_th),
 	    BWN_RX_RADIOTAP_PRESENT);
 
 	bwn_sysctl_node(sc);
 
 	if (bootverbose)
 		ieee80211_announce(ic);
 	return (0);
 }
 
 static void
 bwn_phy_detach(struct bwn_mac *mac)
 {
 
 	if (mac->mac_phy.detach != NULL)
 		mac->mac_phy.detach(mac);
 }
 
 static int
 bwn_detach(device_t dev)
 {
 	struct bwn_softc *sc = device_get_softc(dev);
 	struct bwn_mac *mac = sc->sc_curmac;
 	struct ieee80211com *ic = &sc->sc_ic;
 
 	sc->sc_flags |= BWN_FLAG_INVALID;
 
 	if (device_is_attached(sc->sc_dev)) {
 		BWN_LOCK(sc);
 		bwn_stop(sc);
 		BWN_UNLOCK(sc);
 		bwn_dma_free(mac);
 		callout_drain(&sc->sc_led_blink_ch);
 		callout_drain(&sc->sc_rfswitch_ch);
 		callout_drain(&sc->sc_task_ch);
 		callout_drain(&sc->sc_watchdog_ch);
 		bwn_phy_detach(mac);
 		ieee80211_draintask(ic, &mac->mac_hwreset);
 		ieee80211_draintask(ic, &mac->mac_txpower);
 		ieee80211_ifdetach(ic);
 	}
 	taskqueue_drain(sc->sc_tq, &mac->mac_intrtask);
 	taskqueue_free(sc->sc_tq);
 
 	if (mac->mac_intrhand != NULL) {
 		bus_teardown_intr(dev, mac->mac_res_irq, mac->mac_intrhand);
 		mac->mac_intrhand = NULL;
 	}
 
 	bhnd_release_pmu(dev);
 	bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_mem_rid,
 	    sc->sc_mem_res);
 	bus_release_resource(dev, SYS_RES_IRQ, mac->mac_rid_irq,
 	    mac->mac_res_irq);
 	mbufq_drain(&sc->sc_snd);
 	bwn_release_firmware(mac);
 	BWN_LOCK_DESTROY(sc);
 
 	bwn_release_bus_providers(sc);
 
 	return (0);
 }
 
 static void
 bwn_attach_pre(struct bwn_softc *sc)
 {
 
 	BWN_LOCK_INIT(sc);
 	TAILQ_INIT(&sc->sc_maclist);
 	callout_init_mtx(&sc->sc_rfswitch_ch, &sc->sc_mtx, 0);
 	callout_init_mtx(&sc->sc_task_ch, &sc->sc_mtx, 0);
 	callout_init_mtx(&sc->sc_watchdog_ch, &sc->sc_mtx, 0);
 	mbufq_init(&sc->sc_snd, ifqmaxlen);
 	sc->sc_tq = taskqueue_create_fast("bwn_taskq", M_NOWAIT,
 		taskqueue_thread_enqueue, &sc->sc_tq);
 	taskqueue_start_threads(&sc->sc_tq, 1, PI_NET,
 		"%s taskq", device_get_nameunit(sc->sc_dev));
 }
 
 static void
 bwn_sprom_bugfixes(device_t dev)
 {
 	struct bwn_softc *sc = device_get_softc(dev);
 
 #define	BWN_ISDEV(_device, _subvendor, _subdevice)		\
 	((sc->sc_board_info.board_devid == PCI_DEVID_##_device) &&	\
 	 (sc->sc_board_info.board_vendor == PCI_VENDOR_##_subvendor) &&	\
 	 (sc->sc_board_info.board_type == _subdevice))
 
 	 /* A subset of Apple Airport Extreme (BCM4306 rev 2) devices
 	  * were programmed with a missing PACTRL boardflag */
 	 if (sc->sc_board_info.board_vendor == PCI_VENDOR_APPLE &&
 	     sc->sc_board_info.board_type == 0x4e &&
 	     sc->sc_board_info.board_rev > 0x40)
 		 sc->sc_board_info.board_flags |= BHND_BFL_PACTRL;
 
 	if (BWN_ISDEV(BCM4318_D11G, ASUSTEK, 0x100f) ||
 	    BWN_ISDEV(BCM4306_D11G, DELL, 0x0003) ||
 	    BWN_ISDEV(BCM4306_D11G, HP, 0x12f8) ||
 	    BWN_ISDEV(BCM4306_D11G, LINKSYS, 0x0013) ||
 	    BWN_ISDEV(BCM4306_D11G, LINKSYS, 0x0014) ||
 	    BWN_ISDEV(BCM4306_D11G, LINKSYS, 0x0015) ||
 	    BWN_ISDEV(BCM4306_D11G, MOTOROLA, 0x7010))
 		sc->sc_board_info.board_flags &= ~BHND_BFL_BTCOEX;
 #undef	BWN_ISDEV
 }
 
 static void
 bwn_parent(struct ieee80211com *ic)
 {
 	struct bwn_softc *sc = ic->ic_softc;
 	int startall = 0;
 
 	BWN_LOCK(sc);
 	if (ic->ic_nrunning > 0) {
 		if ((sc->sc_flags & BWN_FLAG_RUNNING) == 0) {
 			bwn_init(sc);
 			startall = 1;
 		} else
 			bwn_update_promisc(ic);
 	} else if (sc->sc_flags & BWN_FLAG_RUNNING)
 		bwn_stop(sc);
 	BWN_UNLOCK(sc);
 
 	if (startall)
 		ieee80211_start_all(ic);
 }
 
 static int
 bwn_transmit(struct ieee80211com *ic, struct mbuf *m)
 {
 	struct bwn_softc *sc = ic->ic_softc;
 	int error;
 
 	BWN_LOCK(sc);
 	if ((sc->sc_flags & BWN_FLAG_RUNNING) == 0) {
 		BWN_UNLOCK(sc);
 		return (ENXIO);
 	}
 	error = mbufq_enqueue(&sc->sc_snd, m);
 	if (error) {
 		BWN_UNLOCK(sc);
 		return (error);
 	}
 	bwn_start(sc);
 	BWN_UNLOCK(sc);
 	return (0);
 }
 
 static void
 bwn_start(struct bwn_softc *sc)
 {
 	struct bwn_mac *mac = sc->sc_curmac;
 	struct ieee80211_frame *wh;
 	struct ieee80211_node *ni;
 	struct ieee80211_key *k;
 	struct mbuf *m;
 
 	BWN_ASSERT_LOCKED(sc);
 
 	if ((sc->sc_flags & BWN_FLAG_RUNNING) == 0 || mac == NULL ||
 	    mac->mac_status < BWN_MAC_STATUS_STARTED)
 		return;
 
 	while ((m = mbufq_dequeue(&sc->sc_snd)) != NULL) {
 		if (bwn_tx_isfull(sc, m))
 			break;
 		ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
 		if (ni == NULL) {
 			device_printf(sc->sc_dev, "unexpected NULL ni\n");
 			m_freem(m);
 			counter_u64_add(sc->sc_ic.ic_oerrors, 1);
 			continue;
 		}
 		wh = mtod(m, struct ieee80211_frame *);
 		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			k = ieee80211_crypto_encap(ni, m);
 			if (k == NULL) {
 				if_inc_counter(ni->ni_vap->iv_ifp,
 				    IFCOUNTER_OERRORS, 1);
 				ieee80211_free_node(ni);
 				m_freem(m);
 				continue;
 			}
 		}
 		wh = NULL;	/* Catch any invalid use */
 		if (bwn_tx_start(sc, ni, m) != 0) {
 			if (ni != NULL) {
 				if_inc_counter(ni->ni_vap->iv_ifp,
 				    IFCOUNTER_OERRORS, 1);
 				ieee80211_free_node(ni);
 			}
 			continue;
 		}
 		sc->sc_watchdog_timer = 5;
 	}
 }
 
 static int
 bwn_tx_isfull(struct bwn_softc *sc, struct mbuf *m)
 {
 	struct bwn_dma_ring *dr;
 	struct bwn_mac *mac = sc->sc_curmac;
 	struct bwn_pio_txqueue *tq;
 	int pktlen = roundup(m->m_pkthdr.len + BWN_HDRSIZE(mac), 4);
 
 	BWN_ASSERT_LOCKED(sc);
 
 	if (mac->mac_flags & BWN_MAC_FLAG_DMA) {
 		dr = bwn_dma_select(mac, M_WME_GETAC(m));
 		if (dr->dr_stop == 1 ||
 		    bwn_dma_freeslot(dr) < BWN_TX_SLOTS_PER_FRAME) {
 			dr->dr_stop = 1;
 			goto full;
 		}
 	} else {
 		tq = bwn_pio_select(mac, M_WME_GETAC(m));
 		if (tq->tq_free == 0 || pktlen > tq->tq_size ||
 		    pktlen > (tq->tq_size - tq->tq_used))
 			goto full;
 	}
 	return (0);
 full:
 	mbufq_prepend(&sc->sc_snd, m);
 	return (1);
 }
 
 static int
 bwn_tx_start(struct bwn_softc *sc, struct ieee80211_node *ni, struct mbuf *m)
 {
 	struct bwn_mac *mac = sc->sc_curmac;
 	int error;
 
 	BWN_ASSERT_LOCKED(sc);
 
 	if (m->m_pkthdr.len < IEEE80211_MIN_LEN || mac == NULL) {
 		m_freem(m);
 		return (ENXIO);
 	}
 
 	error = (mac->mac_flags & BWN_MAC_FLAG_DMA) ?
 	    bwn_dma_tx_start(mac, ni, &m) : bwn_pio_tx_start(mac, ni, &m);
 	if (error) {
 		m_freem(m);
 		return (error);
 	}
 	return (0);
 }
 
 static int
 bwn_pio_tx_start(struct bwn_mac *mac, struct ieee80211_node *ni,
     struct mbuf **mp)
 {
 	struct bwn_pio_txpkt *tp;
 	struct bwn_pio_txqueue *tq;
 	struct bwn_softc *sc = mac->mac_sc;
 	struct bwn_txhdr txhdr;
 	struct mbuf *m, *m_new;
 	uint32_t ctl32;
 	int error;
 	uint16_t ctl16;
 
 	BWN_ASSERT_LOCKED(sc);
 
 	/* XXX TODO send packets after DTIM */
 
 	m = *mp;
 	tq = bwn_pio_select(mac, M_WME_GETAC(m));
 	KASSERT(!TAILQ_EMPTY(&tq->tq_pktlist), ("%s: fail", __func__));
 	tp = TAILQ_FIRST(&tq->tq_pktlist);
 	tp->tp_ni = ni;
 	tp->tp_m = m;
 
 	error = bwn_set_txhdr(mac, ni, m, &txhdr, BWN_PIO_COOKIE(tq, tp));
 	if (error) {
 		device_printf(sc->sc_dev, "tx fail\n");
 		return (error);
 	}
 
 	TAILQ_REMOVE(&tq->tq_pktlist, tp, tp_list);
 	tq->tq_used += roundup(m->m_pkthdr.len + BWN_HDRSIZE(mac), 4);
 	tq->tq_free--;
 
 	if (bhnd_get_hwrev(sc->sc_dev) >= 8) {
 		/*
 		 * XXX please removes m_defrag(9)
 		 */
 		m_new = m_defrag(*mp, M_NOWAIT);
 		if (m_new == NULL) {
 			device_printf(sc->sc_dev,
 			    "%s: can't defrag TX buffer\n",
 			    __func__);
 			return (ENOBUFS);
 		}
 		*mp = m_new;
 		if (m_new->m_next != NULL)
 			device_printf(sc->sc_dev,
 			    "TODO: fragmented packets for PIO\n");
 		tp->tp_m = m_new;
 
 		/* send HEADER */
 		ctl32 = bwn_pio_write_multi_4(mac, tq,
 		    (BWN_PIO_READ_4(mac, tq, BWN_PIO8_TXCTL) |
 			BWN_PIO8_TXCTL_FRAMEREADY) & ~BWN_PIO8_TXCTL_EOF,
 		    (const uint8_t *)&txhdr, BWN_HDRSIZE(mac));
 		/* send BODY */
 		ctl32 = bwn_pio_write_multi_4(mac, tq, ctl32,
 		    mtod(m_new, const void *), m_new->m_pkthdr.len);
 		bwn_pio_write_4(mac, tq, BWN_PIO_TXCTL,
 		    ctl32 | BWN_PIO8_TXCTL_EOF);
 	} else {
 		ctl16 = bwn_pio_write_multi_2(mac, tq,
 		    (bwn_pio_read_2(mac, tq, BWN_PIO_TXCTL) |
 			BWN_PIO_TXCTL_FRAMEREADY) & ~BWN_PIO_TXCTL_EOF,
 		    (const uint8_t *)&txhdr, BWN_HDRSIZE(mac));
 		ctl16 = bwn_pio_write_mbuf_2(mac, tq, ctl16, m);
 		BWN_PIO_WRITE_2(mac, tq, BWN_PIO_TXCTL,
 		    ctl16 | BWN_PIO_TXCTL_EOF);
 	}
 
 	return (0);
 }
 
 static struct bwn_pio_txqueue *
 bwn_pio_select(struct bwn_mac *mac, uint8_t prio)
 {
 
 	if ((mac->mac_flags & BWN_MAC_FLAG_WME) == 0)
 		return (&mac->mac_method.pio.wme[WME_AC_BE]);
 
 	switch (prio) {
 	case 0:
 		return (&mac->mac_method.pio.wme[WME_AC_BE]);
 	case 1:
 		return (&mac->mac_method.pio.wme[WME_AC_BK]);
 	case 2:
 		return (&mac->mac_method.pio.wme[WME_AC_VI]);
 	case 3:
 		return (&mac->mac_method.pio.wme[WME_AC_VO]);
 	}
 	KASSERT(0 == 1, ("%s:%d: fail", __func__, __LINE__));
 	return (NULL);
 }
 
 static int
 bwn_dma_tx_start(struct bwn_mac *mac, struct ieee80211_node *ni,
     struct mbuf **mp)
 {
 #define	BWN_GET_TXHDRCACHE(slot)					\
 	&(txhdr_cache[(slot / BWN_TX_SLOTS_PER_FRAME) * BWN_HDRSIZE(mac)])
 	struct bwn_dma *dma = &mac->mac_method.dma;
 	struct bwn_dma_ring *dr = bwn_dma_select(mac, M_WME_GETAC(*mp));
 	struct bwn_dmadesc_generic *desc;
 	struct bwn_dmadesc_meta *mt;
 	struct bwn_softc *sc = mac->mac_sc;
 	struct mbuf *m;
 	uint8_t *txhdr_cache = (uint8_t *)dr->dr_txhdr_cache;
 	int error, slot, backup[2] = { dr->dr_curslot, dr->dr_usedslot };
 
 	BWN_ASSERT_LOCKED(sc);
 	KASSERT(!dr->dr_stop, ("%s:%d: fail", __func__, __LINE__));
 
 	/* XXX send after DTIM */
 
 	m = *mp;
 	slot = bwn_dma_getslot(dr);
 	dr->getdesc(dr, slot, &desc, &mt);
 	KASSERT(mt->mt_txtype == BWN_DMADESC_METATYPE_HEADER,
 	    ("%s:%d: fail", __func__, __LINE__));
 
 	error = bwn_set_txhdr(dr->dr_mac, ni, m,
 	    (struct bwn_txhdr *)BWN_GET_TXHDRCACHE(slot),
 	    BWN_DMA_COOKIE(dr, slot));
 	if (error)
 		goto fail;
 	error = bus_dmamap_load(dr->dr_txring_dtag, mt->mt_dmap,
 	    BWN_GET_TXHDRCACHE(slot), BWN_HDRSIZE(mac), bwn_dma_ring_addr,
 	    &mt->mt_paddr, BUS_DMA_NOWAIT);
 	if (error) {
 		device_printf(sc->sc_dev, "%s: can't load TX buffer (1) %d\n",
 		    __func__, error);
 		goto fail;
 	}
 	bus_dmamap_sync(dr->dr_txring_dtag, mt->mt_dmap,
 	    BUS_DMASYNC_PREWRITE);
 	dr->setdesc(dr, desc, mt->mt_paddr, BWN_HDRSIZE(mac), 1, 0, 0);
 	bus_dmamap_sync(dr->dr_ring_dtag, dr->dr_ring_dmap,
 	    BUS_DMASYNC_PREWRITE);
 
 	slot = bwn_dma_getslot(dr);
 	dr->getdesc(dr, slot, &desc, &mt);
 	KASSERT(mt->mt_txtype == BWN_DMADESC_METATYPE_BODY &&
 	    mt->mt_islast == 1, ("%s:%d: fail", __func__, __LINE__));
 	mt->mt_m = m;
 	mt->mt_ni = ni;
 
 	error = bus_dmamap_load_mbuf(dma->txbuf_dtag, mt->mt_dmap, m,
 	    bwn_dma_buf_addr, &mt->mt_paddr, BUS_DMA_NOWAIT);
 	if (error && error != EFBIG) {
 		device_printf(sc->sc_dev, "%s: can't load TX buffer (1) %d\n",
 		    __func__, error);
 		goto fail;
 	}
 	if (error) {    /* error == EFBIG */
 		struct mbuf *m_new;
 
 		m_new = m_defrag(m, M_NOWAIT);
 		if (m_new == NULL) {
 			device_printf(sc->sc_dev,
 			    "%s: can't defrag TX buffer\n",
 			    __func__);
 			error = ENOBUFS;
 			goto fail;
 		}
 		*mp = m = m_new;
 
 		mt->mt_m = m;
 		error = bus_dmamap_load_mbuf(dma->txbuf_dtag, mt->mt_dmap,
 		    m, bwn_dma_buf_addr, &mt->mt_paddr, BUS_DMA_NOWAIT);
 		if (error) {
 			device_printf(sc->sc_dev,
 			    "%s: can't load TX buffer (2) %d\n",
 			    __func__, error);
 			goto fail;
 		}
 	}
 	bus_dmamap_sync(dma->txbuf_dtag, mt->mt_dmap, BUS_DMASYNC_PREWRITE);
 	dr->setdesc(dr, desc, mt->mt_paddr, m->m_pkthdr.len, 0, 1, 1);
 	bus_dmamap_sync(dr->dr_ring_dtag, dr->dr_ring_dmap,
 	    BUS_DMASYNC_PREWRITE);
 
 	/* XXX send after DTIM */
 
 	dr->start_transfer(dr, bwn_dma_nextslot(dr, slot));
 	return (0);
 fail:
 	dr->dr_curslot = backup[0];
 	dr->dr_usedslot = backup[1];
 	return (error);
 #undef BWN_GET_TXHDRCACHE
 }
 
 static void
 bwn_watchdog(void *arg)
 {
 	struct bwn_softc *sc = arg;
 
 	if (sc->sc_watchdog_timer != 0 && --sc->sc_watchdog_timer == 0) {
 		device_printf(sc->sc_dev, "device timeout\n");
 		counter_u64_add(sc->sc_ic.ic_oerrors, 1);
 	}
 	callout_schedule(&sc->sc_watchdog_ch, hz);
 }
 
 static int
 bwn_attach_core(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	int error, have_bg = 0, have_a = 0;
 	uint16_t iost;
 
 	KASSERT(bhnd_get_hwrev(sc->sc_dev) >= 5,
 	    ("unsupported revision %d", bhnd_get_hwrev(sc->sc_dev)));
 
 	if ((error = bwn_core_forceclk(mac, true)))
 		return (error);
 
 	if ((error = bhnd_read_iost(sc->sc_dev, &iost))) {
 		device_printf(sc->sc_dev, "error reading I/O status flags: "
 		    "%d\n", error);
 		return (error);
 	}
 
 	have_a = (iost & BWN_IOST_HAVE_5GHZ) ? 1 : 0;
 	have_bg = (iost & BWN_IOST_HAVE_2GHZ) ? 1 : 0;
 	if (iost & BWN_IOST_DUALPHY) {
 		have_bg = 1;
 		have_a = 1;
 	}
 
 #if 0
 	device_printf(sc->sc_dev, "%s: iost=0x%04hx, have_a=%d, have_bg=%d,"
 	    " deviceid=0x%04x, siba_deviceid=0x%04x\n",
 	    __func__,
 	    iost,
 	    have_a,
 	    have_bg,
 	    sc->sc_board_info.board_devid,
 	    sc->sc_cid.chip_id);
 #endif
 
 	/*
 	 * Guess at whether it has A-PHY or G-PHY.
 	 * This is just used for resetting the core to probe things;
 	 * we will re-guess once it's all up and working.
 	 */
 	error = bwn_reset_core(mac, have_bg);
 	if (error)
 		goto fail;
 
 	/*
 	 * Determine the DMA engine type
 	 */
 	if (iost & BHND_IOST_DMA64) {
 		mac->mac_dmatype = BHND_DMA_ADDR_64BIT;
 	} else {
 		uint32_t tmp;
 		uint16_t base;
 
 		base = bwn_dma_base(0, 0);
 		BWN_WRITE_4(mac, base + BWN_DMA32_TXCTL,
 		    BWN_DMA32_TXADDREXT_MASK);
 		tmp = BWN_READ_4(mac, base + BWN_DMA32_TXCTL);
 		if (tmp & BWN_DMA32_TXADDREXT_MASK) {
 			mac->mac_dmatype = BHND_DMA_ADDR_32BIT;
 		} else {
 			mac->mac_dmatype = BHND_DMA_ADDR_30BIT;
 		}
 	}
 
 	/*
 	 * Get the PHY version.
 	 */
 	error = bwn_phy_getinfo(mac, have_bg);
 	if (error)
 		goto fail;
 
 	/*
 	 * This is the whitelist of devices which we "believe"
 	 * the SPROM PHY config from.  The rest are "guessed".
 	 */
 	if (sc->sc_board_info.board_devid != PCI_DEVID_BCM4311_D11DUAL &&
 	    sc->sc_board_info.board_devid != PCI_DEVID_BCM4328_D11G &&
 	    sc->sc_board_info.board_devid != PCI_DEVID_BCM4318_D11DUAL &&
 	    sc->sc_board_info.board_devid != PCI_DEVID_BCM4306_D11DUAL &&
 	    sc->sc_board_info.board_devid != PCI_DEVID_BCM4321_D11N &&
 	    sc->sc_board_info.board_devid != PCI_DEVID_BCM4322_D11N) {
 		have_a = have_bg = 0;
 		if (mac->mac_phy.type == BWN_PHYTYPE_A)
 			have_a = 1;
 		else if (mac->mac_phy.type == BWN_PHYTYPE_G ||
 		    mac->mac_phy.type == BWN_PHYTYPE_N ||
 		    mac->mac_phy.type == BWN_PHYTYPE_LP)
 			have_bg = 1;
 		else
 			KASSERT(0 == 1, ("%s: unknown phy type (%d)", __func__,
 			    mac->mac_phy.type));
 	}
 
 	/*
 	 * XXX The PHY-G support doesn't do 5GHz operation.
 	 */
 	if (mac->mac_phy.type != BWN_PHYTYPE_LP &&
 	    mac->mac_phy.type != BWN_PHYTYPE_N) {
 		device_printf(sc->sc_dev,
 		    "%s: forcing 2GHz only; no dual-band support for PHY\n",
 		    __func__);
 		have_a = 0;
 		have_bg = 1;
 	}
 
 	mac->mac_phy.phy_n = NULL;
 
 	if (mac->mac_phy.type == BWN_PHYTYPE_G) {
 		mac->mac_phy.attach = bwn_phy_g_attach;
 		mac->mac_phy.detach = bwn_phy_g_detach;
 		mac->mac_phy.prepare_hw = bwn_phy_g_prepare_hw;
 		mac->mac_phy.init_pre = bwn_phy_g_init_pre;
 		mac->mac_phy.init = bwn_phy_g_init;
 		mac->mac_phy.exit = bwn_phy_g_exit;
 		mac->mac_phy.phy_read = bwn_phy_g_read;
 		mac->mac_phy.phy_write = bwn_phy_g_write;
 		mac->mac_phy.rf_read = bwn_phy_g_rf_read;
 		mac->mac_phy.rf_write = bwn_phy_g_rf_write;
 		mac->mac_phy.use_hwpctl = bwn_phy_g_hwpctl;
 		mac->mac_phy.rf_onoff = bwn_phy_g_rf_onoff;
 		mac->mac_phy.switch_analog = bwn_phy_switch_analog;
 		mac->mac_phy.switch_channel = bwn_phy_g_switch_channel;
 		mac->mac_phy.get_default_chan = bwn_phy_g_get_default_chan;
 		mac->mac_phy.set_antenna = bwn_phy_g_set_antenna;
 		mac->mac_phy.set_im = bwn_phy_g_im;
 		mac->mac_phy.recalc_txpwr = bwn_phy_g_recalc_txpwr;
 		mac->mac_phy.set_txpwr = bwn_phy_g_set_txpwr;
 		mac->mac_phy.task_15s = bwn_phy_g_task_15s;
 		mac->mac_phy.task_60s = bwn_phy_g_task_60s;
 	} else if (mac->mac_phy.type == BWN_PHYTYPE_LP) {
 		mac->mac_phy.init_pre = bwn_phy_lp_init_pre;
 		mac->mac_phy.init = bwn_phy_lp_init;
 		mac->mac_phy.phy_read = bwn_phy_lp_read;
 		mac->mac_phy.phy_write = bwn_phy_lp_write;
 		mac->mac_phy.phy_maskset = bwn_phy_lp_maskset;
 		mac->mac_phy.rf_read = bwn_phy_lp_rf_read;
 		mac->mac_phy.rf_write = bwn_phy_lp_rf_write;
 		mac->mac_phy.rf_onoff = bwn_phy_lp_rf_onoff;
 		mac->mac_phy.switch_analog = bwn_phy_lp_switch_analog;
 		mac->mac_phy.switch_channel = bwn_phy_lp_switch_channel;
 		mac->mac_phy.get_default_chan = bwn_phy_lp_get_default_chan;
 		mac->mac_phy.set_antenna = bwn_phy_lp_set_antenna;
 		mac->mac_phy.task_60s = bwn_phy_lp_task_60s;
 	} else if (mac->mac_phy.type == BWN_PHYTYPE_N) {
 		mac->mac_phy.attach = bwn_phy_n_attach;
 		mac->mac_phy.detach = bwn_phy_n_detach;
 		mac->mac_phy.prepare_hw = bwn_phy_n_prepare_hw;
 		mac->mac_phy.init_pre = bwn_phy_n_init_pre;
 		mac->mac_phy.init = bwn_phy_n_init;
 		mac->mac_phy.exit = bwn_phy_n_exit;
 		mac->mac_phy.phy_read = bwn_phy_n_read;
 		mac->mac_phy.phy_write = bwn_phy_n_write;
 		mac->mac_phy.rf_read = bwn_phy_n_rf_read;
 		mac->mac_phy.rf_write = bwn_phy_n_rf_write;
 		mac->mac_phy.use_hwpctl = bwn_phy_n_hwpctl;
 		mac->mac_phy.rf_onoff = bwn_phy_n_rf_onoff;
 		mac->mac_phy.switch_analog = bwn_phy_n_switch_analog;
 		mac->mac_phy.switch_channel = bwn_phy_n_switch_channel;
 		mac->mac_phy.get_default_chan = bwn_phy_n_get_default_chan;
 		mac->mac_phy.set_antenna = bwn_phy_n_set_antenna;
 		mac->mac_phy.set_im = bwn_phy_n_im;
 		mac->mac_phy.recalc_txpwr = bwn_phy_n_recalc_txpwr;
 		mac->mac_phy.set_txpwr = bwn_phy_n_set_txpwr;
 		mac->mac_phy.task_15s = bwn_phy_n_task_15s;
 		mac->mac_phy.task_60s = bwn_phy_n_task_60s;
 	} else {
 		device_printf(sc->sc_dev, "unsupported PHY type (%d)\n",
 		    mac->mac_phy.type);
 		error = ENXIO;
 		goto fail;
 	}
 
 	mac->mac_phy.gmode = have_bg;
 	if (mac->mac_phy.attach != NULL) {
 		error = mac->mac_phy.attach(mac);
 		if (error) {
 			device_printf(sc->sc_dev, "failed\n");
 			goto fail;
 		}
 	}
 
 	error = bwn_reset_core(mac, have_bg);
 	if (error)
 		goto fail;
 
 	error = bwn_chiptest(mac);
 	if (error)
 		goto fail;
 	error = bwn_setup_channels(mac, have_bg, have_a);
 	if (error) {
 		device_printf(sc->sc_dev, "failed to setup channels\n");
 		goto fail;
 	}
 
 	if (sc->sc_curmac == NULL)
 		sc->sc_curmac = mac;
 
 	error = bwn_dma_attach(mac);
 	if (error != 0) {
 		device_printf(sc->sc_dev, "failed to initialize DMA\n");
 		goto fail;
 	}
 
 	mac->mac_phy.switch_analog(mac, 0);
 
 fail:
 	bhnd_suspend_hw(sc->sc_dev, 0);
 	bwn_release_firmware(mac);
 	return (error);
 }
 
 /*
  * Reset
  */
 int
 bwn_reset_core(struct bwn_mac *mac, int g_mode)
 {
 	struct bwn_softc	*sc;
 	uint32_t		 ctl;
 	uint16_t		 ioctl, ioctl_mask;
 	int			 error;
 
 	sc = mac->mac_sc;
 
 	DPRINTF(sc, BWN_DEBUG_RESET, "%s: g_mode=%d\n", __func__, g_mode);
 
 	/* Reset core */
 	ioctl = (BWN_IOCTL_PHYCLOCK_ENABLE | BWN_IOCTL_PHYRESET);
 	if (g_mode)
 		ioctl |= BWN_IOCTL_SUPPORT_G;
 
 	/* XXX N-PHY only; and hard-code to 20MHz for now */
 	if (mac->mac_phy.type == BWN_PHYTYPE_N)
 		ioctl |= BWN_IOCTL_PHY_BANDWIDTH_20MHZ;
 
 	if ((error = bhnd_reset_hw(sc->sc_dev, ioctl, ioctl))) {
 		device_printf(sc->sc_dev, "core reset failed: %d", error);
 		return (error);
 	}
 
 	DELAY(2000);
 
 	/* Take PHY out of reset */
 	ioctl = BHND_IOCTL_CLK_FORCE;
 	ioctl_mask = BHND_IOCTL_CLK_FORCE |
 		     BWN_IOCTL_PHYRESET |
 		     BWN_IOCTL_PHYCLOCK_ENABLE;
 
 	if ((error = bhnd_write_ioctl(sc->sc_dev, ioctl, ioctl_mask))) {
 		device_printf(sc->sc_dev, "failed to set core ioctl flags: "
 		    "%d\n", error);
 		return (error);
 	}
 
 	DELAY(2000);
 
 	ioctl = BWN_IOCTL_PHYCLOCK_ENABLE;
 	if ((error = bhnd_write_ioctl(sc->sc_dev, ioctl, ioctl_mask))) {
 		device_printf(sc->sc_dev, "failed to set core ioctl flags: "
 		    "%d\n", error);
 		return (error);
 	}
 
 	DELAY(2000);
 
 	if (mac->mac_phy.switch_analog != NULL)
 		mac->mac_phy.switch_analog(mac, 1);
 
 	ctl = BWN_READ_4(mac, BWN_MACCTL) & ~BWN_MACCTL_GMODE;
 	if (g_mode)
 		ctl |= BWN_MACCTL_GMODE;
 	BWN_WRITE_4(mac, BWN_MACCTL, ctl | BWN_MACCTL_IHR_ON);
 
 	return (0);
 }
 
 static int
 bwn_phy_getinfo(struct bwn_mac *mac, int gmode)
 {
 	struct bwn_phy *phy = &mac->mac_phy;
 	struct bwn_softc *sc = mac->mac_sc;
 	uint32_t tmp;
 
 	/* PHY */
 	tmp = BWN_READ_2(mac, BWN_PHYVER);
 	phy->gmode = gmode;
 	phy->rf_on = 1;
 	phy->analog = (tmp & BWN_PHYVER_ANALOG) >> 12;
 	phy->type = (tmp & BWN_PHYVER_TYPE) >> 8;
 	phy->rev = (tmp & BWN_PHYVER_VERSION);
 	if ((phy->type == BWN_PHYTYPE_A && phy->rev >= 4) ||
 	    (phy->type == BWN_PHYTYPE_B && phy->rev != 2 &&
 		phy->rev != 4 && phy->rev != 6 && phy->rev != 7) ||
 	    (phy->type == BWN_PHYTYPE_G && phy->rev > 9) ||
 	    (phy->type == BWN_PHYTYPE_N && phy->rev > 6) ||
 	    (phy->type == BWN_PHYTYPE_LP && phy->rev > 2))
 		goto unsupphy;
 
 	/* RADIO */
 	BWN_WRITE_2(mac, BWN_RFCTL, BWN_RFCTL_ID);
 	tmp = BWN_READ_2(mac, BWN_RFDATALO);
 	BWN_WRITE_2(mac, BWN_RFCTL, BWN_RFCTL_ID);
 	tmp |= (uint32_t)BWN_READ_2(mac, BWN_RFDATAHI) << 16;
 
 	phy->rf_rev = (tmp & 0xf0000000) >> 28;
 	phy->rf_ver = (tmp & 0x0ffff000) >> 12;
 	phy->rf_manuf = (tmp & 0x00000fff);
 
 	/*
 	 * For now, just always do full init (ie, what bwn has traditionally
 	 * done)
 	 */
 	phy->phy_do_full_init = 1;
 
 	if (phy->rf_manuf != 0x17f)	/* 0x17f is broadcom */
 		goto unsupradio;
 	if ((phy->type == BWN_PHYTYPE_A && (phy->rf_ver != 0x2060 ||
 	     phy->rf_rev != 1 || phy->rf_manuf != 0x17f)) ||
 	    (phy->type == BWN_PHYTYPE_B && (phy->rf_ver & 0xfff0) != 0x2050) ||
 	    (phy->type == BWN_PHYTYPE_G && phy->rf_ver != 0x2050) ||
 	    (phy->type == BWN_PHYTYPE_N &&
 	     phy->rf_ver != 0x2055 && phy->rf_ver != 0x2056) ||
 	    (phy->type == BWN_PHYTYPE_LP &&
 	     phy->rf_ver != 0x2062 && phy->rf_ver != 0x2063))
 		goto unsupradio;
 
 	return (0);
 unsupphy:
 	device_printf(sc->sc_dev, "unsupported PHY (type %#x, rev %#x, "
 	    "analog %#x)\n",
 	    phy->type, phy->rev, phy->analog);
 	return (ENXIO);
 unsupradio:
 	device_printf(sc->sc_dev, "unsupported radio (manuf %#x, ver %#x, "
 	    "rev %#x)\n",
 	    phy->rf_manuf, phy->rf_ver, phy->rf_rev);
 	return (ENXIO);
 }
 
 static int
 bwn_chiptest(struct bwn_mac *mac)
 {
 #define	TESTVAL0	0x55aaaa55
 #define	TESTVAL1	0xaa5555aa
 	struct bwn_softc *sc = mac->mac_sc;
 	uint32_t v, backup;
 
 	BWN_LOCK(sc);
 
 	backup = bwn_shm_read_4(mac, BWN_SHARED, 0);
 
 	bwn_shm_write_4(mac, BWN_SHARED, 0, TESTVAL0);
 	if (bwn_shm_read_4(mac, BWN_SHARED, 0) != TESTVAL0)
 		goto error;
 	bwn_shm_write_4(mac, BWN_SHARED, 0, TESTVAL1);
 	if (bwn_shm_read_4(mac, BWN_SHARED, 0) != TESTVAL1)
 		goto error;
 
 	bwn_shm_write_4(mac, BWN_SHARED, 0, backup);
 
 	if ((bhnd_get_hwrev(sc->sc_dev) >= 3) &&
 	    (bhnd_get_hwrev(sc->sc_dev) <= 10)) {
 		BWN_WRITE_2(mac, BWN_TSF_CFP_START, 0xaaaa);
 		BWN_WRITE_4(mac, BWN_TSF_CFP_START, 0xccccbbbb);
 		if (BWN_READ_2(mac, BWN_TSF_CFP_START_LOW) != 0xbbbb)
 			goto error;
 		if (BWN_READ_2(mac, BWN_TSF_CFP_START_HIGH) != 0xcccc)
 			goto error;
 	}
 	BWN_WRITE_4(mac, BWN_TSF_CFP_START, 0);
 
 	v = BWN_READ_4(mac, BWN_MACCTL) | BWN_MACCTL_GMODE;
 	if (v != (BWN_MACCTL_GMODE | BWN_MACCTL_IHR_ON))
 		goto error;
 
 	BWN_UNLOCK(sc);
 	return (0);
 error:
 	BWN_UNLOCK(sc);
 	device_printf(sc->sc_dev, "failed to validate the chipaccess\n");
 	return (ENODEV);
 }
 
 static int
 bwn_setup_channels(struct bwn_mac *mac, int have_bg, int have_a)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	uint8_t bands[IEEE80211_MODE_BYTES];
 
 	memset(ic->ic_channels, 0, sizeof(ic->ic_channels));
 	ic->ic_nchans = 0;
 
 	DPRINTF(sc, BWN_DEBUG_EEPROM, "%s: called; bg=%d, a=%d\n",
 	    __func__,
 	    have_bg,
 	    have_a);
 
 	if (have_bg) {
 		memset(bands, 0, sizeof(bands));
 		setbit(bands, IEEE80211_MODE_11B);
 		setbit(bands, IEEE80211_MODE_11G);
 		bwn_addchannels(ic->ic_channels, IEEE80211_CHAN_MAX,
 		    &ic->ic_nchans, &bwn_chantable_bg, bands);
 	}
 
 	if (have_a) {
 		memset(bands, 0, sizeof(bands));
 		setbit(bands, IEEE80211_MODE_11A);
 		bwn_addchannels(ic->ic_channels, IEEE80211_CHAN_MAX,
 		    &ic->ic_nchans, &bwn_chantable_a, bands);
 	}
 
 	mac->mac_phy.supports_2ghz = have_bg;
 	mac->mac_phy.supports_5ghz = have_a;
 
 	return (ic->ic_nchans == 0 ? ENXIO : 0);
 }
 
 uint32_t
 bwn_shm_read_4(struct bwn_mac *mac, uint16_t way, uint16_t offset)
 {
 	uint32_t ret;
 
 	BWN_ASSERT_LOCKED(mac->mac_sc);
 
 	if (way == BWN_SHARED) {
 		KASSERT((offset & 0x0001) == 0,
 		    ("%s:%d warn", __func__, __LINE__));
 		if (offset & 0x0003) {
 			bwn_shm_ctlword(mac, way, offset >> 2);
 			ret = BWN_READ_2(mac, BWN_SHM_DATA_UNALIGNED);
 			ret <<= 16;
 			bwn_shm_ctlword(mac, way, (offset >> 2) + 1);
 			ret |= BWN_READ_2(mac, BWN_SHM_DATA);
 			goto out;
 		}
 		offset >>= 2;
 	}
 	bwn_shm_ctlword(mac, way, offset);
 	ret = BWN_READ_4(mac, BWN_SHM_DATA);
 out:
 	return (ret);
 }
 
 uint16_t
 bwn_shm_read_2(struct bwn_mac *mac, uint16_t way, uint16_t offset)
 {
 	uint16_t ret;
 
 	BWN_ASSERT_LOCKED(mac->mac_sc);
 
 	if (way == BWN_SHARED) {
 		KASSERT((offset & 0x0001) == 0,
 		    ("%s:%d warn", __func__, __LINE__));
 		if (offset & 0x0003) {
 			bwn_shm_ctlword(mac, way, offset >> 2);
 			ret = BWN_READ_2(mac, BWN_SHM_DATA_UNALIGNED);
 			goto out;
 		}
 		offset >>= 2;
 	}
 	bwn_shm_ctlword(mac, way, offset);
 	ret = BWN_READ_2(mac, BWN_SHM_DATA);
 out:
 
 	return (ret);
 }
 
 static void
 bwn_shm_ctlword(struct bwn_mac *mac, uint16_t way,
     uint16_t offset)
 {
 	uint32_t control;
 
 	control = way;
 	control <<= 16;
 	control |= offset;
 	BWN_WRITE_4(mac, BWN_SHM_CONTROL, control);
 }
 
 void
 bwn_shm_write_4(struct bwn_mac *mac, uint16_t way, uint16_t offset,
     uint32_t value)
 {
 	BWN_ASSERT_LOCKED(mac->mac_sc);
 
 	if (way == BWN_SHARED) {
 		KASSERT((offset & 0x0001) == 0,
 		    ("%s:%d warn", __func__, __LINE__));
 		if (offset & 0x0003) {
 			bwn_shm_ctlword(mac, way, offset >> 2);
 			BWN_WRITE_2(mac, BWN_SHM_DATA_UNALIGNED,
 				    (value >> 16) & 0xffff);
 			bwn_shm_ctlword(mac, way, (offset >> 2) + 1);
 			BWN_WRITE_2(mac, BWN_SHM_DATA, value & 0xffff);
 			return;
 		}
 		offset >>= 2;
 	}
 	bwn_shm_ctlword(mac, way, offset);
 	BWN_WRITE_4(mac, BWN_SHM_DATA, value);
 }
 
 void
 bwn_shm_write_2(struct bwn_mac *mac, uint16_t way, uint16_t offset,
     uint16_t value)
 {
 	BWN_ASSERT_LOCKED(mac->mac_sc);
 
 	if (way == BWN_SHARED) {
 		KASSERT((offset & 0x0001) == 0,
 		    ("%s:%d warn", __func__, __LINE__));
 		if (offset & 0x0003) {
 			bwn_shm_ctlword(mac, way, offset >> 2);
 			BWN_WRITE_2(mac, BWN_SHM_DATA_UNALIGNED, value);
 			return;
 		}
 		offset >>= 2;
 	}
 	bwn_shm_ctlword(mac, way, offset);
 	BWN_WRITE_2(mac, BWN_SHM_DATA, value);
 }
 
 static void
 bwn_addchannels(struct ieee80211_channel chans[], int maxchans, int *nchans,
     const struct bwn_channelinfo *ci, const uint8_t bands[])
 {
 	int i, error;
 
 	for (i = 0, error = 0; i < ci->nchannels && error == 0; i++) {
 		const struct bwn_channel *hc = &ci->channels[i];
 
 		error = ieee80211_add_channel(chans, maxchans, nchans,
 		    hc->ieee, hc->freq, hc->maxTxPow, 0, bands);
 	}
 }
 
 static int
 bwn_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 	const struct ieee80211_bpf_params *params)
 {
 	struct ieee80211com *ic = ni->ni_ic;
 	struct bwn_softc *sc = ic->ic_softc;
 	struct bwn_mac *mac = sc->sc_curmac;
 	int error;
 
 	if ((sc->sc_flags & BWN_FLAG_RUNNING) == 0 ||
 	    mac->mac_status < BWN_MAC_STATUS_STARTED) {
 		m_freem(m);
 		return (ENETDOWN);
 	}
 
 	BWN_LOCK(sc);
 	if (bwn_tx_isfull(sc, m)) {
 		m_freem(m);
 		BWN_UNLOCK(sc);
 		return (ENOBUFS);
 	}
 
 	error = bwn_tx_start(sc, ni, m);
 	if (error == 0)
 		sc->sc_watchdog_timer = 5;
 	BWN_UNLOCK(sc);
 	return (error);
 }
 
 /*
  * Callback from the 802.11 layer to update the slot time
  * based on the current setting.  We use it to notify the
  * firmware of ERP changes and the f/w takes care of things
  * like slot time and preamble.
  */
 static void
 bwn_updateslot(struct ieee80211com *ic)
 {
 	struct bwn_softc *sc = ic->ic_softc;
 	struct bwn_mac *mac;
 
 	BWN_LOCK(sc);
 	if (sc->sc_flags & BWN_FLAG_RUNNING) {
 		mac = (struct bwn_mac *)sc->sc_curmac;
 		bwn_set_slot_time(mac, IEEE80211_GET_SLOTTIME(ic));
 	}
 	BWN_UNLOCK(sc);
 }
 
 /*
  * Callback from the 802.11 layer after a promiscuous mode change.
  * Note this interface does not check the operating mode as this
  * is an internal callback and we are expected to honor the current
  * state (e.g. this is used for setting the interface in promiscuous
  * mode when operating in hostap mode to do ACS).
  */
 static void
 bwn_update_promisc(struct ieee80211com *ic)
 {
 	struct bwn_softc *sc = ic->ic_softc;
 	struct bwn_mac *mac = sc->sc_curmac;
 
 	BWN_LOCK(sc);
 	mac = sc->sc_curmac;
 	if (mac != NULL && mac->mac_status >= BWN_MAC_STATUS_INITED) {
 		if (ic->ic_promisc > 0)
 			sc->sc_filters |= BWN_MACCTL_PROMISC;
 		else
 			sc->sc_filters &= ~BWN_MACCTL_PROMISC;
 		bwn_set_opmode(mac);
 	}
 	BWN_UNLOCK(sc);
 }
 
 /*
  * Callback from the 802.11 layer to update WME parameters.
  */
 static int
 bwn_wme_update(struct ieee80211com *ic)
 {
 	struct bwn_softc *sc = ic->ic_softc;
 	struct bwn_mac *mac = sc->sc_curmac;
 	struct chanAccParams chp;
 	struct wmeParams *wmep;
 	int i;
 
 	ieee80211_wme_ic_getparams(ic, &chp);
 
 	BWN_LOCK(sc);
 	mac = sc->sc_curmac;
 	if (mac != NULL && mac->mac_status >= BWN_MAC_STATUS_INITED) {
 		bwn_mac_suspend(mac);
 		for (i = 0; i < N(sc->sc_wmeParams); i++) {
 			wmep = &chp.cap_wmeParams[i];
 			bwn_wme_loadparams(mac, wmep, bwn_wme_shm_offsets[i]);
 		}
 		bwn_mac_enable(mac);
 	}
 	BWN_UNLOCK(sc);
 	return (0);
 }
 
 static void
 bwn_scan_start(struct ieee80211com *ic)
 {
 	struct bwn_softc *sc = ic->ic_softc;
 	struct bwn_mac *mac;
 
 	BWN_LOCK(sc);
 	mac = sc->sc_curmac;
 	if (mac != NULL && mac->mac_status >= BWN_MAC_STATUS_INITED) {
 		sc->sc_filters |= BWN_MACCTL_BEACON_PROMISC;
 		bwn_set_opmode(mac);
 		/* disable CFP update during scan */
 		bwn_hf_write(mac, bwn_hf_read(mac) | BWN_HF_SKIP_CFP_UPDATE);
 	}
 	BWN_UNLOCK(sc);
 }
 
 static void
 bwn_scan_end(struct ieee80211com *ic)
 {
 	struct bwn_softc *sc = ic->ic_softc;
 	struct bwn_mac *mac;
 
 	BWN_LOCK(sc);
 	mac = sc->sc_curmac;
 	if (mac != NULL && mac->mac_status >= BWN_MAC_STATUS_INITED) {
 		sc->sc_filters &= ~BWN_MACCTL_BEACON_PROMISC;
 		bwn_set_opmode(mac);
 		bwn_hf_write(mac, bwn_hf_read(mac) & ~BWN_HF_SKIP_CFP_UPDATE);
 	}
 	BWN_UNLOCK(sc);
 }
 
 static void
 bwn_set_channel(struct ieee80211com *ic)
 {
 	struct bwn_softc *sc = ic->ic_softc;
 	struct bwn_mac *mac = sc->sc_curmac;
 	struct bwn_phy *phy = &mac->mac_phy;
 	int chan, error;
 
 	BWN_LOCK(sc);
 
 	error = bwn_switch_band(sc, ic->ic_curchan);
 	if (error)
 		goto fail;
 	bwn_mac_suspend(mac);
 	bwn_set_txretry(mac, BWN_RETRY_SHORT, BWN_RETRY_LONG);
 	chan = ieee80211_chan2ieee(ic, ic->ic_curchan);
 	if (chan != phy->chan)
 		bwn_switch_channel(mac, chan);
 
 	/* TX power level */
 	if (ic->ic_curchan->ic_maxpower != 0 &&
 	    ic->ic_curchan->ic_maxpower != phy->txpower) {
 		phy->txpower = ic->ic_curchan->ic_maxpower / 2;
 		bwn_phy_txpower_check(mac, BWN_TXPWR_IGNORE_TIME |
 		    BWN_TXPWR_IGNORE_TSSI);
 	}
 
 	bwn_set_txantenna(mac, BWN_ANT_DEFAULT);
 	if (phy->set_antenna)
 		phy->set_antenna(mac, BWN_ANT_DEFAULT);
 
 	if (sc->sc_rf_enabled != phy->rf_on) {
 		if (sc->sc_rf_enabled) {
 			bwn_rf_turnon(mac);
 			if (!(mac->mac_flags & BWN_MAC_FLAG_RADIO_ON))
 				device_printf(sc->sc_dev,
 				    "please turn on the RF switch\n");
 		} else
 			bwn_rf_turnoff(mac);
 	}
 
 	bwn_mac_enable(mac);
 
 fail:
 	BWN_UNLOCK(sc);
 }
 
 static struct ieee80211vap *
 bwn_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
     enum ieee80211_opmode opmode, int flags,
     const uint8_t bssid[IEEE80211_ADDR_LEN],
     const uint8_t mac[IEEE80211_ADDR_LEN])
 {
 	struct ieee80211vap *vap;
 	struct bwn_vap *bvp;
 
 	switch (opmode) {
 	case IEEE80211_M_HOSTAP:
 	case IEEE80211_M_MBSS:
 	case IEEE80211_M_STA:
 	case IEEE80211_M_WDS:
 	case IEEE80211_M_MONITOR:
 	case IEEE80211_M_IBSS:
 	case IEEE80211_M_AHDEMO:
 		break;
 	default:
 		return (NULL);
 	}
 
 	bvp = malloc(sizeof(struct bwn_vap), M_80211_VAP, M_WAITOK | M_ZERO);
 	vap = &bvp->bv_vap;
 	ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid);
 	/* override with driver methods */
 	bvp->bv_newstate = vap->iv_newstate;
 	vap->iv_newstate = bwn_newstate;
 
 	/* override max aid so sta's cannot assoc when we're out of sta id's */
 	vap->iv_max_aid = BWN_STAID_MAX;
 
 	ieee80211_ratectl_init(vap);
 
 	/* complete setup */
 	ieee80211_vap_attach(vap, ieee80211_media_change,
 	    ieee80211_media_status, mac);
 	return (vap);
 }
 
 static void
 bwn_vap_delete(struct ieee80211vap *vap)
 {
 	struct bwn_vap *bvp = BWN_VAP(vap);
 
 	ieee80211_ratectl_deinit(vap);
 	ieee80211_vap_detach(vap);
 	free(bvp, M_80211_VAP);
 }
 
 static int
 bwn_init(struct bwn_softc *sc)
 {
 	struct bwn_mac *mac;
 	int error;
 
 	BWN_ASSERT_LOCKED(sc);
 
 	DPRINTF(sc, BWN_DEBUG_RESET, "%s: called\n", __func__);
 
 	bzero(sc->sc_bssid, IEEE80211_ADDR_LEN);
 	sc->sc_flags |= BWN_FLAG_NEED_BEACON_TP;
 	sc->sc_filters = 0;
 	bwn_wme_clear(sc);
 	sc->sc_beacons[0] = sc->sc_beacons[1] = 0;
 	sc->sc_rf_enabled = 1;
 
 	mac = sc->sc_curmac;
 	if (mac->mac_status == BWN_MAC_STATUS_UNINIT) {
 		error = bwn_core_init(mac);
 		if (error != 0)
 			return (error);
 	}
 	if (mac->mac_status == BWN_MAC_STATUS_INITED)
 		bwn_core_start(mac);
 
 	bwn_set_opmode(mac);
 	bwn_set_pretbtt(mac);
 	bwn_spu_setdelay(mac, 0);
 	bwn_set_macaddr(mac);
 
 	sc->sc_flags |= BWN_FLAG_RUNNING;
 	callout_reset(&sc->sc_rfswitch_ch, hz, bwn_rfswitch, sc);
 	callout_reset(&sc->sc_watchdog_ch, hz, bwn_watchdog, sc);
 
 	return (0);
 }
 
 static void
 bwn_stop(struct bwn_softc *sc)
 {
 	struct bwn_mac *mac = sc->sc_curmac;
 
 	BWN_ASSERT_LOCKED(sc);
 
 	DPRINTF(sc, BWN_DEBUG_RESET, "%s: called\n", __func__);
 
 	if (mac->mac_status >= BWN_MAC_STATUS_INITED) {
 		/* XXX FIXME opmode not based on VAP */
 		bwn_set_opmode(mac);
 		bwn_set_macaddr(mac);
 	}
 
 	if (mac->mac_status >= BWN_MAC_STATUS_STARTED)
 		bwn_core_stop(mac);
 
 	callout_stop(&sc->sc_led_blink_ch);
 	sc->sc_led_blinking = 0;
 
 	bwn_core_exit(mac);
 	sc->sc_rf_enabled = 0;
 
 	sc->sc_flags &= ~BWN_FLAG_RUNNING;
 }
 
 static void
 bwn_wme_clear(struct bwn_softc *sc)
 {
 	struct wmeParams *p;
 	unsigned int i;
 
 	KASSERT(N(bwn_wme_shm_offsets) == N(sc->sc_wmeParams),
 	    ("%s:%d: fail", __func__, __LINE__));
 
 	for (i = 0; i < N(sc->sc_wmeParams); i++) {
 		p = &(sc->sc_wmeParams[i]);
 
 		switch (bwn_wme_shm_offsets[i]) {
 		case BWN_WME_VOICE:
 			p->wmep_txopLimit = 0;
 			p->wmep_aifsn = 2;
 			/* XXX FIXME: log2(cwmin) */
 			p->wmep_logcwmin =
 			    _IEEE80211_MASKSHIFT(0x0001, WME_PARAM_LOGCWMIN);
 			p->wmep_logcwmax =
 			    _IEEE80211_MASKSHIFT(0x0001, WME_PARAM_LOGCWMAX);
 			break;
 		case BWN_WME_VIDEO:
 			p->wmep_txopLimit = 0;
 			p->wmep_aifsn = 2;
 			/* XXX FIXME: log2(cwmin) */
 			p->wmep_logcwmin =
 			    _IEEE80211_MASKSHIFT(0x0001, WME_PARAM_LOGCWMIN);
 			p->wmep_logcwmax =
 			    _IEEE80211_MASKSHIFT(0x0001, WME_PARAM_LOGCWMAX);
 			break;
 		case BWN_WME_BESTEFFORT:
 			p->wmep_txopLimit = 0;
 			p->wmep_aifsn = 3;
 			/* XXX FIXME: log2(cwmin) */
 			p->wmep_logcwmin =
 			    _IEEE80211_MASKSHIFT(0x0001, WME_PARAM_LOGCWMIN);
 			p->wmep_logcwmax =
 			    _IEEE80211_MASKSHIFT(0x03ff, WME_PARAM_LOGCWMAX);
 			break;
 		case BWN_WME_BACKGROUND:
 			p->wmep_txopLimit = 0;
 			p->wmep_aifsn = 7;
 			/* XXX FIXME: log2(cwmin) */
 			p->wmep_logcwmin =
 			    _IEEE80211_MASKSHIFT(0x0001, WME_PARAM_LOGCWMIN);
 			p->wmep_logcwmax =
 			    _IEEE80211_MASKSHIFT(0x03ff, WME_PARAM_LOGCWMAX);
 			break;
 		default:
 			KASSERT(0 == 1, ("%s:%d: fail", __func__, __LINE__));
 		}
 	}
 }
 
 static int
 bwn_core_forceclk(struct bwn_mac *mac, bool force)
 {
 	struct bwn_softc	*sc;
 	bhnd_clock		 clock;
 	int			 error;
 
 	sc = mac->mac_sc;
 
 	/* On PMU equipped devices, we do not need to force the HT clock */
 	if (sc->sc_pmu != NULL)
 		return (0);
 
 	/* Issue a PMU clock request */
 	if (force)
 		clock = BHND_CLOCK_HT;
 	else
 		clock = BHND_CLOCK_DYN;
 
 	if ((error = bhnd_request_clock(sc->sc_dev, clock))) {
 		device_printf(sc->sc_dev, "%d clock request failed: %d\n",
 		    clock, error);
 		return (error);
 	}
 
 	return (0);
 }
 
 static int
 bwn_core_init(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	uint64_t hf;
 	int error;
 
 	KASSERT(mac->mac_status == BWN_MAC_STATUS_UNINIT,
 	    ("%s:%d: fail", __func__, __LINE__));
 
 	DPRINTF(mac->mac_sc, BWN_DEBUG_RESET, "%s: called\n", __func__);
 
 	if ((error = bwn_core_forceclk(mac, true)))
 		return (error);
 
 	if (bhnd_is_hw_suspended(sc->sc_dev)) {
 		if ((error = bwn_reset_core(mac, mac->mac_phy.gmode)))
 			goto fail0;
 	}
 
 	mac->mac_flags &= ~BWN_MAC_FLAG_DFQVALID;
 	mac->mac_flags |= BWN_MAC_FLAG_RADIO_ON;
 	mac->mac_phy.hwpctl = (bwn_hwpctl) ? 1 : 0;
 	BWN_GETTIME(mac->mac_phy.nexttime);
 	mac->mac_phy.txerrors = BWN_TXERROR_MAX;
 	bzero(&mac->mac_stats, sizeof(mac->mac_stats));
 	mac->mac_stats.link_noise = -95;
 	mac->mac_reason_intr = 0;
 	bzero(mac->mac_reason, sizeof(mac->mac_reason));
 	mac->mac_intr_mask = BWN_INTR_MASKTEMPLATE;
 #ifdef BWN_DEBUG
 	if (sc->sc_debug & BWN_DEBUG_XMIT)
 		mac->mac_intr_mask &= ~BWN_INTR_PHY_TXERR;
 #endif
 	mac->mac_suspended = 1;
 	mac->mac_task_state = 0;
 	memset(&mac->mac_noise, 0, sizeof(mac->mac_noise));
 
 	mac->mac_phy.init_pre(mac);
 
 	bwn_bt_disable(mac);
 	if (mac->mac_phy.prepare_hw) {
 		error = mac->mac_phy.prepare_hw(mac);
 		if (error)
 			goto fail0;
 	}
 	DPRINTF(mac->mac_sc, BWN_DEBUG_RESET, "%s: chip_init\n", __func__);
 	error = bwn_chip_init(mac);
 	if (error)
 		goto fail0;
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_COREREV,
 	    bhnd_get_hwrev(sc->sc_dev));
 	hf = bwn_hf_read(mac);
 	if (mac->mac_phy.type == BWN_PHYTYPE_G) {
 		hf |= BWN_HF_GPHY_SYM_WORKAROUND;
 		if (sc->sc_board_info.board_flags & BHND_BFL_PACTRL)
 			hf |= BWN_HF_PAGAINBOOST_OFDM_ON;
 		if (mac->mac_phy.rev == 1)
 			hf |= BWN_HF_GPHY_DC_CANCELFILTER;
 	}
 	if (mac->mac_phy.rf_ver == 0x2050) {
 		if (mac->mac_phy.rf_rev < 6)
 			hf |= BWN_HF_FORCE_VCO_RECALC;
 		if (mac->mac_phy.rf_rev == 6)
 			hf |= BWN_HF_4318_TSSI;
 	}
 	if (sc->sc_board_info.board_flags & BHND_BFL_NOPLLDOWN)
 		hf |= BWN_HF_SLOWCLOCK_REQ_OFF;
 	if (sc->sc_quirks & BWN_QUIRK_UCODE_SLOWCLOCK_WAR)
 		hf |= BWN_HF_PCI_SLOWCLOCK_WORKAROUND;
 	hf &= ~BWN_HF_SKIP_CFP_UPDATE;
 	bwn_hf_write(mac, hf);
 
 	/* Tell the firmware about the MAC capabilities */
 	if (bhnd_get_hwrev(sc->sc_dev) >= 13) {
 		uint32_t cap;
 		cap = BWN_READ_4(mac, BWN_MAC_HW_CAP);
 		DPRINTF(sc, BWN_DEBUG_RESET,
 		    "%s: hw capabilities: 0x%08x\n",
 		    __func__, cap);
 		bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_MACHW_L,
 		    cap & 0xffff);
 		bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_MACHW_H,
 		    (cap >> 16) & 0xffff);
 	}
 
 	bwn_set_txretry(mac, BWN_RETRY_SHORT, BWN_RETRY_LONG);
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_SHORT_RETRY_FALLBACK, 3);
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_LONG_RETRY_FALLBACK, 2);
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_PROBE_RESP_MAXTIME, 1);
 
 	bwn_rate_init(mac);
 	bwn_set_phytxctl(mac);
 
 	bwn_shm_write_2(mac, BWN_SCRATCH, BWN_SCRATCH_CONT_MIN,
 	    (mac->mac_phy.type == BWN_PHYTYPE_B) ? 0x1f : 0xf);
 	bwn_shm_write_2(mac, BWN_SCRATCH, BWN_SCRATCH_CONT_MAX, 0x3ff);
 
 	if (sc->sc_quirks & BWN_QUIRK_NODMA)
 		bwn_pio_init(mac);
 	else
 		bwn_dma_init(mac);
 	bwn_wme_init(mac);
 	bwn_spu_setdelay(mac, 1);
 	bwn_bt_enable(mac);
 
 	DPRINTF(mac->mac_sc, BWN_DEBUG_RESET, "%s: powerup\n", __func__);
 	if (sc->sc_board_info.board_flags & BHND_BFL_NOPLLDOWN)
 		bwn_core_forceclk(mac, true);
 	else
 		bwn_core_forceclk(mac, false);
 
 	bwn_set_macaddr(mac);
 	bwn_crypt_init(mac);
 
 	/* XXX LED initializatin */
 
 	mac->mac_status = BWN_MAC_STATUS_INITED;
 
 	DPRINTF(mac->mac_sc, BWN_DEBUG_RESET, "%s: done\n", __func__);
 	return (error);
 
 fail0:
 	bhnd_suspend_hw(sc->sc_dev, 0);
 	KASSERT(mac->mac_status == BWN_MAC_STATUS_UNINIT,
 	    ("%s:%d: fail", __func__, __LINE__));
 	DPRINTF(mac->mac_sc, BWN_DEBUG_RESET, "%s: fail\n", __func__);
 	return (error);
 }
 
 static void
 bwn_core_start(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	uint32_t tmp;
 
 	KASSERT(mac->mac_status == BWN_MAC_STATUS_INITED,
 	    ("%s:%d: fail", __func__, __LINE__));
 
 	if (bhnd_get_hwrev(sc->sc_dev) < 5)
 		return;
 
 	while (1) {
 		tmp = BWN_READ_4(mac, BWN_XMITSTAT_0);
 		if (!(tmp & 0x00000001))
 			break;
 		tmp = BWN_READ_4(mac, BWN_XMITSTAT_1);
 	}
 
 	bwn_mac_enable(mac);
 	BWN_WRITE_4(mac, BWN_INTR_MASK, mac->mac_intr_mask);
 	callout_reset(&sc->sc_task_ch, hz * 15, bwn_tasks, mac);
 
 	mac->mac_status = BWN_MAC_STATUS_STARTED;
 }
 
 static void
 bwn_core_exit(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	uint32_t macctl;
 
 	BWN_ASSERT_LOCKED(mac->mac_sc);
 
 	KASSERT(mac->mac_status <= BWN_MAC_STATUS_INITED,
 	    ("%s:%d: fail", __func__, __LINE__));
 
 	if (mac->mac_status != BWN_MAC_STATUS_INITED)
 		return;
 	mac->mac_status = BWN_MAC_STATUS_UNINIT;
 
 	macctl = BWN_READ_4(mac, BWN_MACCTL);
 	macctl &= ~BWN_MACCTL_MCODE_RUN;
 	macctl |= BWN_MACCTL_MCODE_JMP0;
 	BWN_WRITE_4(mac, BWN_MACCTL, macctl);
 
 	bwn_dma_stop(mac);
 	bwn_pio_stop(mac);
 	bwn_chip_exit(mac);
 	mac->mac_phy.switch_analog(mac, 0);
 	bhnd_suspend_hw(sc->sc_dev, 0);
 }
 
 static void
 bwn_bt_disable(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 
 	(void)sc;
 	/* XXX do nothing yet */
 }
 
 static int
 bwn_chip_init(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	struct bwn_phy *phy = &mac->mac_phy;
 	uint32_t macctl;
 	u_int delay;
 	int error;
 
 	macctl = BWN_MACCTL_IHR_ON | BWN_MACCTL_SHM_ON | BWN_MACCTL_STA;
 	if (phy->gmode)
 		macctl |= BWN_MACCTL_GMODE;
 	BWN_WRITE_4(mac, BWN_MACCTL, macctl);
 
 	error = bwn_fw_fillinfo(mac);
 	if (error)
 		return (error);
 	error = bwn_fw_loaducode(mac);
 	if (error)
 		return (error);
 
 	error = bwn_gpio_init(mac);
 	if (error)
 		return (error);
 
 	error = bwn_fw_loadinitvals(mac);
 	if (error)
 		return (error);
 
 	phy->switch_analog(mac, 1);
 	error = bwn_phy_init(mac);
 	if (error)
 		return (error);
 
 	if (phy->set_im)
 		phy->set_im(mac, BWN_IMMODE_NONE);
 	if (phy->set_antenna)
 		phy->set_antenna(mac, BWN_ANT_DEFAULT);
 	bwn_set_txantenna(mac, BWN_ANT_DEFAULT);
 
 	if (phy->type == BWN_PHYTYPE_B)
 		BWN_WRITE_2(mac, 0x005e, BWN_READ_2(mac, 0x005e) | 0x0004);
 	BWN_WRITE_4(mac, 0x0100, 0x01000000);
 	if (bhnd_get_hwrev(sc->sc_dev) < 5)
 		BWN_WRITE_4(mac, 0x010c, 0x01000000);
 
 	BWN_WRITE_4(mac, BWN_MACCTL,
 	    BWN_READ_4(mac, BWN_MACCTL) & ~BWN_MACCTL_STA);
 	BWN_WRITE_4(mac, BWN_MACCTL,
 	    BWN_READ_4(mac, BWN_MACCTL) | BWN_MACCTL_STA);
 	bwn_shm_write_2(mac, BWN_SHARED, 0x0074, 0x0000);
 
 	bwn_set_opmode(mac);
 	if (bhnd_get_hwrev(sc->sc_dev) < 3) {
 		BWN_WRITE_2(mac, 0x060e, 0x0000);
 		BWN_WRITE_2(mac, 0x0610, 0x8000);
 		BWN_WRITE_2(mac, 0x0604, 0x0000);
 		BWN_WRITE_2(mac, 0x0606, 0x0200);
 	} else {
 		BWN_WRITE_4(mac, 0x0188, 0x80000000);
 		BWN_WRITE_4(mac, 0x018c, 0x02000000);
 	}
 	BWN_WRITE_4(mac, BWN_INTR_REASON, 0x00004000);
 	BWN_WRITE_4(mac, BWN_DMA0_INTR_MASK, 0x0001dc00);
 	BWN_WRITE_4(mac, BWN_DMA1_INTR_MASK, 0x0000dc00);
 	BWN_WRITE_4(mac, BWN_DMA2_INTR_MASK, 0x0000dc00);
 	BWN_WRITE_4(mac, BWN_DMA3_INTR_MASK, 0x0001dc00);
 	BWN_WRITE_4(mac, BWN_DMA4_INTR_MASK, 0x0000dc00);
 	BWN_WRITE_4(mac, BWN_DMA5_INTR_MASK, 0x0000dc00);
 
 	bwn_mac_phy_clock_set(mac, true);
 
 	/* Provide the HT clock transition latency to the MAC core */
 	error = bhnd_get_clock_latency(sc->sc_dev, BHND_CLOCK_HT, &delay);
 	if (error) {
 		device_printf(sc->sc_dev, "failed to fetch HT clock latency: "
 		    "%d\n", error);
 		return (error);
 	}
 
 	if (delay > UINT16_MAX) {
 		device_printf(sc->sc_dev, "invalid HT clock latency: %u\n",
 		    delay);
 		return (ENXIO);
 	}
 
 	BWN_WRITE_2(mac, BWN_POWERUP_DELAY, delay);
 	return (0);
 }
 
 /* read hostflags */
 uint64_t
 bwn_hf_read(struct bwn_mac *mac)
 {
 	uint64_t ret;
 
 	ret = bwn_shm_read_2(mac, BWN_SHARED, BWN_SHARED_HFHI);
 	ret <<= 16;
 	ret |= bwn_shm_read_2(mac, BWN_SHARED, BWN_SHARED_HFMI);
 	ret <<= 16;
 	ret |= bwn_shm_read_2(mac, BWN_SHARED, BWN_SHARED_HFLO);
 	return (ret);
 }
 
 void
 bwn_hf_write(struct bwn_mac *mac, uint64_t value)
 {
 
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_HFLO,
 	    (value & 0x00000000ffffull));
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_HFMI,
 	    (value & 0x0000ffff0000ull) >> 16);
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_HFHI,
 	    (value & 0xffff00000000ULL) >> 32);
 }
 
 static void
 bwn_set_txretry(struct bwn_mac *mac, int s, int l)
 {
 
 	bwn_shm_write_2(mac, BWN_SCRATCH, BWN_SCRATCH_SHORT_RETRY, MIN(s, 0xf));
 	bwn_shm_write_2(mac, BWN_SCRATCH, BWN_SCRATCH_LONG_RETRY, MIN(l, 0xf));
 }
 
 static void
 bwn_rate_init(struct bwn_mac *mac)
 {
 
 	switch (mac->mac_phy.type) {
 	case BWN_PHYTYPE_A:
 	case BWN_PHYTYPE_G:
 	case BWN_PHYTYPE_LP:
 	case BWN_PHYTYPE_N:
 		bwn_rate_write(mac, BWN_OFDM_RATE_6MB, 1);
 		bwn_rate_write(mac, BWN_OFDM_RATE_12MB, 1);
 		bwn_rate_write(mac, BWN_OFDM_RATE_18MB, 1);
 		bwn_rate_write(mac, BWN_OFDM_RATE_24MB, 1);
 		bwn_rate_write(mac, BWN_OFDM_RATE_36MB, 1);
 		bwn_rate_write(mac, BWN_OFDM_RATE_48MB, 1);
 		bwn_rate_write(mac, BWN_OFDM_RATE_54MB, 1);
 		if (mac->mac_phy.type == BWN_PHYTYPE_A)
 			break;
 		/* FALLTHROUGH */
 	case BWN_PHYTYPE_B:
 		bwn_rate_write(mac, BWN_CCK_RATE_1MB, 0);
 		bwn_rate_write(mac, BWN_CCK_RATE_2MB, 0);
 		bwn_rate_write(mac, BWN_CCK_RATE_5MB, 0);
 		bwn_rate_write(mac, BWN_CCK_RATE_11MB, 0);
 		break;
 	default:
 		KASSERT(0 == 1, ("%s:%d: fail", __func__, __LINE__));
 	}
 }
 
 static void
 bwn_rate_write(struct bwn_mac *mac, uint16_t rate, int ofdm)
 {
 	uint16_t offset;
 
 	if (ofdm) {
 		offset = 0x480;
 		offset += (bwn_plcp_getofdm(rate) & 0x000f) * 2;
 	} else {
 		offset = 0x4c0;
 		offset += (bwn_plcp_getcck(rate) & 0x000f) * 2;
 	}
 	bwn_shm_write_2(mac, BWN_SHARED, offset + 0x20,
 	    bwn_shm_read_2(mac, BWN_SHARED, offset));
 }
 
 static uint8_t
 bwn_plcp_getcck(const uint8_t bitrate)
 {
 
 	switch (bitrate) {
 	case BWN_CCK_RATE_1MB:
 		return (0x0a);
 	case BWN_CCK_RATE_2MB:
 		return (0x14);
 	case BWN_CCK_RATE_5MB:
 		return (0x37);
 	case BWN_CCK_RATE_11MB:
 		return (0x6e);
 	}
 	KASSERT(0 == 1, ("%s:%d: fail", __func__, __LINE__));
 	return (0);
 }
 
 static uint8_t
 bwn_plcp_getofdm(const uint8_t bitrate)
 {
 
 	switch (bitrate) {
 	case BWN_OFDM_RATE_6MB:
 		return (0xb);
 	case BWN_OFDM_RATE_9MB:
 		return (0xf);
 	case BWN_OFDM_RATE_12MB:
 		return (0xa);
 	case BWN_OFDM_RATE_18MB:
 		return (0xe);
 	case BWN_OFDM_RATE_24MB:
 		return (0x9);
 	case BWN_OFDM_RATE_36MB:
 		return (0xd);
 	case BWN_OFDM_RATE_48MB:
 		return (0x8);
 	case BWN_OFDM_RATE_54MB:
 		return (0xc);
 	}
 	KASSERT(0 == 1, ("%s:%d: fail", __func__, __LINE__));
 	return (0);
 }
 
 static void
 bwn_set_phytxctl(struct bwn_mac *mac)
 {
 	uint16_t ctl;
 
 	ctl = (BWN_TX_PHY_ENC_CCK | BWN_TX_PHY_ANT01AUTO |
 	    BWN_TX_PHY_TXPWR);
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_BEACON_PHYCTL, ctl);
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_ACKCTS_PHYCTL, ctl);
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_PROBE_RESP_PHYCTL, ctl);
 }
 
 static void
 bwn_pio_init(struct bwn_mac *mac)
 {
 	struct bwn_pio *pio = &mac->mac_method.pio;
 
 	BWN_WRITE_4(mac, BWN_MACCTL, BWN_READ_4(mac, BWN_MACCTL)
 	    & ~BWN_MACCTL_BIGENDIAN);
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_RX_PADOFFSET, 0);
 
 	bwn_pio_set_txqueue(mac, &pio->wme[WME_AC_BK], 0);
 	bwn_pio_set_txqueue(mac, &pio->wme[WME_AC_BE], 1);
 	bwn_pio_set_txqueue(mac, &pio->wme[WME_AC_VI], 2);
 	bwn_pio_set_txqueue(mac, &pio->wme[WME_AC_VO], 3);
 	bwn_pio_set_txqueue(mac, &pio->mcast, 4);
 	bwn_pio_setupqueue_rx(mac, &pio->rx, 0);
 }
 
 static void
 bwn_pio_set_txqueue(struct bwn_mac *mac, struct bwn_pio_txqueue *tq,
     int index)
 {
 	struct bwn_pio_txpkt *tp;
 	struct bwn_softc *sc = mac->mac_sc;
 	unsigned int i;
 
 	tq->tq_base = bwn_pio_idx2base(mac, index) + BWN_PIO_TXQOFFSET(mac);
 	tq->tq_index = index;
 
 	tq->tq_free = BWN_PIO_MAX_TXPACKETS;
 	if (bhnd_get_hwrev(sc->sc_dev) >= 8)
 		tq->tq_size = 1920;
 	else {
 		tq->tq_size = bwn_pio_read_2(mac, tq, BWN_PIO_TXQBUFSIZE);
 		tq->tq_size -= 80;
 	}
 
 	TAILQ_INIT(&tq->tq_pktlist);
 	for (i = 0; i < N(tq->tq_pkts); i++) {
 		tp = &(tq->tq_pkts[i]);
 		tp->tp_index = i;
 		tp->tp_queue = tq;
 		TAILQ_INSERT_TAIL(&tq->tq_pktlist, tp, tp_list);
 	}
 }
 
 static uint16_t
 bwn_pio_idx2base(struct bwn_mac *mac, int index)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	static const uint16_t bases[] = {
 		BWN_PIO_BASE0,
 		BWN_PIO_BASE1,
 		BWN_PIO_BASE2,
 		BWN_PIO_BASE3,
 		BWN_PIO_BASE4,
 		BWN_PIO_BASE5,
 		BWN_PIO_BASE6,
 		BWN_PIO_BASE7,
 	};
 	static const uint16_t bases_rev11[] = {
 		BWN_PIO11_BASE0,
 		BWN_PIO11_BASE1,
 		BWN_PIO11_BASE2,
 		BWN_PIO11_BASE3,
 		BWN_PIO11_BASE4,
 		BWN_PIO11_BASE5,
 	};
 
 	if (bhnd_get_hwrev(sc->sc_dev) >= 11) {
 		if (index >= N(bases_rev11))
 			device_printf(sc->sc_dev, "%s: warning\n", __func__);
 		return (bases_rev11[index]);
 	}
 	if (index >= N(bases))
 		device_printf(sc->sc_dev, "%s: warning\n", __func__);
 	return (bases[index]);
 }
 
 static void
 bwn_pio_setupqueue_rx(struct bwn_mac *mac, struct bwn_pio_rxqueue *prq,
     int index)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 
 	prq->prq_mac = mac;
 	prq->prq_rev = bhnd_get_hwrev(sc->sc_dev);
 	prq->prq_base = bwn_pio_idx2base(mac, index) + BWN_PIO_RXQOFFSET(mac);
 	bwn_dma_rxdirectfifo(mac, index, 1);
 }
 
 static void
 bwn_destroy_pioqueue_tx(struct bwn_pio_txqueue *tq)
 {
 	if (tq == NULL)
 		return;
 	bwn_pio_cancel_tx_packets(tq);
 }
 
 static void
 bwn_destroy_queue_tx(struct bwn_pio_txqueue *pio)
 {
 
 	bwn_destroy_pioqueue_tx(pio);
 }
 
 static uint16_t
 bwn_pio_read_2(struct bwn_mac *mac, struct bwn_pio_txqueue *tq,
     uint16_t offset)
 {
 
 	return (BWN_READ_2(mac, tq->tq_base + offset));
 }
 
 static void
 bwn_dma_rxdirectfifo(struct bwn_mac *mac, int idx, uint8_t enable)
 {
 	uint32_t ctl;
 	uint16_t base;
 
 	base = bwn_dma_base(mac->mac_dmatype, idx);
 	if (mac->mac_dmatype == BHND_DMA_ADDR_64BIT) {
 		ctl = BWN_READ_4(mac, base + BWN_DMA64_RXCTL);
 		ctl &= ~BWN_DMA64_RXDIRECTFIFO;
 		if (enable)
 			ctl |= BWN_DMA64_RXDIRECTFIFO;
 		BWN_WRITE_4(mac, base + BWN_DMA64_RXCTL, ctl);
 	} else {
 		ctl = BWN_READ_4(mac, base + BWN_DMA32_RXCTL);
 		ctl &= ~BWN_DMA32_RXDIRECTFIFO;
 		if (enable)
 			ctl |= BWN_DMA32_RXDIRECTFIFO;
 		BWN_WRITE_4(mac, base + BWN_DMA32_RXCTL, ctl);
 	}
 }
 
 static void
 bwn_pio_cancel_tx_packets(struct bwn_pio_txqueue *tq)
 {
 	struct bwn_pio_txpkt *tp;
 	unsigned int i;
 
 	for (i = 0; i < N(tq->tq_pkts); i++) {
 		tp = &(tq->tq_pkts[i]);
 		if (tp->tp_m) {
 			m_freem(tp->tp_m);
 			tp->tp_m = NULL;
 		}
 	}
 }
 
 static uint16_t
 bwn_dma_base(int type, int controller_idx)
 {
 	static const uint16_t map64[] = {
 		BWN_DMA64_BASE0,
 		BWN_DMA64_BASE1,
 		BWN_DMA64_BASE2,
 		BWN_DMA64_BASE3,
 		BWN_DMA64_BASE4,
 		BWN_DMA64_BASE5,
 	};
 	static const uint16_t map32[] = {
 		BWN_DMA32_BASE0,
 		BWN_DMA32_BASE1,
 		BWN_DMA32_BASE2,
 		BWN_DMA32_BASE3,
 		BWN_DMA32_BASE4,
 		BWN_DMA32_BASE5,
 	};
 
 	if (type == BHND_DMA_ADDR_64BIT) {
 		KASSERT(controller_idx >= 0 && controller_idx < N(map64),
 		    ("%s:%d: fail", __func__, __LINE__));
 		return (map64[controller_idx]);
 	}
 	KASSERT(controller_idx >= 0 && controller_idx < N(map32),
 	    ("%s:%d: fail", __func__, __LINE__));
 	return (map32[controller_idx]);
 }
 
 static void
 bwn_dma_init(struct bwn_mac *mac)
 {
 	struct bwn_dma *dma = &mac->mac_method.dma;
 
 	/* setup TX DMA channels. */
 	bwn_dma_setup(dma->wme[WME_AC_BK]);
 	bwn_dma_setup(dma->wme[WME_AC_BE]);
 	bwn_dma_setup(dma->wme[WME_AC_VI]);
 	bwn_dma_setup(dma->wme[WME_AC_VO]);
 	bwn_dma_setup(dma->mcast);
 	/* setup RX DMA channel. */
 	bwn_dma_setup(dma->rx);
 }
 
 static struct bwn_dma_ring *
 bwn_dma_ringsetup(struct bwn_mac *mac, int controller_index,
     int for_tx)
 {
 	struct bwn_dma *dma = &mac->mac_method.dma;
 	struct bwn_dma_ring *dr;
 	struct bwn_dmadesc_generic *desc;
 	struct bwn_dmadesc_meta *mt;
 	struct bwn_softc *sc = mac->mac_sc;
 	int error, i;
 
 	dr = malloc(sizeof(*dr), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (dr == NULL)
 		goto out;
 	dr->dr_numslots = BWN_RXRING_SLOTS;
 	if (for_tx)
 		dr->dr_numslots = BWN_TXRING_SLOTS;
 
 	dr->dr_meta = malloc(dr->dr_numslots * sizeof(struct bwn_dmadesc_meta),
 	    M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (dr->dr_meta == NULL)
 		goto fail0;
 
 	dr->dr_type = mac->mac_dmatype;
 	dr->dr_mac = mac;
 	dr->dr_base = bwn_dma_base(dr->dr_type, controller_index);
 	dr->dr_index = controller_index;
 	if (dr->dr_type == BHND_DMA_ADDR_64BIT) {
 		dr->getdesc = bwn_dma_64_getdesc;
 		dr->setdesc = bwn_dma_64_setdesc;
 		dr->start_transfer = bwn_dma_64_start_transfer;
 		dr->suspend = bwn_dma_64_suspend;
 		dr->resume = bwn_dma_64_resume;
 		dr->get_curslot = bwn_dma_64_get_curslot;
 		dr->set_curslot = bwn_dma_64_set_curslot;
 	} else {
 		dr->getdesc = bwn_dma_32_getdesc;
 		dr->setdesc = bwn_dma_32_setdesc;
 		dr->start_transfer = bwn_dma_32_start_transfer;
 		dr->suspend = bwn_dma_32_suspend;
 		dr->resume = bwn_dma_32_resume;
 		dr->get_curslot = bwn_dma_32_get_curslot;
 		dr->set_curslot = bwn_dma_32_set_curslot;
 	}
 	if (for_tx) {
 		dr->dr_tx = 1;
 		dr->dr_curslot = -1;
 	} else {
 		if (dr->dr_index == 0) {
 			switch (mac->mac_fw.fw_hdr_format) {
 			case BWN_FW_HDR_351:
 			case BWN_FW_HDR_410:
 				dr->dr_rx_bufsize =
 				    BWN_DMA0_RX_BUFFERSIZE_FW351;
 				dr->dr_frameoffset =
 				    BWN_DMA0_RX_FRAMEOFFSET_FW351;
 				break;
 			case BWN_FW_HDR_598:
 				dr->dr_rx_bufsize =
 				    BWN_DMA0_RX_BUFFERSIZE_FW598;
 				dr->dr_frameoffset =
 				    BWN_DMA0_RX_FRAMEOFFSET_FW598;
 				break;
 			}
 		} else
 			KASSERT(0 == 1, ("%s:%d: fail", __func__, __LINE__));
 	}
 
 	error = bwn_dma_allocringmemory(dr);
 	if (error)
 		goto fail2;
 
 	if (for_tx) {
 		/*
 		 * Assumption: BWN_TXRING_SLOTS can be divided by
 		 * BWN_TX_SLOTS_PER_FRAME
 		 */
 		KASSERT(BWN_TXRING_SLOTS % BWN_TX_SLOTS_PER_FRAME == 0,
 		    ("%s:%d: fail", __func__, __LINE__));
 
 		dr->dr_txhdr_cache = contigmalloc(
 		    (dr->dr_numslots / BWN_TX_SLOTS_PER_FRAME) *
 		    BWN_MAXTXHDRSIZE, M_DEVBUF, M_ZERO,
 		    0, BUS_SPACE_MAXADDR, 8, 0);
 		if (dr->dr_txhdr_cache == NULL) {
 			device_printf(sc->sc_dev,
 			    "can't allocate TX header DMA memory\n");
 			goto fail1;
 		}
 
 		/*
 		 * Create TX ring DMA stuffs
 		 */
 		error = bus_dma_tag_create(dma->parent_dtag,
 				    BWN_ALIGN, 0,
 				    BUS_SPACE_MAXADDR,
 				    BUS_SPACE_MAXADDR,
 				    NULL, NULL,
 				    BWN_HDRSIZE(mac),
 				    1,
 				    BUS_SPACE_MAXSIZE_32BIT,
 				    0,
 				    NULL, NULL,
 				    &dr->dr_txring_dtag);
 		if (error) {
 			device_printf(sc->sc_dev,
 			    "can't create TX ring DMA tag: TODO frees\n");
 			goto fail2;
 		}
 
 		for (i = 0; i < dr->dr_numslots; i += 2) {
 			dr->getdesc(dr, i, &desc, &mt);
 
 			mt->mt_txtype = BWN_DMADESC_METATYPE_HEADER;
 			mt->mt_m = NULL;
 			mt->mt_ni = NULL;
 			mt->mt_islast = 0;
 			error = bus_dmamap_create(dr->dr_txring_dtag, 0,
 			    &mt->mt_dmap);
 			if (error) {
 				device_printf(sc->sc_dev,
 				     "can't create RX buf DMA map\n");
 				goto fail2;
 			}
 
 			dr->getdesc(dr, i + 1, &desc, &mt);
 
 			mt->mt_txtype = BWN_DMADESC_METATYPE_BODY;
 			mt->mt_m = NULL;
 			mt->mt_ni = NULL;
 			mt->mt_islast = 1;
 			error = bus_dmamap_create(dma->txbuf_dtag, 0,
 			    &mt->mt_dmap);
 			if (error) {
 				device_printf(sc->sc_dev,
 				     "can't create RX buf DMA map\n");
 				goto fail2;
 			}
 		}
 	} else {
 		error = bus_dmamap_create(dma->rxbuf_dtag, 0,
 		    &dr->dr_spare_dmap);
 		if (error) {
 			device_printf(sc->sc_dev,
 			    "can't create RX buf DMA map\n");
 			goto out;		/* XXX wrong! */
 		}
 
 		for (i = 0; i < dr->dr_numslots; i++) {
 			dr->getdesc(dr, i, &desc, &mt);
 
 			error = bus_dmamap_create(dma->rxbuf_dtag, 0,
 			    &mt->mt_dmap);
 			if (error) {
 				device_printf(sc->sc_dev,
 				    "can't create RX buf DMA map\n");
 				goto out;	/* XXX wrong! */
 			}
 			error = bwn_dma_newbuf(dr, desc, mt, 1);
 			if (error) {
 				device_printf(sc->sc_dev,
 				    "failed to allocate RX buf\n");
 				goto out;	/* XXX wrong! */
 			}
 		}
 
 		bus_dmamap_sync(dr->dr_ring_dtag, dr->dr_ring_dmap,
 		    BUS_DMASYNC_PREWRITE);
 
 		dr->dr_usedslot = dr->dr_numslots;
 	}
 
       out:
 	return (dr);
 
 fail2:
-	if (dr->dr_txhdr_cache != NULL) {
-		contigfree(dr->dr_txhdr_cache,
-		    (dr->dr_numslots / BWN_TX_SLOTS_PER_FRAME) *
-		    BWN_MAXTXHDRSIZE, M_DEVBUF);
-	}
+	free(dr->dr_txhdr_cache, M_DEVBUF);
 fail1:
 	free(dr->dr_meta, M_DEVBUF);
 fail0:
 	free(dr, M_DEVBUF);
 	return (NULL);
 }
 
 static void
 bwn_dma_ringfree(struct bwn_dma_ring **dr)
 {
 
 	if (dr == NULL)
 		return;
 
 	bwn_dma_free_descbufs(*dr);
 	bwn_dma_free_ringmemory(*dr);
 
-	if ((*dr)->dr_txhdr_cache != NULL) {
-		contigfree((*dr)->dr_txhdr_cache,
-		    ((*dr)->dr_numslots / BWN_TX_SLOTS_PER_FRAME) *
-		    BWN_MAXTXHDRSIZE, M_DEVBUF);
-	}
+	free((*dr)->dr_txhdr_cache, M_DEVBUF);
 	free((*dr)->dr_meta, M_DEVBUF);
 	free(*dr, M_DEVBUF);
 
 	*dr = NULL;
 }
 
 static void
 bwn_dma_32_getdesc(struct bwn_dma_ring *dr, int slot,
     struct bwn_dmadesc_generic **gdesc, struct bwn_dmadesc_meta **meta)
 {
 	struct bwn_dmadesc32 *desc;
 
 	*meta = &(dr->dr_meta[slot]);
 	desc = dr->dr_ring_descbase;
 	desc = &(desc[slot]);
 
 	*gdesc = (struct bwn_dmadesc_generic *)desc;
 }
 
 static void
 bwn_dma_32_setdesc(struct bwn_dma_ring *dr,
     struct bwn_dmadesc_generic *desc, bus_addr_t dmaaddr, uint16_t bufsize,
     int start, int end, int irq)
 {
 	struct bwn_dmadesc32		*descbase;
 	struct bwn_dma			*dma;
 	struct bhnd_dma_translation	*dt;
 	uint32_t			 addr, addrext, ctl;
 	int				 slot;
 
 	descbase = dr->dr_ring_descbase;
 	dma = &dr->dr_mac->mac_method.dma;
 	dt = &dma->translation;
 
 	slot = (int)(&(desc->dma.dma32) - descbase);
 	KASSERT(slot >= 0 && slot < dr->dr_numslots,
 	    ("%s:%d: fail", __func__, __LINE__));
 
 	addr = (dmaaddr & dt->addr_mask) | dt->base_addr;
 	addrext = ((dmaaddr & dt->addrext_mask) >> dma->addrext_shift);
 	ctl = bufsize & BWN_DMA32_DCTL_BYTECNT;
 	if (slot == dr->dr_numslots - 1)
 		ctl |= BWN_DMA32_DCTL_DTABLEEND;
 	if (start)
 		ctl |= BWN_DMA32_DCTL_FRAMESTART;
 	if (end)
 		ctl |= BWN_DMA32_DCTL_FRAMEEND;
 	if (irq)
 		ctl |= BWN_DMA32_DCTL_IRQ;
 	ctl |= (addrext << BWN_DMA32_DCTL_ADDREXT_SHIFT)
 	    & BWN_DMA32_DCTL_ADDREXT_MASK;
 
 	desc->dma.dma32.control = htole32(ctl);
 	desc->dma.dma32.address = htole32(addr);
 }
 
 static void
 bwn_dma_32_start_transfer(struct bwn_dma_ring *dr, int slot)
 {
 
 	BWN_DMA_WRITE(dr, BWN_DMA32_TXINDEX,
 	    (uint32_t)(slot * sizeof(struct bwn_dmadesc32)));
 }
 
 static void
 bwn_dma_32_suspend(struct bwn_dma_ring *dr)
 {
 
 	BWN_DMA_WRITE(dr, BWN_DMA32_TXCTL,
 	    BWN_DMA_READ(dr, BWN_DMA32_TXCTL) | BWN_DMA32_TXSUSPEND);
 }
 
 static void
 bwn_dma_32_resume(struct bwn_dma_ring *dr)
 {
 
 	BWN_DMA_WRITE(dr, BWN_DMA32_TXCTL,
 	    BWN_DMA_READ(dr, BWN_DMA32_TXCTL) & ~BWN_DMA32_TXSUSPEND);
 }
 
 static int
 bwn_dma_32_get_curslot(struct bwn_dma_ring *dr)
 {
 	uint32_t val;
 
 	val = BWN_DMA_READ(dr, BWN_DMA32_RXSTATUS);
 	val &= BWN_DMA32_RXDPTR;
 
 	return (val / sizeof(struct bwn_dmadesc32));
 }
 
 static void
 bwn_dma_32_set_curslot(struct bwn_dma_ring *dr, int slot)
 {
 
 	BWN_DMA_WRITE(dr, BWN_DMA32_RXINDEX,
 	    (uint32_t) (slot * sizeof(struct bwn_dmadesc32)));
 }
 
 static void
 bwn_dma_64_getdesc(struct bwn_dma_ring *dr, int slot,
     struct bwn_dmadesc_generic **gdesc, struct bwn_dmadesc_meta **meta)
 {
 	struct bwn_dmadesc64 *desc;
 
 	*meta = &(dr->dr_meta[slot]);
 	desc = dr->dr_ring_descbase;
 	desc = &(desc[slot]);
 
 	*gdesc = (struct bwn_dmadesc_generic *)desc;
 }
 
 static void
 bwn_dma_64_setdesc(struct bwn_dma_ring *dr,
     struct bwn_dmadesc_generic *desc, bus_addr_t dmaaddr, uint16_t bufsize,
     int start, int end, int irq)
 {
 	struct bwn_dmadesc64		*descbase;
 	struct bwn_dma			*dma;
 	struct bhnd_dma_translation	*dt;
 	bhnd_addr_t			 addr;
 	uint32_t			 addrhi, addrlo;
 	uint32_t			 addrext;
 	uint32_t			 ctl0, ctl1;
 	int				 slot;
 
 	descbase = dr->dr_ring_descbase;
 	dma = &dr->dr_mac->mac_method.dma;
 	dt = &dma->translation;
 
 	slot = (int)(&(desc->dma.dma64) - descbase);
 	KASSERT(slot >= 0 && slot < dr->dr_numslots,
 	    ("%s:%d: fail", __func__, __LINE__));
 
 	addr = (dmaaddr & dt->addr_mask) | dt->base_addr;
 	addrhi = (addr >> 32);
 	addrlo = (addr & UINT32_MAX);
 	addrext = ((dmaaddr & dt->addrext_mask) >> dma->addrext_shift);
 
 	ctl0 = 0;
 	if (slot == dr->dr_numslots - 1)
 		ctl0 |= BWN_DMA64_DCTL0_DTABLEEND;
 	if (start)
 		ctl0 |= BWN_DMA64_DCTL0_FRAMESTART;
 	if (end)
 		ctl0 |= BWN_DMA64_DCTL0_FRAMEEND;
 	if (irq)
 		ctl0 |= BWN_DMA64_DCTL0_IRQ;
 
 	ctl1 = 0;
 	ctl1 |= bufsize & BWN_DMA64_DCTL1_BYTECNT;
 	ctl1 |= (addrext << BWN_DMA64_DCTL1_ADDREXT_SHIFT)
 	    & BWN_DMA64_DCTL1_ADDREXT_MASK;
 
 	desc->dma.dma64.control0 = htole32(ctl0);
 	desc->dma.dma64.control1 = htole32(ctl1);
 	desc->dma.dma64.address_low = htole32(addrlo);
 	desc->dma.dma64.address_high = htole32(addrhi);
 }
 
 static void
 bwn_dma_64_start_transfer(struct bwn_dma_ring *dr, int slot)
 {
 
 	BWN_DMA_WRITE(dr, BWN_DMA64_TXINDEX,
 	    (uint32_t)(slot * sizeof(struct bwn_dmadesc64)));
 }
 
 static void
 bwn_dma_64_suspend(struct bwn_dma_ring *dr)
 {
 
 	BWN_DMA_WRITE(dr, BWN_DMA64_TXCTL,
 	    BWN_DMA_READ(dr, BWN_DMA64_TXCTL) | BWN_DMA64_TXSUSPEND);
 }
 
 static void
 bwn_dma_64_resume(struct bwn_dma_ring *dr)
 {
 
 	BWN_DMA_WRITE(dr, BWN_DMA64_TXCTL,
 	    BWN_DMA_READ(dr, BWN_DMA64_TXCTL) & ~BWN_DMA64_TXSUSPEND);
 }
 
 static int
 bwn_dma_64_get_curslot(struct bwn_dma_ring *dr)
 {
 	uint32_t val;
 
 	val = BWN_DMA_READ(dr, BWN_DMA64_RXSTATUS);
 	val &= BWN_DMA64_RXSTATDPTR;
 
 	return (val / sizeof(struct bwn_dmadesc64));
 }
 
 static void
 bwn_dma_64_set_curslot(struct bwn_dma_ring *dr, int slot)
 {
 
 	BWN_DMA_WRITE(dr, BWN_DMA64_RXINDEX,
 	    (uint32_t)(slot * sizeof(struct bwn_dmadesc64)));
 }
 
 static int
 bwn_dma_allocringmemory(struct bwn_dma_ring *dr)
 {
 	struct bwn_mac *mac = dr->dr_mac;
 	struct bwn_dma *dma = &mac->mac_method.dma;
 	struct bwn_softc *sc = mac->mac_sc;
 	int error;
 
 	error = bus_dma_tag_create(dma->parent_dtag,
 			    BWN_ALIGN, 0,
 			    BUS_SPACE_MAXADDR,
 			    BUS_SPACE_MAXADDR,
 			    NULL, NULL,
 			    BWN_DMA_RINGMEMSIZE,
 			    1,
 			    BUS_SPACE_MAXSIZE_32BIT,
 			    0,
 			    NULL, NULL,
 			    &dr->dr_ring_dtag);
 	if (error) {
 		device_printf(sc->sc_dev,
 		    "can't create TX ring DMA tag: TODO frees\n");
 		return (-1);
 	}
 
 	error = bus_dmamem_alloc(dr->dr_ring_dtag,
 	    &dr->dr_ring_descbase, BUS_DMA_WAITOK | BUS_DMA_ZERO,
 	    &dr->dr_ring_dmap);
 	if (error) {
 		device_printf(sc->sc_dev,
 		    "can't allocate DMA mem: TODO frees\n");
 		return (-1);
 	}
 	error = bus_dmamap_load(dr->dr_ring_dtag, dr->dr_ring_dmap,
 	    dr->dr_ring_descbase, BWN_DMA_RINGMEMSIZE,
 	    bwn_dma_ring_addr, &dr->dr_ring_dmabase, BUS_DMA_NOWAIT);
 	if (error) {
 		device_printf(sc->sc_dev,
 		    "can't load DMA mem: TODO free\n");
 		return (-1);
 	}
 
 	return (0);
 }
 
 static void
 bwn_dma_setup(struct bwn_dma_ring *dr)
 {
 	struct bwn_mac			*mac;
 	struct bwn_dma			*dma;
 	struct bhnd_dma_translation	*dt;
 	bhnd_addr_t			 addr, paddr;
 	uint32_t			 addrhi, addrlo, addrext, value;
 
 	mac = dr->dr_mac;
 	dma = &mac->mac_method.dma;
 	dt = &dma->translation;
 
 	paddr = dr->dr_ring_dmabase;
 	addr = (paddr & dt->addr_mask) | dt->base_addr;
 	addrhi = (addr >> 32);
 	addrlo = (addr & UINT32_MAX);
 	addrext = ((paddr & dt->addrext_mask) >> dma->addrext_shift);
 
 	if (dr->dr_tx) {
 		dr->dr_curslot = -1;
 
 		if (dr->dr_type == BHND_DMA_ADDR_64BIT) {
 			value = BWN_DMA64_TXENABLE;
 			value |= BWN_DMA64_TXPARITY_DISABLE;
 			value |= (addrext << BWN_DMA64_TXADDREXT_SHIFT)
 			    & BWN_DMA64_TXADDREXT_MASK;
 			BWN_DMA_WRITE(dr, BWN_DMA64_TXCTL, value);
 			BWN_DMA_WRITE(dr, BWN_DMA64_TXRINGLO, addrlo);
 			BWN_DMA_WRITE(dr, BWN_DMA64_TXRINGHI, addrhi);
 		} else {
 			value = BWN_DMA32_TXENABLE;
 			value |= BWN_DMA32_TXPARITY_DISABLE;
 			value |= (addrext << BWN_DMA32_TXADDREXT_SHIFT)
 			    & BWN_DMA32_TXADDREXT_MASK;
 			BWN_DMA_WRITE(dr, BWN_DMA32_TXCTL, value);
 			BWN_DMA_WRITE(dr, BWN_DMA32_TXRING, addrlo);
 		}
 		return;
 	}
 
 	/*
 	 * set for RX
 	 */
 	dr->dr_usedslot = dr->dr_numslots;
 
 	if (dr->dr_type == BHND_DMA_ADDR_64BIT) {
 		value = (dr->dr_frameoffset << BWN_DMA64_RXFROFF_SHIFT);
 		value |= BWN_DMA64_RXENABLE;
 		value |= BWN_DMA64_RXPARITY_DISABLE;
 		value |= (addrext << BWN_DMA64_RXADDREXT_SHIFT)
 		    & BWN_DMA64_RXADDREXT_MASK;
 		BWN_DMA_WRITE(dr, BWN_DMA64_RXCTL, value);
 		BWN_DMA_WRITE(dr, BWN_DMA64_RXRINGLO, addrlo);
 		BWN_DMA_WRITE(dr, BWN_DMA64_RXRINGHI, addrhi);
 		BWN_DMA_WRITE(dr, BWN_DMA64_RXINDEX, dr->dr_numslots *
 		    sizeof(struct bwn_dmadesc64));
 	} else {
 		value = (dr->dr_frameoffset << BWN_DMA32_RXFROFF_SHIFT);
 		value |= BWN_DMA32_RXENABLE;
 		value |= BWN_DMA32_RXPARITY_DISABLE;
 		value |= (addrext << BWN_DMA32_RXADDREXT_SHIFT)
 		    & BWN_DMA32_RXADDREXT_MASK;
 		BWN_DMA_WRITE(dr, BWN_DMA32_RXCTL, value);
 		BWN_DMA_WRITE(dr, BWN_DMA32_RXRING, addrlo);
 		BWN_DMA_WRITE(dr, BWN_DMA32_RXINDEX, dr->dr_numslots *
 		    sizeof(struct bwn_dmadesc32));
 	}
 }
 
 static void
 bwn_dma_free_ringmemory(struct bwn_dma_ring *dr)
 {
 
 	bus_dmamap_unload(dr->dr_ring_dtag, dr->dr_ring_dmap);
 	bus_dmamem_free(dr->dr_ring_dtag, dr->dr_ring_descbase,
 	    dr->dr_ring_dmap);
 }
 
 static void
 bwn_dma_cleanup(struct bwn_dma_ring *dr)
 {
 
 	if (dr->dr_tx) {
 		bwn_dma_tx_reset(dr->dr_mac, dr->dr_base, dr->dr_type);
 		if (dr->dr_type == BHND_DMA_ADDR_64BIT) {
 			BWN_DMA_WRITE(dr, BWN_DMA64_TXRINGLO, 0);
 			BWN_DMA_WRITE(dr, BWN_DMA64_TXRINGHI, 0);
 		} else
 			BWN_DMA_WRITE(dr, BWN_DMA32_TXRING, 0);
 	} else {
 		bwn_dma_rx_reset(dr->dr_mac, dr->dr_base, dr->dr_type);
 		if (dr->dr_type == BHND_DMA_ADDR_64BIT) {
 			BWN_DMA_WRITE(dr, BWN_DMA64_RXRINGLO, 0);
 			BWN_DMA_WRITE(dr, BWN_DMA64_RXRINGHI, 0);
 		} else
 			BWN_DMA_WRITE(dr, BWN_DMA32_RXRING, 0);
 	}
 }
 
 static void
 bwn_dma_free_descbufs(struct bwn_dma_ring *dr)
 {
 	struct bwn_dmadesc_generic *desc;
 	struct bwn_dmadesc_meta *meta;
 	struct bwn_mac *mac = dr->dr_mac;
 	struct bwn_dma *dma = &mac->mac_method.dma;
 	struct bwn_softc *sc = mac->mac_sc;
 	int i;
 
 	if (!dr->dr_usedslot)
 		return;
 	for (i = 0; i < dr->dr_numslots; i++) {
 		dr->getdesc(dr, i, &desc, &meta);
 
 		if (meta->mt_m == NULL) {
 			if (!dr->dr_tx)
 				device_printf(sc->sc_dev, "%s: not TX?\n",
 				    __func__);
 			continue;
 		}
 		if (dr->dr_tx) {
 			if (meta->mt_txtype == BWN_DMADESC_METATYPE_HEADER)
 				bus_dmamap_unload(dr->dr_txring_dtag,
 				    meta->mt_dmap);
 			else if (meta->mt_txtype == BWN_DMADESC_METATYPE_BODY)
 				bus_dmamap_unload(dma->txbuf_dtag,
 				    meta->mt_dmap);
 		} else
 			bus_dmamap_unload(dma->rxbuf_dtag, meta->mt_dmap);
 		bwn_dma_free_descbuf(dr, meta);
 	}
 }
 
 static int
 bwn_dma_tx_reset(struct bwn_mac *mac, uint16_t base,
     int type)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	uint32_t value;
 	int i;
 	uint16_t offset;
 
 	for (i = 0; i < 10; i++) {
 		offset = (type == BHND_DMA_ADDR_64BIT) ? BWN_DMA64_TXSTATUS :
 		    BWN_DMA32_TXSTATUS;
 		value = BWN_READ_4(mac, base + offset);
 		if (type == BHND_DMA_ADDR_64BIT) {
 			value &= BWN_DMA64_TXSTAT;
 			if (value == BWN_DMA64_TXSTAT_DISABLED ||
 			    value == BWN_DMA64_TXSTAT_IDLEWAIT ||
 			    value == BWN_DMA64_TXSTAT_STOPPED)
 				break;
 		} else {
 			value &= BWN_DMA32_TXSTATE;
 			if (value == BWN_DMA32_TXSTAT_DISABLED ||
 			    value == BWN_DMA32_TXSTAT_IDLEWAIT ||
 			    value == BWN_DMA32_TXSTAT_STOPPED)
 				break;
 		}
 		DELAY(1000);
 	}
 	offset = (type == BHND_DMA_ADDR_64BIT) ? BWN_DMA64_TXCTL :
 	    BWN_DMA32_TXCTL;
 	BWN_WRITE_4(mac, base + offset, 0);
 	for (i = 0; i < 10; i++) {
 		offset = (type == BHND_DMA_ADDR_64BIT) ? BWN_DMA64_TXSTATUS :
 		    BWN_DMA32_TXSTATUS;
 		value = BWN_READ_4(mac, base + offset);
 		if (type == BHND_DMA_ADDR_64BIT) {
 			value &= BWN_DMA64_TXSTAT;
 			if (value == BWN_DMA64_TXSTAT_DISABLED) {
 				i = -1;
 				break;
 			}
 		} else {
 			value &= BWN_DMA32_TXSTATE;
 			if (value == BWN_DMA32_TXSTAT_DISABLED) {
 				i = -1;
 				break;
 			}
 		}
 		DELAY(1000);
 	}
 	if (i != -1) {
 		device_printf(sc->sc_dev, "%s: timed out\n", __func__);
 		return (ENODEV);
 	}
 	DELAY(1000);
 
 	return (0);
 }
 
 static int
 bwn_dma_rx_reset(struct bwn_mac *mac, uint16_t base,
     int type)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	uint32_t value;
 	int i;
 	uint16_t offset;
 
 	offset = (type == BHND_DMA_ADDR_64BIT) ? BWN_DMA64_RXCTL :
 	    BWN_DMA32_RXCTL;
 	BWN_WRITE_4(mac, base + offset, 0);
 	for (i = 0; i < 10; i++) {
 		offset = (type == BHND_DMA_ADDR_64BIT) ? BWN_DMA64_RXSTATUS :
 		    BWN_DMA32_RXSTATUS;
 		value = BWN_READ_4(mac, base + offset);
 		if (type == BHND_DMA_ADDR_64BIT) {
 			value &= BWN_DMA64_RXSTAT;
 			if (value == BWN_DMA64_RXSTAT_DISABLED) {
 				i = -1;
 				break;
 			}
 		} else {
 			value &= BWN_DMA32_RXSTATE;
 			if (value == BWN_DMA32_RXSTAT_DISABLED) {
 				i = -1;
 				break;
 			}
 		}
 		DELAY(1000);
 	}
 	if (i != -1) {
 		device_printf(sc->sc_dev, "%s: timed out\n", __func__);
 		return (ENODEV);
 	}
 
 	return (0);
 }
 
 static void
 bwn_dma_free_descbuf(struct bwn_dma_ring *dr,
     struct bwn_dmadesc_meta *meta)
 {
 
 	if (meta->mt_m != NULL) {
 		m_freem(meta->mt_m);
 		meta->mt_m = NULL;
 	}
 	if (meta->mt_ni != NULL) {
 		ieee80211_free_node(meta->mt_ni);
 		meta->mt_ni = NULL;
 	}
 }
 
 static void
 bwn_dma_set_redzone(struct bwn_dma_ring *dr, struct mbuf *m)
 {
 	struct bwn_rxhdr4 *rxhdr;
 	unsigned char *frame;
 
 	rxhdr = mtod(m, struct bwn_rxhdr4 *);
 	rxhdr->frame_len = 0;
 
 	KASSERT(dr->dr_rx_bufsize >= dr->dr_frameoffset +
 	    sizeof(struct bwn_plcp6) + 2,
 	    ("%s:%d: fail", __func__, __LINE__));
 	frame = mtod(m, char *) + dr->dr_frameoffset;
 	memset(frame, 0xff, sizeof(struct bwn_plcp6) + 2 /* padding */);
 }
 
 static uint8_t
 bwn_dma_check_redzone(struct bwn_dma_ring *dr, struct mbuf *m)
 {
 	unsigned char *f = mtod(m, char *) + dr->dr_frameoffset;
 
 	return ((f[0] & f[1] & f[2] & f[3] & f[4] & f[5] & f[6] & f[7])
 	    == 0xff);
 }
 
 static void
 bwn_wme_init(struct bwn_mac *mac)
 {
 
 	bwn_wme_load(mac);
 
 	/* enable WME support. */
 	bwn_hf_write(mac, bwn_hf_read(mac) | BWN_HF_EDCF);
 	BWN_WRITE_2(mac, BWN_IFSCTL, BWN_READ_2(mac, BWN_IFSCTL) |
 	    BWN_IFSCTL_USE_EDCF);
 }
 
 static void
 bwn_spu_setdelay(struct bwn_mac *mac, int idle)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	uint16_t delay;	/* microsec */
 
 	delay = (mac->mac_phy.type == BWN_PHYTYPE_A) ? 3700 : 1050;
 	if (ic->ic_opmode == IEEE80211_M_IBSS || idle)
 		delay = 500;
 	if ((mac->mac_phy.rf_ver == 0x2050) && (mac->mac_phy.rf_rev == 8))
 		delay = max(delay, (uint16_t)2400);
 
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_SPU_WAKEUP, delay);
 }
 
 static void
 bwn_bt_enable(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	uint64_t hf;
 
 	if (bwn_bluetooth == 0)
 		return;
 	if ((sc->sc_board_info.board_flags & BHND_BFL_BTCOEX) == 0)
 		return;
 	if (mac->mac_phy.type != BWN_PHYTYPE_B && !mac->mac_phy.gmode)
 		return;
 
 	hf = bwn_hf_read(mac);
 	if (sc->sc_board_info.board_flags & BHND_BFL_BTC2WIRE_ALTGPIO)
 		hf |= BWN_HF_BT_COEXISTALT;
 	else
 		hf |= BWN_HF_BT_COEXIST;
 	bwn_hf_write(mac, hf);
 }
 
 static void
 bwn_set_macaddr(struct bwn_mac *mac)
 {
 
 	bwn_mac_write_bssid(mac);
 	bwn_mac_setfilter(mac, BWN_MACFILTER_SELF,
 	    mac->mac_sc->sc_ic.ic_macaddr);
 }
 
 static void
 bwn_clear_keys(struct bwn_mac *mac)
 {
 	int i;
 
 	for (i = 0; i < mac->mac_max_nr_keys; i++) {
 		KASSERT(i >= 0 && i < mac->mac_max_nr_keys,
 		    ("%s:%d: fail", __func__, __LINE__));
 
 		bwn_key_dowrite(mac, i, BWN_SEC_ALGO_NONE,
 		    NULL, BWN_SEC_KEYSIZE, NULL);
 		if ((i <= 3) && !BWN_SEC_NEWAPI(mac)) {
 			bwn_key_dowrite(mac, i + 4, BWN_SEC_ALGO_NONE,
 			    NULL, BWN_SEC_KEYSIZE, NULL);
 		}
 		mac->mac_key[i].keyconf = NULL;
 	}
 }
 
 static void
 bwn_crypt_init(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 
 	mac->mac_max_nr_keys = (bhnd_get_hwrev(sc->sc_dev) >= 5) ? 58 : 20;
 	KASSERT(mac->mac_max_nr_keys <= N(mac->mac_key),
 	    ("%s:%d: fail", __func__, __LINE__));
 	mac->mac_ktp = bwn_shm_read_2(mac, BWN_SHARED, BWN_SHARED_KEY_TABLEP);
 	mac->mac_ktp *= 2;
 	if (bhnd_get_hwrev(sc->sc_dev) >= 5)
 		BWN_WRITE_2(mac, BWN_RCMTA_COUNT, mac->mac_max_nr_keys - 8);
 	bwn_clear_keys(mac);
 }
 
 static void
 bwn_chip_exit(struct bwn_mac *mac)
 {
 	bwn_phy_exit(mac);
 }
 
 static int
 bwn_fw_fillinfo(struct bwn_mac *mac)
 {
 	int error;
 
 	error = bwn_fw_gets(mac, BWN_FWTYPE_DEFAULT);
 	if (error == 0)
 		return (0);
 	error = bwn_fw_gets(mac, BWN_FWTYPE_OPENSOURCE);
 	if (error == 0)
 		return (0);
 	return (error);
 }
 
 /**
  * Request that the GPIO controller tristate all pins set in @p mask, granting
  * the MAC core control over the pins.
  * 
  * @param mac	bwn MAC state.
  * @param pins	If the bit position for a pin number is set to one, tristate the
  *		pin.
  */
 int
 bwn_gpio_control(struct bwn_mac *mac, uint32_t pins)
 {
 	struct bwn_softc	*sc;
 	uint32_t		 flags[32];
 	int			 error;
 
 	sc = mac->mac_sc;
 
 	/* Determine desired pin flags */
 	for (size_t pin = 0; pin < nitems(flags); pin++) {
 		uint32_t pinbit = (1 << pin);
 
 		if (pins & pinbit) {
 			/* Tristate output */
 			flags[pin] = GPIO_PIN_OUTPUT|GPIO_PIN_TRISTATE;
 		} else {
 			/* Leave unmodified */
 			flags[pin] = 0;
 		}
 	}
 
 	/* Configure all pins */
 	error = GPIO_PIN_CONFIG_32(sc->sc_gpio, 0, nitems(flags), flags);
 	if (error) {
 		device_printf(sc->sc_dev, "error configuring %s pin flags: "
 		    "%d\n", device_get_nameunit(sc->sc_gpio), error);
 		return (error);
 	}
 
 	return (0);
 }
 
 static int
 bwn_gpio_init(struct bwn_mac *mac)
 {
 	struct bwn_softc	*sc;
 	uint32_t		 pins;
 
 	sc = mac->mac_sc;
 
 	pins = 0xF;
 
 	BWN_WRITE_4(mac, BWN_MACCTL,
 	    BWN_READ_4(mac, BWN_MACCTL) & ~BWN_MACCTL_GPOUT_MASK);
 	BWN_WRITE_2(mac, BWN_GPIO_MASK,
 	    BWN_READ_2(mac, BWN_GPIO_MASK) | pins);
 
 	if (sc->sc_board_info.board_flags & BHND_BFL_PACTRL) {
 		/* MAC core is responsible for toggling PAREF via gpio9 */
 		BWN_WRITE_2(mac, BWN_GPIO_MASK,
 		    BWN_READ_2(mac, BWN_GPIO_MASK) | BHND_GPIO_BOARD_PACTRL);
 
 		pins |= BHND_GPIO_BOARD_PACTRL;
 	}
 
 	return (bwn_gpio_control(mac, pins));
 }
 
 static int
 bwn_fw_loadinitvals(struct bwn_mac *mac)
 {
 #define	GETFWOFFSET(fwp, offset)				\
 	((const struct bwn_fwinitvals *)((const char *)fwp.fw->data + offset))
 	const size_t hdr_len = sizeof(struct bwn_fwhdr);
 	const struct bwn_fwhdr *hdr;
 	struct bwn_fw *fw = &mac->mac_fw;
 	int error;
 
 	hdr = (const struct bwn_fwhdr *)(fw->initvals.fw->data);
 	error = bwn_fwinitvals_write(mac, GETFWOFFSET(fw->initvals, hdr_len),
 	    be32toh(hdr->size), fw->initvals.fw->datasize - hdr_len);
 	if (error)
 		return (error);
 	if (fw->initvals_band.fw) {
 		hdr = (const struct bwn_fwhdr *)(fw->initvals_band.fw->data);
 		error = bwn_fwinitvals_write(mac,
 		    GETFWOFFSET(fw->initvals_band, hdr_len),
 		    be32toh(hdr->size),
 		    fw->initvals_band.fw->datasize - hdr_len);
 	}
 	return (error);
 #undef GETFWOFFSET
 }
 
 static int
 bwn_phy_init(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	int error;
 
 	mac->mac_phy.chan = mac->mac_phy.get_default_chan(mac);
 	mac->mac_phy.rf_onoff(mac, 1);
 	error = mac->mac_phy.init(mac);
 	if (error) {
 		device_printf(sc->sc_dev, "PHY init failed\n");
 		goto fail0;
 	}
 	error = bwn_switch_channel(mac,
 	    mac->mac_phy.get_default_chan(mac));
 	if (error) {
 		device_printf(sc->sc_dev,
 		    "failed to switch default channel\n");
 		goto fail1;
 	}
 	return (0);
 fail1:
 	if (mac->mac_phy.exit)
 		mac->mac_phy.exit(mac);
 fail0:
 	mac->mac_phy.rf_onoff(mac, 0);
 
 	return (error);
 }
 
 static void
 bwn_set_txantenna(struct bwn_mac *mac, int antenna)
 {
 	uint16_t ant;
 	uint16_t tmp;
 
 	ant = bwn_ant2phy(antenna);
 
 	/* For ACK/CTS */
 	tmp = bwn_shm_read_2(mac, BWN_SHARED, BWN_SHARED_ACKCTS_PHYCTL);
 	tmp = (tmp & ~BWN_TX_PHY_ANT) | ant;
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_ACKCTS_PHYCTL, tmp);
 	/* For Probe Resposes */
 	tmp = bwn_shm_read_2(mac, BWN_SHARED, BWN_SHARED_PROBE_RESP_PHYCTL);
 	tmp = (tmp & ~BWN_TX_PHY_ANT) | ant;
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_PROBE_RESP_PHYCTL, tmp);
 }
 
 static void
 bwn_set_opmode(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	uint32_t ctl;
 	uint16_t cfp_pretbtt;
 
 	ctl = BWN_READ_4(mac, BWN_MACCTL);
 	ctl &= ~(BWN_MACCTL_HOSTAP | BWN_MACCTL_PASS_CTL |
 	    BWN_MACCTL_PASS_BADPLCP | BWN_MACCTL_PASS_BADFCS |
 	    BWN_MACCTL_PROMISC | BWN_MACCTL_BEACON_PROMISC);
 	ctl |= BWN_MACCTL_STA;
 
 	if (ic->ic_opmode == IEEE80211_M_HOSTAP ||
 	    ic->ic_opmode == IEEE80211_M_MBSS)
 		ctl |= BWN_MACCTL_HOSTAP;
 	else if (ic->ic_opmode == IEEE80211_M_IBSS)
 		ctl &= ~BWN_MACCTL_STA;
 	ctl |= sc->sc_filters;
 
 	if (bhnd_get_hwrev(sc->sc_dev) <= 4)
 		ctl |= BWN_MACCTL_PROMISC;
 
 	BWN_WRITE_4(mac, BWN_MACCTL, ctl);
 
 	cfp_pretbtt = 2;
 	if ((ctl & BWN_MACCTL_STA) && !(ctl & BWN_MACCTL_HOSTAP)) {
 		if (sc->sc_cid.chip_id == BHND_CHIPID_BCM4306 &&
 		    sc->sc_cid.chip_rev == 3)
 			cfp_pretbtt = 100;
 		else
 			cfp_pretbtt = 50;
 	}
 	BWN_WRITE_2(mac, 0x612, cfp_pretbtt);
 }
 
 static void
 bwn_dma_ring_addr(void *arg, bus_dma_segment_t *seg, int nseg, int error)
 {
 	if (!error) {
 		KASSERT(nseg == 1, ("too many segments(%d)\n", nseg));
 		*((bus_addr_t *)arg) = seg->ds_addr;
 	}
 }
 
 void
 bwn_dummy_transmission(struct bwn_mac *mac, int ofdm, int paon)
 {
 	struct bwn_phy *phy = &mac->mac_phy;
 	struct bwn_softc *sc = mac->mac_sc;
 	unsigned int i, max_loop;
 	uint16_t value;
 	uint32_t buffer[5] = {
 		0x00000000, 0x00d40000, 0x00000000, 0x01000000, 0x00000000
 	};
 
 	if (ofdm) {
 		max_loop = 0x1e;
 		buffer[0] = 0x000201cc;
 	} else {
 		max_loop = 0xfa;
 		buffer[0] = 0x000b846e;
 	}
 
 	BWN_ASSERT_LOCKED(mac->mac_sc);
 
 	for (i = 0; i < 5; i++)
 		bwn_ram_write(mac, i * 4, buffer[i]);
 
 	BWN_WRITE_2(mac, 0x0568, 0x0000);
 	BWN_WRITE_2(mac, 0x07c0,
 	    (bhnd_get_hwrev(sc->sc_dev) < 11) ? 0x0000 : 0x0100);
 
 	value = (ofdm ? 0x41 : 0x40);
 	BWN_WRITE_2(mac, 0x050c, value);
 
 	if (phy->type == BWN_PHYTYPE_N || phy->type == BWN_PHYTYPE_LP ||
 	    phy->type == BWN_PHYTYPE_LCN)
 		BWN_WRITE_2(mac, 0x0514, 0x1a02);
 	BWN_WRITE_2(mac, 0x0508, 0x0000);
 	BWN_WRITE_2(mac, 0x050a, 0x0000);
 	BWN_WRITE_2(mac, 0x054c, 0x0000);
 	BWN_WRITE_2(mac, 0x056a, 0x0014);
 	BWN_WRITE_2(mac, 0x0568, 0x0826);
 	BWN_WRITE_2(mac, 0x0500, 0x0000);
 
 	/* XXX TODO: n phy pa override? */
 
 	switch (phy->type) {
 	case BWN_PHYTYPE_N:
 	case BWN_PHYTYPE_LCN:
 		BWN_WRITE_2(mac, 0x0502, 0x00d0);
 		break;
 	case BWN_PHYTYPE_LP:
 		BWN_WRITE_2(mac, 0x0502, 0x0050);
 		break;
 	default:
 		BWN_WRITE_2(mac, 0x0502, 0x0030);
 		break;
 	}
 
 	/* flush */
 	BWN_READ_2(mac, 0x0502);
 
 	if (phy->rf_ver == 0x2050 && phy->rf_rev <= 0x5)
 		BWN_RF_WRITE(mac, 0x0051, 0x0017);
 	for (i = 0x00; i < max_loop; i++) {
 		value = BWN_READ_2(mac, 0x050e);
 		if (value & 0x0080)
 			break;
 		DELAY(10);
 	}
 	for (i = 0x00; i < 0x0a; i++) {
 		value = BWN_READ_2(mac, 0x050e);
 		if (value & 0x0400)
 			break;
 		DELAY(10);
 	}
 	for (i = 0x00; i < 0x19; i++) {
 		value = BWN_READ_2(mac, 0x0690);
 		if (!(value & 0x0100))
 			break;
 		DELAY(10);
 	}
 	if (phy->rf_ver == 0x2050 && phy->rf_rev <= 0x5)
 		BWN_RF_WRITE(mac, 0x0051, 0x0037);
 }
 
 void
 bwn_ram_write(struct bwn_mac *mac, uint16_t offset, uint32_t val)
 {
 	uint32_t macctl;
 
 	KASSERT(offset % 4 == 0, ("%s:%d: fail", __func__, __LINE__));
 
 	macctl = BWN_READ_4(mac, BWN_MACCTL);
 	if (macctl & BWN_MACCTL_BIGENDIAN)
 		printf("TODO: need swap\n");
 
 	BWN_WRITE_4(mac, BWN_RAM_CONTROL, offset);
 	BWN_BARRIER(mac, BWN_RAM_CONTROL, 4, BUS_SPACE_BARRIER_WRITE);
 	BWN_WRITE_4(mac, BWN_RAM_DATA, val);
 }
 
 void
 bwn_mac_suspend(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	int i;
 	uint32_t tmp;
 
 	KASSERT(mac->mac_suspended >= 0,
 	    ("%s:%d: fail", __func__, __LINE__));
 
 	DPRINTF(mac->mac_sc, BWN_DEBUG_RESET, "%s: suspended=%d\n",
 	    __func__, mac->mac_suspended);
 
 	if (mac->mac_suspended == 0) {
 		bwn_psctl(mac, BWN_PS_AWAKE);
 		BWN_WRITE_4(mac, BWN_MACCTL,
 			    BWN_READ_4(mac, BWN_MACCTL)
 			    & ~BWN_MACCTL_ON);
 		BWN_READ_4(mac, BWN_MACCTL);
 		for (i = 35; i; i--) {
 			tmp = BWN_READ_4(mac, BWN_INTR_REASON);
 			if (tmp & BWN_INTR_MAC_SUSPENDED)
 				goto out;
 			DELAY(10);
 		}
 		for (i = 40; i; i--) {
 			tmp = BWN_READ_4(mac, BWN_INTR_REASON);
 			if (tmp & BWN_INTR_MAC_SUSPENDED)
 				goto out;
 			DELAY(1000);
 		}
 		device_printf(sc->sc_dev, "MAC suspend failed\n");
 	}
 out:
 	mac->mac_suspended++;
 }
 
 void
 bwn_mac_enable(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	uint16_t state;
 
 	DPRINTF(mac->mac_sc, BWN_DEBUG_RESET, "%s: suspended=%d\n",
 	    __func__, mac->mac_suspended);
 
 	state = bwn_shm_read_2(mac, BWN_SHARED,
 	    BWN_SHARED_UCODESTAT);
 	if (state != BWN_SHARED_UCODESTAT_SUSPEND &&
 	    state != BWN_SHARED_UCODESTAT_SLEEP) {
 		DPRINTF(sc, BWN_DEBUG_FW,
 		    "%s: warn: firmware state (%d)\n",
 		    __func__, state);
 	}
 
 	mac->mac_suspended--;
 	KASSERT(mac->mac_suspended >= 0,
 	    ("%s:%d: fail", __func__, __LINE__));
 	if (mac->mac_suspended == 0) {
 		BWN_WRITE_4(mac, BWN_MACCTL,
 		    BWN_READ_4(mac, BWN_MACCTL) | BWN_MACCTL_ON);
 		BWN_WRITE_4(mac, BWN_INTR_REASON, BWN_INTR_MAC_SUSPENDED);
 		BWN_READ_4(mac, BWN_MACCTL);
 		BWN_READ_4(mac, BWN_INTR_REASON);
 		bwn_psctl(mac, 0);
 	}
 }
 
 void
 bwn_psctl(struct bwn_mac *mac, uint32_t flags)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	int i;
 	uint16_t ucstat;
 
 	KASSERT(!((flags & BWN_PS_ON) && (flags & BWN_PS_OFF)),
 	    ("%s:%d: fail", __func__, __LINE__));
 	KASSERT(!((flags & BWN_PS_AWAKE) && (flags & BWN_PS_ASLEEP)),
 	    ("%s:%d: fail", __func__, __LINE__));
 
 	/* XXX forcibly awake and hwps-off */
 
 	BWN_WRITE_4(mac, BWN_MACCTL,
 	    (BWN_READ_4(mac, BWN_MACCTL) | BWN_MACCTL_AWAKE) &
 	    ~BWN_MACCTL_HWPS);
 	BWN_READ_4(mac, BWN_MACCTL);
 	if (bhnd_get_hwrev(sc->sc_dev) >= 5) {
 		for (i = 0; i < 100; i++) {
 			ucstat = bwn_shm_read_2(mac, BWN_SHARED,
 			    BWN_SHARED_UCODESTAT);
 			if (ucstat != BWN_SHARED_UCODESTAT_SLEEP)
 				break;
 			DELAY(10);
 		}
 	}
 	DPRINTF(mac->mac_sc, BWN_DEBUG_RESET, "%s: ucstat=%d\n", __func__,
 	    ucstat);
 }
 
 static int
 bwn_fw_gets(struct bwn_mac *mac, enum bwn_fwtype type)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	struct bwn_fw *fw = &mac->mac_fw;
 	const uint8_t rev = bhnd_get_hwrev(sc->sc_dev);
 	const char *filename;
 	uint16_t iost;
 	int error;
 
 	/* microcode */
 	filename = NULL;
 	switch (rev) {
 	case 42:
 		if (mac->mac_phy.type == BWN_PHYTYPE_AC)
 			filename = "ucode42";
 		break;
 	case 40:
 		if (mac->mac_phy.type == BWN_PHYTYPE_AC)
 			filename = "ucode40";
 		break;
 	case 33:
 		if (mac->mac_phy.type == BWN_PHYTYPE_LCN40)
 			filename = "ucode33_lcn40";
 		break;
 	case 30:
 		if (mac->mac_phy.type == BWN_PHYTYPE_N)
 			filename = "ucode30_mimo";
 		break;
 	case 29:
 		if (mac->mac_phy.type == BWN_PHYTYPE_HT)
 			filename = "ucode29_mimo";
 		break;
 	case 26:
 		if (mac->mac_phy.type == BWN_PHYTYPE_HT)
 			filename = "ucode26_mimo";
 		break;
 	case 28:
 	case 25:
 		if (mac->mac_phy.type == BWN_PHYTYPE_N)
 			filename = "ucode25_mimo";
 		else if (mac->mac_phy.type == BWN_PHYTYPE_LCN)
 			filename = "ucode25_lcn";
 		break;
 	case 24:
 		if (mac->mac_phy.type == BWN_PHYTYPE_LCN)
 			filename = "ucode24_lcn";
 		break;
 	case 23:
 		if (mac->mac_phy.type == BWN_PHYTYPE_N)
 			filename = "ucode16_mimo";
 		break;
 	case 16:
 	case 17:
 	case 18:
 	case 19:
 		if (mac->mac_phy.type == BWN_PHYTYPE_N)
 			filename = "ucode16_mimo";
 		else if (mac->mac_phy.type == BWN_PHYTYPE_LP)
 			filename = "ucode16_lp";
 		break;
 	case 15:
 		filename = "ucode15";
 		break;
 	case 14:
 		filename = "ucode14";
 		break;
 	case 13:
 		filename = "ucode13";
 		break;
 	case 12:
 	case 11:
 		filename = "ucode11";
 		break;
 	case 10:
 	case 9:
 	case 8:
 	case 7:
 	case 6:
 	case 5:
 		filename = "ucode5";
 		break;
 	default:
 		device_printf(sc->sc_dev, "no ucode for rev %d\n", rev);
 		bwn_release_firmware(mac);
 		return (EOPNOTSUPP);
 	}
 
 	device_printf(sc->sc_dev, "ucode fw: %s\n", filename);
 	error = bwn_fw_get(mac, type, filename, &fw->ucode);
 	if (error) {
 		bwn_release_firmware(mac);
 		return (error);
 	}
 
 	/* PCM */
 	KASSERT(fw->no_pcmfile == 0, ("%s:%d fail", __func__, __LINE__));
 	if (rev >= 5 && rev <= 10) {
 		error = bwn_fw_get(mac, type, "pcm5", &fw->pcm);
 		if (error == ENOENT)
 			fw->no_pcmfile = 1;
 		else if (error) {
 			bwn_release_firmware(mac);
 			return (error);
 		}
 	} else if (rev < 11) {
 		device_printf(sc->sc_dev, "no PCM for rev %d\n", rev);
 		bwn_release_firmware(mac);
 		return (EOPNOTSUPP);
 	}
 
 	/* initvals */
 	error = bhnd_read_iost(sc->sc_dev, &iost);
 	if (error)
 		goto fail1;
 
 	switch (mac->mac_phy.type) {
 	case BWN_PHYTYPE_A:
 		if (rev < 5 || rev > 10)
 			goto fail1;
 		if (iost & BWN_IOST_HAVE_2GHZ)
 			filename = "a0g1initvals5";
 		else
 			filename = "a0g0initvals5";
 		break;
 	case BWN_PHYTYPE_G:
 		if (rev >= 5 && rev <= 10)
 			filename = "b0g0initvals5";
 		else if (rev >= 13)
 			filename = "b0g0initvals13";
 		else
 			goto fail1;
 		break;
 	case BWN_PHYTYPE_LP:
 		if (rev == 13)
 			filename = "lp0initvals13";
 		else if (rev == 14)
 			filename = "lp0initvals14";
 		else if (rev >= 15)
 			filename = "lp0initvals15";
 		else
 			goto fail1;
 		break;
 	case BWN_PHYTYPE_N:
 		if (rev == 30)
 			filename = "n16initvals30";
 		else if (rev == 28 || rev == 25)
 			filename = "n0initvals25";
 		else if (rev == 24)
 			filename = "n0initvals24";
 		else if (rev == 23)
 			filename = "n0initvals16";
 		else if (rev >= 16 && rev <= 18)
 			filename = "n0initvals16";
 		else if (rev >= 11 && rev <= 12)
 			filename = "n0initvals11";
 		else
 			goto fail1;
 		break;
 	default:
 		goto fail1;
 	}
 	error = bwn_fw_get(mac, type, filename, &fw->initvals);
 	if (error) {
 		bwn_release_firmware(mac);
 		return (error);
 	}
 
 	/* bandswitch initvals */
 	switch (mac->mac_phy.type) {
 	case BWN_PHYTYPE_A:
 		if (rev >= 5 && rev <= 10) {
 			if (iost & BWN_IOST_HAVE_2GHZ)
 				filename = "a0g1bsinitvals5";
 			else
 				filename = "a0g0bsinitvals5";
 		} else if (rev >= 11)
 			filename = NULL;
 		else
 			goto fail1;
 		break;
 	case BWN_PHYTYPE_G:
 		if (rev >= 5 && rev <= 10)
 			filename = "b0g0bsinitvals5";
 		else if (rev >= 11)
 			filename = NULL;
 		else
 			goto fail1;
 		break;
 	case BWN_PHYTYPE_LP:
 		if (rev == 13)
 			filename = "lp0bsinitvals13";
 		else if (rev == 14)
 			filename = "lp0bsinitvals14";
 		else if (rev >= 15)
 			filename = "lp0bsinitvals15";
 		else
 			goto fail1;
 		break;
 	case BWN_PHYTYPE_N:
 		if (rev == 30)
 			filename = "n16bsinitvals30";
 		else if (rev == 28 || rev == 25)
 			filename = "n0bsinitvals25";
 		else if (rev == 24)
 			filename = "n0bsinitvals24";
 		else if (rev == 23)
 			filename = "n0bsinitvals16";
 		else if (rev >= 16 && rev <= 18)
 			filename = "n0bsinitvals16";
 		else if (rev >= 11 && rev <= 12)
 			filename = "n0bsinitvals11";
 		else
 			goto fail1;
 		break;
 	default:
 		device_printf(sc->sc_dev, "unknown phy (%d)\n",
 		    mac->mac_phy.type);
 		goto fail1;
 	}
 	error = bwn_fw_get(mac, type, filename, &fw->initvals_band);
 	if (error) {
 		bwn_release_firmware(mac);
 		return (error);
 	}
 	return (0);
 fail1:
 	device_printf(sc->sc_dev, "no INITVALS for rev %d, phy.type %d\n",
 	    rev, mac->mac_phy.type);
 	bwn_release_firmware(mac);
 	return (EOPNOTSUPP);
 }
 
 static int
 bwn_fw_get(struct bwn_mac *mac, enum bwn_fwtype type,
     const char *name, struct bwn_fwfile *bfw)
 {
 	const struct bwn_fwhdr *hdr;
 	struct bwn_softc *sc = mac->mac_sc;
 	const struct firmware *fw;
 	char namebuf[64];
 
 	if (name == NULL) {
 		bwn_do_release_fw(bfw);
 		return (0);
 	}
 	if (bfw->filename != NULL) {
 		if (bfw->type == type && (strcmp(bfw->filename, name) == 0))
 			return (0);
 		bwn_do_release_fw(bfw);
 	}
 
 	snprintf(namebuf, sizeof(namebuf), "bwn%s_v4_%s%s",
 	    (type == BWN_FWTYPE_OPENSOURCE) ? "-open" : "",
 	    (mac->mac_phy.type == BWN_PHYTYPE_LP) ? "lp_" : "", name);
 	/* XXX Sleeping on "fwload" with the non-sleepable locks held */
 	fw = firmware_get(namebuf);
 	if (fw == NULL) {
 		device_printf(sc->sc_dev, "the fw file(%s) not found\n",
 		    namebuf);
 		return (ENOENT);
 	}
 	if (fw->datasize < sizeof(struct bwn_fwhdr))
 		goto fail;
 	hdr = (const struct bwn_fwhdr *)(fw->data);
 	switch (hdr->type) {
 	case BWN_FWTYPE_UCODE:
 	case BWN_FWTYPE_PCM:
 		if (be32toh(hdr->size) !=
 		    (fw->datasize - sizeof(struct bwn_fwhdr)))
 			goto fail;
 		/* FALLTHROUGH */
 	case BWN_FWTYPE_IV:
 		if (hdr->ver != 1)
 			goto fail;
 		break;
 	default:
 		goto fail;
 	}
 	bfw->filename = name;
 	bfw->fw = fw;
 	bfw->type = type;
 	return (0);
 fail:
 	device_printf(sc->sc_dev, "the fw file(%s) format error\n", namebuf);
 	if (fw != NULL)
 		firmware_put(fw, FIRMWARE_UNLOAD);
 	return (EPROTO);
 }
 
 static void
 bwn_release_firmware(struct bwn_mac *mac)
 {
 
 	bwn_do_release_fw(&mac->mac_fw.ucode);
 	bwn_do_release_fw(&mac->mac_fw.pcm);
 	bwn_do_release_fw(&mac->mac_fw.initvals);
 	bwn_do_release_fw(&mac->mac_fw.initvals_band);
 }
 
 static void
 bwn_do_release_fw(struct bwn_fwfile *bfw)
 {
 
 	if (bfw->fw != NULL)
 		firmware_put(bfw->fw, FIRMWARE_UNLOAD);
 	bfw->fw = NULL;
 	bfw->filename = NULL;
 }
 
 static int
 bwn_fw_loaducode(struct bwn_mac *mac)
 {
 #define	GETFWOFFSET(fwp, offset)	\
 	((const uint32_t *)((const char *)fwp.fw->data + offset))
 #define	GETFWSIZE(fwp, offset)	\
 	((fwp.fw->datasize - offset) / sizeof(uint32_t))
 	struct bwn_softc *sc = mac->mac_sc;
 	const uint32_t *data;
 	unsigned int i;
 	uint32_t ctl;
 	uint16_t date, fwcaps, time;
 	int error = 0;
 
 	ctl = BWN_READ_4(mac, BWN_MACCTL);
 	ctl |= BWN_MACCTL_MCODE_JMP0;
 	KASSERT(!(ctl & BWN_MACCTL_MCODE_RUN), ("%s:%d: fail", __func__,
 	    __LINE__));
 	BWN_WRITE_4(mac, BWN_MACCTL, ctl);
 	for (i = 0; i < 64; i++)
 		bwn_shm_write_2(mac, BWN_SCRATCH, i, 0);
 	for (i = 0; i < 4096; i += 2)
 		bwn_shm_write_2(mac, BWN_SHARED, i, 0);
 
 	data = GETFWOFFSET(mac->mac_fw.ucode, sizeof(struct bwn_fwhdr));
 	bwn_shm_ctlword(mac, BWN_UCODE | BWN_SHARED_AUTOINC, 0x0000);
 	for (i = 0; i < GETFWSIZE(mac->mac_fw.ucode, sizeof(struct bwn_fwhdr));
 	     i++) {
 		BWN_WRITE_4(mac, BWN_SHM_DATA, be32toh(data[i]));
 		DELAY(10);
 	}
 
 	if (mac->mac_fw.pcm.fw) {
 		data = GETFWOFFSET(mac->mac_fw.pcm, sizeof(struct bwn_fwhdr));
 		bwn_shm_ctlword(mac, BWN_HW, 0x01ea);
 		BWN_WRITE_4(mac, BWN_SHM_DATA, 0x00004000);
 		bwn_shm_ctlword(mac, BWN_HW, 0x01eb);
 		for (i = 0; i < GETFWSIZE(mac->mac_fw.pcm,
 		    sizeof(struct bwn_fwhdr)); i++) {
 			BWN_WRITE_4(mac, BWN_SHM_DATA, be32toh(data[i]));
 			DELAY(10);
 		}
 	}
 
 	BWN_WRITE_4(mac, BWN_INTR_REASON, BWN_INTR_ALL);
 	BWN_WRITE_4(mac, BWN_MACCTL,
 	    (BWN_READ_4(mac, BWN_MACCTL) & ~BWN_MACCTL_MCODE_JMP0) |
 	    BWN_MACCTL_MCODE_RUN);
 
 	for (i = 0; i < 21; i++) {
 		if (BWN_READ_4(mac, BWN_INTR_REASON) == BWN_INTR_MAC_SUSPENDED)
 			break;
 		if (i >= 20) {
 			device_printf(sc->sc_dev, "ucode timeout\n");
 			error = ENXIO;
 			goto error;
 		}
 		DELAY(50000);
 	}
 	BWN_READ_4(mac, BWN_INTR_REASON);
 
 	mac->mac_fw.rev = bwn_shm_read_2(mac, BWN_SHARED, BWN_SHARED_UCODE_REV);
 	if (mac->mac_fw.rev <= 0x128) {
 		device_printf(sc->sc_dev, "the firmware is too old\n");
 		error = EOPNOTSUPP;
 		goto error;
 	}
 
 	/*
 	 * Determine firmware header version; needed for TX/RX packet
 	 * handling.
 	 */
 	if (mac->mac_fw.rev >= 598)
 		mac->mac_fw.fw_hdr_format = BWN_FW_HDR_598;
 	else if (mac->mac_fw.rev >= 410)
 		mac->mac_fw.fw_hdr_format = BWN_FW_HDR_410;
 	else
 		mac->mac_fw.fw_hdr_format = BWN_FW_HDR_351;
 
 	/*
 	 * We don't support rev 598 or later; that requires
 	 * another round of changes to the TX/RX descriptor
 	 * and status layout.
 	 *
 	 * So, complain this is the case and exit out, rather
 	 * than attaching and then failing.
 	 */
 #if 0
 	if (mac->mac_fw.fw_hdr_format == BWN_FW_HDR_598) {
 		device_printf(sc->sc_dev,
 		    "firmware is too new (>=598); not supported\n");
 		error = EOPNOTSUPP;
 		goto error;
 	}
 #endif
 
 	mac->mac_fw.patch = bwn_shm_read_2(mac, BWN_SHARED,
 	    BWN_SHARED_UCODE_PATCH);
 	date = bwn_shm_read_2(mac, BWN_SHARED, BWN_SHARED_UCODE_DATE);
 	mac->mac_fw.opensource = (date == 0xffff);
 	if (bwn_wme != 0)
 		mac->mac_flags |= BWN_MAC_FLAG_WME;
 	mac->mac_flags |= BWN_MAC_FLAG_HWCRYPTO;
 
 	time = bwn_shm_read_2(mac, BWN_SHARED, BWN_SHARED_UCODE_TIME);
 	if (mac->mac_fw.opensource == 0) {
 		device_printf(sc->sc_dev,
 		    "firmware version (rev %u patch %u date %#x time %#x)\n",
 		    mac->mac_fw.rev, mac->mac_fw.patch, date, time);
 		if (mac->mac_fw.no_pcmfile)
 			device_printf(sc->sc_dev,
 			    "no HW crypto acceleration due to pcm5\n");
 	} else {
 		mac->mac_fw.patch = time;
 		fwcaps = bwn_fwcaps_read(mac);
 		if (!(fwcaps & BWN_FWCAPS_HWCRYPTO) || mac->mac_fw.no_pcmfile) {
 			device_printf(sc->sc_dev,
 			    "disabling HW crypto acceleration\n");
 			mac->mac_flags &= ~BWN_MAC_FLAG_HWCRYPTO;
 		}
 		if (!(fwcaps & BWN_FWCAPS_WME)) {
 			device_printf(sc->sc_dev, "disabling WME support\n");
 			mac->mac_flags &= ~BWN_MAC_FLAG_WME;
 		}
 	}
 
 	if (BWN_ISOLDFMT(mac))
 		device_printf(sc->sc_dev, "using old firmware image\n");
 
 	return (0);
 
 error:
 	BWN_WRITE_4(mac, BWN_MACCTL,
 	    (BWN_READ_4(mac, BWN_MACCTL) & ~BWN_MACCTL_MCODE_RUN) |
 	    BWN_MACCTL_MCODE_JMP0);
 
 	return (error);
 #undef GETFWSIZE
 #undef GETFWOFFSET
 }
 
 /* OpenFirmware only */
 static uint16_t
 bwn_fwcaps_read(struct bwn_mac *mac)
 {
 
 	KASSERT(mac->mac_fw.opensource == 1,
 	    ("%s:%d: fail", __func__, __LINE__));
 	return (bwn_shm_read_2(mac, BWN_SHARED, BWN_SHARED_FWCAPS));
 }
 
 static int
 bwn_fwinitvals_write(struct bwn_mac *mac, const struct bwn_fwinitvals *ivals,
     size_t count, size_t array_size)
 {
 #define	GET_NEXTIV16(iv)						\
 	((const struct bwn_fwinitvals *)((const uint8_t *)(iv) +	\
 	    sizeof(uint16_t) + sizeof(uint16_t)))
 #define	GET_NEXTIV32(iv)						\
 	((const struct bwn_fwinitvals *)((const uint8_t *)(iv) +	\
 	    sizeof(uint16_t) + sizeof(uint32_t)))
 	struct bwn_softc *sc = mac->mac_sc;
 	const struct bwn_fwinitvals *iv;
 	uint16_t offset;
 	size_t i;
 	uint8_t bit32;
 
 	KASSERT(sizeof(struct bwn_fwinitvals) == 6,
 	    ("%s:%d: fail", __func__, __LINE__));
 	iv = ivals;
 	for (i = 0; i < count; i++) {
 		if (array_size < sizeof(iv->offset_size))
 			goto fail;
 		array_size -= sizeof(iv->offset_size);
 		offset = be16toh(iv->offset_size);
 		bit32 = (offset & BWN_FWINITVALS_32BIT) ? 1 : 0;
 		offset &= BWN_FWINITVALS_OFFSET_MASK;
 		if (offset >= 0x1000)
 			goto fail;
 		if (bit32) {
 			if (array_size < sizeof(iv->data.d32))
 				goto fail;
 			array_size -= sizeof(iv->data.d32);
 			BWN_WRITE_4(mac, offset, be32toh(iv->data.d32));
 			iv = GET_NEXTIV32(iv);
 		} else {
 			if (array_size < sizeof(iv->data.d16))
 				goto fail;
 			array_size -= sizeof(iv->data.d16);
 			BWN_WRITE_2(mac, offset, be16toh(iv->data.d16));
 
 			iv = GET_NEXTIV16(iv);
 		}
 	}
 	if (array_size != 0)
 		goto fail;
 	return (0);
 fail:
 	device_printf(sc->sc_dev, "initvals: invalid format\n");
 	return (EPROTO);
 #undef GET_NEXTIV16
 #undef GET_NEXTIV32
 }
 
 int
 bwn_switch_channel(struct bwn_mac *mac, int chan)
 {
 	struct bwn_phy *phy = &(mac->mac_phy);
 	struct bwn_softc *sc = mac->mac_sc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	uint16_t channelcookie, savedcookie;
 	int error;
 
 	if (chan == 0xffff)
 		chan = phy->get_default_chan(mac);
 
 	channelcookie = chan;
 	if (IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan))
 		channelcookie |= 0x100;
 	savedcookie = bwn_shm_read_2(mac, BWN_SHARED, BWN_SHARED_CHAN);
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_CHAN, channelcookie);
 	error = phy->switch_channel(mac, chan);
 	if (error)
 		goto fail;
 
 	mac->mac_phy.chan = chan;
 	DELAY(8000);
 	return (0);
 fail:
 	device_printf(sc->sc_dev, "failed to switch channel\n");
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_CHAN, savedcookie);
 	return (error);
 }
 
 static uint16_t
 bwn_ant2phy(int antenna)
 {
 
 	switch (antenna) {
 	case BWN_ANT0:
 		return (BWN_TX_PHY_ANT0);
 	case BWN_ANT1:
 		return (BWN_TX_PHY_ANT1);
 	case BWN_ANT2:
 		return (BWN_TX_PHY_ANT2);
 	case BWN_ANT3:
 		return (BWN_TX_PHY_ANT3);
 	case BWN_ANTAUTO:
 		return (BWN_TX_PHY_ANT01AUTO);
 	}
 	KASSERT(0 == 1, ("%s:%d: fail", __func__, __LINE__));
 	return (0);
 }
 
 static void
 bwn_wme_load(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	int i;
 
 	KASSERT(N(bwn_wme_shm_offsets) == N(sc->sc_wmeParams),
 	    ("%s:%d: fail", __func__, __LINE__));
 
 	bwn_mac_suspend(mac);
 	for (i = 0; i < N(sc->sc_wmeParams); i++)
 		bwn_wme_loadparams(mac, &(sc->sc_wmeParams[i]),
 		    bwn_wme_shm_offsets[i]);
 	bwn_mac_enable(mac);
 }
 
 static void
 bwn_wme_loadparams(struct bwn_mac *mac,
     const struct wmeParams *p, uint16_t shm_offset)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	uint16_t params[BWN_NR_WMEPARAMS];
 	int slot, tmp;
 	unsigned int i;
 
 	slot = BWN_READ_2(mac, BWN_RNG) &
 	    _IEEE80211_SHIFTMASK(p->wmep_logcwmin, WME_PARAM_LOGCWMIN);
 
 	memset(&params, 0, sizeof(params));
 
 	DPRINTF(sc, BWN_DEBUG_WME, "wmep_txopLimit %d wmep_logcwmin %d "
 	    "wmep_logcwmax %d wmep_aifsn %d\n", p->wmep_txopLimit,
 	    p->wmep_logcwmin, p->wmep_logcwmax, p->wmep_aifsn);
 
 	params[BWN_WMEPARAM_TXOP] = p->wmep_txopLimit * 32;
 	params[BWN_WMEPARAM_CWMIN] =
 	    _IEEE80211_SHIFTMASK(p->wmep_logcwmin, WME_PARAM_LOGCWMIN);
 	params[BWN_WMEPARAM_CWMAX] =
 	     _IEEE80211_SHIFTMASK(p->wmep_logcwmax, WME_PARAM_LOGCWMAX);
 	params[BWN_WMEPARAM_CWCUR] =
 	     _IEEE80211_SHIFTMASK(p->wmep_logcwmin, WME_PARAM_LOGCWMIN);
 	params[BWN_WMEPARAM_AIFS] = p->wmep_aifsn;
 	params[BWN_WMEPARAM_BSLOTS] = slot;
 	params[BWN_WMEPARAM_REGGAP] = slot + p->wmep_aifsn;
 
 	for (i = 0; i < N(params); i++) {
 		if (i == BWN_WMEPARAM_STATUS) {
 			tmp = bwn_shm_read_2(mac, BWN_SHARED,
 			    shm_offset + (i * 2));
 			tmp |= 0x100;
 			bwn_shm_write_2(mac, BWN_SHARED, shm_offset + (i * 2),
 			    tmp);
 		} else {
 			bwn_shm_write_2(mac, BWN_SHARED, shm_offset + (i * 2),
 			    params[i]);
 		}
 	}
 }
 
 static void
 bwn_mac_write_bssid(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	uint32_t tmp;
 	int i;
 	uint8_t mac_bssid[IEEE80211_ADDR_LEN * 2];
 
 	bwn_mac_setfilter(mac, BWN_MACFILTER_BSSID, sc->sc_bssid);
 	memcpy(mac_bssid, sc->sc_ic.ic_macaddr, IEEE80211_ADDR_LEN);
 	memcpy(mac_bssid + IEEE80211_ADDR_LEN, sc->sc_bssid,
 	    IEEE80211_ADDR_LEN);
 
 	for (i = 0; i < N(mac_bssid); i += sizeof(uint32_t)) {
 		tmp = (uint32_t) (mac_bssid[i + 0]);
 		tmp |= (uint32_t) (mac_bssid[i + 1]) << 8;
 		tmp |= (uint32_t) (mac_bssid[i + 2]) << 16;
 		tmp |= (uint32_t) (mac_bssid[i + 3]) << 24;
 		bwn_ram_write(mac, 0x20 + i, tmp);
 	}
 }
 
 static void
 bwn_mac_setfilter(struct bwn_mac *mac, uint16_t offset,
     const uint8_t *macaddr)
 {
 	static const uint8_t zero[IEEE80211_ADDR_LEN] = { 0 };
 	uint16_t data;
 
 	if (!mac)
 		macaddr = zero;
 
 	offset |= 0x0020;
 	BWN_WRITE_2(mac, BWN_MACFILTER_CONTROL, offset);
 
 	data = macaddr[0];
 	data |= macaddr[1] << 8;
 	BWN_WRITE_2(mac, BWN_MACFILTER_DATA, data);
 	data = macaddr[2];
 	data |= macaddr[3] << 8;
 	BWN_WRITE_2(mac, BWN_MACFILTER_DATA, data);
 	data = macaddr[4];
 	data |= macaddr[5] << 8;
 	BWN_WRITE_2(mac, BWN_MACFILTER_DATA, data);
 }
 
 static void
 bwn_key_dowrite(struct bwn_mac *mac, uint8_t index, uint8_t algorithm,
     const uint8_t *key, size_t key_len, const uint8_t *mac_addr)
 {
 	uint8_t buf[BWN_SEC_KEYSIZE] = { 0, };
 	uint8_t per_sta_keys_start = 8;
 
 	if (BWN_SEC_NEWAPI(mac))
 		per_sta_keys_start = 4;
 
 	KASSERT(index < mac->mac_max_nr_keys,
 	    ("%s:%d: fail", __func__, __LINE__));
 	KASSERT(key_len <= BWN_SEC_KEYSIZE,
 	    ("%s:%d: fail", __func__, __LINE__));
 
 	if (index >= per_sta_keys_start)
 		bwn_key_macwrite(mac, index, NULL);
 	if (key)
 		memcpy(buf, key, key_len);
 	bwn_key_write(mac, index, algorithm, buf);
 	if (index >= per_sta_keys_start)
 		bwn_key_macwrite(mac, index, mac_addr);
 
 	mac->mac_key[index].algorithm = algorithm;
 }
 
 static void
 bwn_key_macwrite(struct bwn_mac *mac, uint8_t index, const uint8_t *addr)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	uint32_t addrtmp[2] = { 0, 0 };
 	uint8_t start = 8;
 
 	if (BWN_SEC_NEWAPI(mac))
 		start = 4;
 
 	KASSERT(index >= start,
 	    ("%s:%d: fail", __func__, __LINE__));
 	index -= start;
 
 	if (addr) {
 		addrtmp[0] = addr[0];
 		addrtmp[0] |= ((uint32_t) (addr[1]) << 8);
 		addrtmp[0] |= ((uint32_t) (addr[2]) << 16);
 		addrtmp[0] |= ((uint32_t) (addr[3]) << 24);
 		addrtmp[1] = addr[4];
 		addrtmp[1] |= ((uint32_t) (addr[5]) << 8);
 	}
 
 	if (bhnd_get_hwrev(sc->sc_dev) >= 5) {
 		bwn_shm_write_4(mac, BWN_RCMTA, (index * 2) + 0, addrtmp[0]);
 		bwn_shm_write_2(mac, BWN_RCMTA, (index * 2) + 1, addrtmp[1]);
 	} else {
 		if (index >= 8) {
 			bwn_shm_write_4(mac, BWN_SHARED,
 			    BWN_SHARED_PSM + (index * 6) + 0, addrtmp[0]);
 			bwn_shm_write_2(mac, BWN_SHARED,
 			    BWN_SHARED_PSM + (index * 6) + 4, addrtmp[1]);
 		}
 	}
 }
 
 static void
 bwn_key_write(struct bwn_mac *mac, uint8_t index, uint8_t algorithm,
     const uint8_t *key)
 {
 	unsigned int i;
 	uint32_t offset;
 	uint16_t kidx, value;
 
 	kidx = BWN_SEC_KEY2FW(mac, index);
 	bwn_shm_write_2(mac, BWN_SHARED,
 	    BWN_SHARED_KEYIDX_BLOCK + (kidx * 2), (kidx << 4) | algorithm);
 
 	offset = mac->mac_ktp + (index * BWN_SEC_KEYSIZE);
 	for (i = 0; i < BWN_SEC_KEYSIZE; i += 2) {
 		value = key[i];
 		value |= (uint16_t)(key[i + 1]) << 8;
 		bwn_shm_write_2(mac, BWN_SHARED, offset + i, value);
 	}
 }
 
 static void
 bwn_phy_exit(struct bwn_mac *mac)
 {
 
 	mac->mac_phy.rf_onoff(mac, 0);
 	if (mac->mac_phy.exit != NULL)
 		mac->mac_phy.exit(mac);
 }
 
 static void
 bwn_dma_free(struct bwn_mac *mac)
 {
 	struct bwn_dma *dma;
 
 	if ((mac->mac_flags & BWN_MAC_FLAG_DMA) == 0)
 		return;
 	dma = &mac->mac_method.dma;
 
 	bwn_dma_ringfree(&dma->rx);
 	bwn_dma_ringfree(&dma->wme[WME_AC_BK]);
 	bwn_dma_ringfree(&dma->wme[WME_AC_BE]);
 	bwn_dma_ringfree(&dma->wme[WME_AC_VI]);
 	bwn_dma_ringfree(&dma->wme[WME_AC_VO]);
 	bwn_dma_ringfree(&dma->mcast);
 }
 
 static void
 bwn_core_stop(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 
 	BWN_ASSERT_LOCKED(sc);
 
 	if (mac->mac_status < BWN_MAC_STATUS_STARTED)
 		return;
 
 	callout_stop(&sc->sc_rfswitch_ch);
 	callout_stop(&sc->sc_task_ch);
 	callout_stop(&sc->sc_watchdog_ch);
 	sc->sc_watchdog_timer = 0;
 	BWN_WRITE_4(mac, BWN_INTR_MASK, 0);
 	BWN_READ_4(mac, BWN_INTR_MASK);
 	bwn_mac_suspend(mac);
 
 	mac->mac_status = BWN_MAC_STATUS_INITED;
 }
 
 static int
 bwn_switch_band(struct bwn_softc *sc, struct ieee80211_channel *chan)
 {
 	struct bwn_mac *up_dev = NULL;
 	struct bwn_mac *down_dev;
 	struct bwn_mac *mac;
 	int err, status;
 	uint8_t gmode;
 
 	BWN_ASSERT_LOCKED(sc);
 
 	TAILQ_FOREACH(mac, &sc->sc_maclist, mac_list) {
 		if (IEEE80211_IS_CHAN_2GHZ(chan) &&
 		    mac->mac_phy.supports_2ghz) {
 			up_dev = mac;
 			gmode = 1;
 		} else if (IEEE80211_IS_CHAN_5GHZ(chan) &&
 		    mac->mac_phy.supports_5ghz) {
 			up_dev = mac;
 			gmode = 0;
 		} else {
 			KASSERT(0 == 1, ("%s:%d: fail", __func__, __LINE__));
 			return (EINVAL);
 		}
 		if (up_dev != NULL)
 			break;
 	}
 	if (up_dev == NULL) {
 		device_printf(sc->sc_dev, "Could not find a device\n");
 		return (ENODEV);
 	}
 	if (up_dev == sc->sc_curmac && sc->sc_curmac->mac_phy.gmode == gmode)
 		return (0);
 
 	DPRINTF(sc, BWN_DEBUG_RF | BWN_DEBUG_PHY | BWN_DEBUG_RESET,
 	    "switching to %s-GHz band\n",
 	    IEEE80211_IS_CHAN_2GHZ(chan) ? "2" : "5");
 
 	down_dev = sc->sc_curmac;
 	status = down_dev->mac_status;
 	if (status >= BWN_MAC_STATUS_STARTED)
 		bwn_core_stop(down_dev);
 	if (status >= BWN_MAC_STATUS_INITED)
 		bwn_core_exit(down_dev);
 
 	if (down_dev != up_dev) {
 		err = bwn_phy_reset(down_dev);
 		if (err)
 			goto fail;
 	}
 
 	up_dev->mac_phy.gmode = gmode;
 	if (status >= BWN_MAC_STATUS_INITED) {
 		err = bwn_core_init(up_dev);
 		if (err) {
 			device_printf(sc->sc_dev,
 			    "fatal: failed to initialize for %s-GHz\n",
 			    IEEE80211_IS_CHAN_2GHZ(chan) ? "2" : "5");
 			goto fail;
 		}
 	}
 	if (status >= BWN_MAC_STATUS_STARTED)
 		bwn_core_start(up_dev);
 	KASSERT(up_dev->mac_status == status, ("%s: fail", __func__));
 	sc->sc_curmac = up_dev;
 
 	return (0);
 fail:
 	sc->sc_curmac = NULL;
 	return (err);
 }
 
 static void
 bwn_rf_turnon(struct bwn_mac *mac)
 {
 
 	DPRINTF(mac->mac_sc, BWN_DEBUG_RESET, "%s: called\n", __func__);
 
 	bwn_mac_suspend(mac);
 	mac->mac_phy.rf_onoff(mac, 1);
 	mac->mac_phy.rf_on = 1;
 	bwn_mac_enable(mac);
 }
 
 static void
 bwn_rf_turnoff(struct bwn_mac *mac)
 {
 
 	DPRINTF(mac->mac_sc, BWN_DEBUG_RESET, "%s: called\n", __func__);
 
 	bwn_mac_suspend(mac);
 	mac->mac_phy.rf_onoff(mac, 0);
 	mac->mac_phy.rf_on = 0;
 	bwn_mac_enable(mac);
 }
 
 /*
  * PHY reset.
  */
 static int
 bwn_phy_reset(struct bwn_mac *mac)
 {
 	struct bwn_softc	*sc;
 	uint16_t		 iost, mask;
 	int			 error;
 
 	sc = mac->mac_sc;
 
 	iost = BWN_IOCTL_PHYRESET | BHND_IOCTL_CLK_FORCE;
 	mask = iost | BWN_IOCTL_SUPPORT_G;
 
 	if ((error = bhnd_write_ioctl(sc->sc_dev, iost, mask)))
 		return (error);
 
 	DELAY(1000);
 
 	iost &= ~BHND_IOCTL_CLK_FORCE;
 
 	if ((error = bhnd_write_ioctl(sc->sc_dev, iost, mask)))
 		return (error);
 
 	DELAY(1000);
 
 	return (0);
 }
 
 static int
 bwn_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
 	struct bwn_vap *bvp = BWN_VAP(vap);
 	struct ieee80211com *ic= vap->iv_ic;
 	enum ieee80211_state ostate = vap->iv_state;
 	struct bwn_softc *sc = ic->ic_softc;
 	struct bwn_mac *mac = sc->sc_curmac;
 	int error;
 
 	DPRINTF(sc, BWN_DEBUG_STATE, "%s: %s -> %s\n", __func__,
 	    ieee80211_state_name[vap->iv_state],
 	    ieee80211_state_name[nstate]);
 
 	error = bvp->bv_newstate(vap, nstate, arg);
 	if (error != 0)
 		return (error);
 
 	BWN_LOCK(sc);
 
 	bwn_led_newstate(mac, nstate);
 
 	/*
 	 * Clear the BSSID when we stop a STA
 	 */
 	if (vap->iv_opmode == IEEE80211_M_STA) {
 		if (ostate == IEEE80211_S_RUN && nstate != IEEE80211_S_RUN) {
 			/*
 			 * Clear out the BSSID.  If we reassociate to
 			 * the same AP, this will reinialize things
 			 * correctly...
 			 */
 			if (ic->ic_opmode == IEEE80211_M_STA &&
 			    (sc->sc_flags & BWN_FLAG_INVALID) == 0) {
 				memset(sc->sc_bssid, 0, IEEE80211_ADDR_LEN);
 				bwn_set_macaddr(mac);
 			}
 		}
 	}
 
 	if (vap->iv_opmode == IEEE80211_M_MONITOR ||
 	    vap->iv_opmode == IEEE80211_M_AHDEMO) {
 		/* XXX nothing to do? */
 	} else if (nstate == IEEE80211_S_RUN) {
 		memcpy(sc->sc_bssid, vap->iv_bss->ni_bssid, IEEE80211_ADDR_LEN);
 		bwn_set_opmode(mac);
 		bwn_set_pretbtt(mac);
 		bwn_spu_setdelay(mac, 0);
 		bwn_set_macaddr(mac);
 	}
 
 	BWN_UNLOCK(sc);
 
 	return (error);
 }
 
 static void
 bwn_set_pretbtt(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	uint16_t pretbtt;
 
 	if (ic->ic_opmode == IEEE80211_M_IBSS)
 		pretbtt = 2;
 	else
 		pretbtt = (mac->mac_phy.type == BWN_PHYTYPE_A) ? 120 : 250;
 	bwn_shm_write_2(mac, BWN_SHARED, BWN_SHARED_PRETBTT, pretbtt);
 	BWN_WRITE_2(mac, BWN_TSF_CFP_PRETBTT, pretbtt);
 }
 
 static int
 bwn_intr(void *arg)
 {
 	struct bwn_mac *mac = arg;
 	struct bwn_softc *sc = mac->mac_sc;
 	uint32_t reason;
 
 	if (mac->mac_status < BWN_MAC_STATUS_STARTED ||
 	    (sc->sc_flags & BWN_FLAG_INVALID))
 		return (FILTER_STRAY);
 
 	DPRINTF(sc, BWN_DEBUG_INTR, "%s: called\n", __func__);
 
 	reason = BWN_READ_4(mac, BWN_INTR_REASON);
 	if (reason == 0xffffffff)	/* shared IRQ */
 		return (FILTER_STRAY);
 	reason &= mac->mac_intr_mask;
 	if (reason == 0)
 		return (FILTER_HANDLED);
 	DPRINTF(sc, BWN_DEBUG_INTR, "%s: reason=0x%08x\n", __func__, reason);
 
 	mac->mac_reason[0] = BWN_READ_4(mac, BWN_DMA0_REASON) & 0x0001dc00;
 	mac->mac_reason[1] = BWN_READ_4(mac, BWN_DMA1_REASON) & 0x0000dc00;
 	mac->mac_reason[2] = BWN_READ_4(mac, BWN_DMA2_REASON) & 0x0000dc00;
 	mac->mac_reason[3] = BWN_READ_4(mac, BWN_DMA3_REASON) & 0x0001dc00;
 	mac->mac_reason[4] = BWN_READ_4(mac, BWN_DMA4_REASON) & 0x0000dc00;
 	BWN_WRITE_4(mac, BWN_INTR_REASON, reason);
 	BWN_WRITE_4(mac, BWN_DMA0_REASON, mac->mac_reason[0]);
 	BWN_WRITE_4(mac, BWN_DMA1_REASON, mac->mac_reason[1]);
 	BWN_WRITE_4(mac, BWN_DMA2_REASON, mac->mac_reason[2]);
 	BWN_WRITE_4(mac, BWN_DMA3_REASON, mac->mac_reason[3]);
 	BWN_WRITE_4(mac, BWN_DMA4_REASON, mac->mac_reason[4]);
 
 	/* Disable interrupts. */
 	BWN_WRITE_4(mac, BWN_INTR_MASK, 0);
 
 	mac->mac_reason_intr = reason;
 
 	BWN_BARRIER(mac, 0, 0, BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE);
 
 	taskqueue_enqueue(sc->sc_tq, &mac->mac_intrtask);
 	return (FILTER_HANDLED);
 }
 
 static void
 bwn_intrtask(void *arg, int npending)
 {
 	struct bwn_mac *mac = arg;
 	struct bwn_softc *sc = mac->mac_sc;
 	uint32_t merged = 0;
 	int i, tx = 0, rx = 0;
 
 	BWN_LOCK(sc);
 	if (mac->mac_status < BWN_MAC_STATUS_STARTED ||
 	    (sc->sc_flags & BWN_FLAG_INVALID)) {
 		BWN_UNLOCK(sc);
 		return;
 	}
 
 	for (i = 0; i < N(mac->mac_reason); i++)
 		merged |= mac->mac_reason[i];
 
 	if (mac->mac_reason_intr & BWN_INTR_MAC_TXERR)
 		device_printf(sc->sc_dev, "MAC trans error\n");
 
 	if (mac->mac_reason_intr & BWN_INTR_PHY_TXERR) {
 		DPRINTF(sc, BWN_DEBUG_INTR, "%s: PHY trans error\n", __func__);
 		mac->mac_phy.txerrors--;
 		if (mac->mac_phy.txerrors == 0) {
 			mac->mac_phy.txerrors = BWN_TXERROR_MAX;
 			bwn_restart(mac, "PHY TX errors");
 		}
 	}
 
 	if (merged & (BWN_DMAINTR_FATALMASK | BWN_DMAINTR_NONFATALMASK)) {
 		if (merged & BWN_DMAINTR_FATALMASK) {
 			device_printf(sc->sc_dev,
 			    "Fatal DMA error: %#x %#x %#x %#x %#x %#x\n",
 			    mac->mac_reason[0], mac->mac_reason[1],
 			    mac->mac_reason[2], mac->mac_reason[3],
 			    mac->mac_reason[4], mac->mac_reason[5]);
 			bwn_restart(mac, "DMA error");
 			BWN_UNLOCK(sc);
 			return;
 		}
 		if (merged & BWN_DMAINTR_NONFATALMASK) {
 			device_printf(sc->sc_dev,
 			    "DMA error: %#x %#x %#x %#x %#x %#x\n",
 			    mac->mac_reason[0], mac->mac_reason[1],
 			    mac->mac_reason[2], mac->mac_reason[3],
 			    mac->mac_reason[4], mac->mac_reason[5]);
 		}
 	}
 
 	if (mac->mac_reason_intr & BWN_INTR_UCODE_DEBUG)
 		bwn_intr_ucode_debug(mac);
 	if (mac->mac_reason_intr & BWN_INTR_TBTT_INDI)
 		bwn_intr_tbtt_indication(mac);
 	if (mac->mac_reason_intr & BWN_INTR_ATIM_END)
 		bwn_intr_atim_end(mac);
 	if (mac->mac_reason_intr & BWN_INTR_BEACON)
 		bwn_intr_beacon(mac);
 	if (mac->mac_reason_intr & BWN_INTR_PMQ)
 		bwn_intr_pmq(mac);
 	if (mac->mac_reason_intr & BWN_INTR_NOISESAMPLE_OK)
 		bwn_intr_noise(mac);
 
 	if (mac->mac_flags & BWN_MAC_FLAG_DMA) {
 		if (mac->mac_reason[0] & BWN_DMAINTR_RX_DONE) {
 			bwn_dma_rx(mac->mac_method.dma.rx);
 			rx = 1;
 		}
 	} else
 		rx = bwn_pio_rx(&mac->mac_method.pio.rx);
 
 	KASSERT(!(mac->mac_reason[1] & BWN_DMAINTR_RX_DONE), ("%s", __func__));
 	KASSERT(!(mac->mac_reason[2] & BWN_DMAINTR_RX_DONE), ("%s", __func__));
 	KASSERT(!(mac->mac_reason[3] & BWN_DMAINTR_RX_DONE), ("%s", __func__));
 	KASSERT(!(mac->mac_reason[4] & BWN_DMAINTR_RX_DONE), ("%s", __func__));
 	KASSERT(!(mac->mac_reason[5] & BWN_DMAINTR_RX_DONE), ("%s", __func__));
 
 	if (mac->mac_reason_intr & BWN_INTR_TX_OK) {
 		bwn_intr_txeof(mac);
 		tx = 1;
 	}
 
 	BWN_WRITE_4(mac, BWN_INTR_MASK, mac->mac_intr_mask);
 
 	if (sc->sc_blink_led != NULL && sc->sc_led_blink) {
 		int evt = BWN_LED_EVENT_NONE;
 
 		if (tx && rx) {
 			if (sc->sc_rx_rate > sc->sc_tx_rate)
 				evt = BWN_LED_EVENT_RX;
 			else
 				evt = BWN_LED_EVENT_TX;
 		} else if (tx) {
 			evt = BWN_LED_EVENT_TX;
 		} else if (rx) {
 			evt = BWN_LED_EVENT_RX;
 		} else if (rx == 0) {
 			evt = BWN_LED_EVENT_POLL;
 		}
 
 		if (evt != BWN_LED_EVENT_NONE)
 			bwn_led_event(mac, evt);
        }
 
 	if (mbufq_first(&sc->sc_snd) != NULL)
 		bwn_start(sc);
 
 	BWN_BARRIER(mac, 0, 0, BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE);
 
 	BWN_UNLOCK(sc);
 }
 
 static void
 bwn_restart(struct bwn_mac *mac, const char *msg)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	struct ieee80211com *ic = &sc->sc_ic;
 
 	if (mac->mac_status < BWN_MAC_STATUS_INITED)
 		return;
 
 	device_printf(sc->sc_dev, "HW reset: %s\n", msg);
 	ieee80211_runtask(ic, &mac->mac_hwreset);
 }
 
 static void
 bwn_intr_ucode_debug(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	uint16_t reason;
 
 	if (mac->mac_fw.opensource == 0)
 		return;
 
 	reason = bwn_shm_read_2(mac, BWN_SCRATCH, BWN_DEBUGINTR_REASON_REG);
 	switch (reason) {
 	case BWN_DEBUGINTR_PANIC:
 		bwn_handle_fwpanic(mac);
 		break;
 	case BWN_DEBUGINTR_DUMP_SHM:
 		device_printf(sc->sc_dev, "BWN_DEBUGINTR_DUMP_SHM\n");
 		break;
 	case BWN_DEBUGINTR_DUMP_REGS:
 		device_printf(sc->sc_dev, "BWN_DEBUGINTR_DUMP_REGS\n");
 		break;
 	case BWN_DEBUGINTR_MARKER:
 		device_printf(sc->sc_dev, "BWN_DEBUGINTR_MARKER\n");
 		break;
 	default:
 		device_printf(sc->sc_dev,
 		    "ucode debug unknown reason: %#x\n", reason);
 	}
 
 	bwn_shm_write_2(mac, BWN_SCRATCH, BWN_DEBUGINTR_REASON_REG,
 	    BWN_DEBUGINTR_ACK);
 }
 
 static void
 bwn_intr_tbtt_indication(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	struct ieee80211com *ic = &sc->sc_ic;
 
 	if (ic->ic_opmode != IEEE80211_M_HOSTAP)
 		bwn_psctl(mac, 0);
 	if (ic->ic_opmode == IEEE80211_M_IBSS)
 		mac->mac_flags |= BWN_MAC_FLAG_DFQVALID;
 }
 
 static void
 bwn_intr_atim_end(struct bwn_mac *mac)
 {
 
 	if (mac->mac_flags & BWN_MAC_FLAG_DFQVALID) {
 		BWN_WRITE_4(mac, BWN_MACCMD,
 		    BWN_READ_4(mac, BWN_MACCMD) | BWN_MACCMD_DFQ_VALID);
 		mac->mac_flags &= ~BWN_MAC_FLAG_DFQVALID;
 	}
 }
 
 static void
 bwn_intr_beacon(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	uint32_t cmd, beacon0, beacon1;
 
 	if (ic->ic_opmode == IEEE80211_M_HOSTAP ||
 	    ic->ic_opmode == IEEE80211_M_MBSS)
 		return;
 
 	mac->mac_intr_mask &= ~BWN_INTR_BEACON;
 
 	cmd = BWN_READ_4(mac, BWN_MACCMD);
 	beacon0 = (cmd & BWN_MACCMD_BEACON0_VALID);
 	beacon1 = (cmd & BWN_MACCMD_BEACON1_VALID);
 
 	if (beacon0 && beacon1) {
 		BWN_WRITE_4(mac, BWN_INTR_REASON, BWN_INTR_BEACON);
 		mac->mac_intr_mask |= BWN_INTR_BEACON;
 		return;
 	}
 
 	if (sc->sc_flags & BWN_FLAG_NEED_BEACON_TP) {
 		sc->sc_flags &= ~BWN_FLAG_NEED_BEACON_TP;
 		bwn_load_beacon0(mac);
 		bwn_load_beacon1(mac);
 		cmd = BWN_READ_4(mac, BWN_MACCMD);
 		cmd |= BWN_MACCMD_BEACON0_VALID;
 		BWN_WRITE_4(mac, BWN_MACCMD, cmd);
 	} else {
 		if (!beacon0) {
 			bwn_load_beacon0(mac);
 			cmd = BWN_READ_4(mac, BWN_MACCMD);
 			cmd |= BWN_MACCMD_BEACON0_VALID;
 			BWN_WRITE_4(mac, BWN_MACCMD, cmd);
 		} else if (!beacon1) {
 			bwn_load_beacon1(mac);
 			cmd = BWN_READ_4(mac, BWN_MACCMD);
 			cmd |= BWN_MACCMD_BEACON1_VALID;
 			BWN_WRITE_4(mac, BWN_MACCMD, cmd);
 		}
 	}
 }
 
 static void
 bwn_intr_pmq(struct bwn_mac *mac)
 {
 	uint32_t tmp;
 
 	while (1) {
 		tmp = BWN_READ_4(mac, BWN_PS_STATUS);
 		if (!(tmp & 0x00000008))
 			break;
 	}
 	BWN_WRITE_2(mac, BWN_PS_STATUS, 0x0002);
 }
 
 static void
 bwn_intr_noise(struct bwn_mac *mac)
 {
 	struct bwn_phy_g *pg = &mac->mac_phy.phy_g;
 	uint16_t tmp;
 	uint8_t noise[4];
 	uint8_t i, j;
 	int32_t average;
 
 	if (mac->mac_phy.type != BWN_PHYTYPE_G)
 		return;
 
 	KASSERT(mac->mac_noise.noi_running, ("%s: fail", __func__));
 	*((uint32_t *)noise) = htole32(bwn_jssi_read(mac));
 	if (noise[0] == 0x7f || noise[1] == 0x7f || noise[2] == 0x7f ||
 	    noise[3] == 0x7f)
 		goto new;
 
 	KASSERT(mac->mac_noise.noi_nsamples < 8,
 	    ("%s:%d: fail", __func__, __LINE__));
 	i = mac->mac_noise.noi_nsamples;
 	noise[0] = MIN(MAX(noise[0], 0), N(pg->pg_nrssi_lt) - 1);
 	noise[1] = MIN(MAX(noise[1], 0), N(pg->pg_nrssi_lt) - 1);
 	noise[2] = MIN(MAX(noise[2], 0), N(pg->pg_nrssi_lt) - 1);
 	noise[3] = MIN(MAX(noise[3], 0), N(pg->pg_nrssi_lt) - 1);
 	mac->mac_noise.noi_samples[i][0] = pg->pg_nrssi_lt[noise[0]];
 	mac->mac_noise.noi_samples[i][1] = pg->pg_nrssi_lt[noise[1]];
 	mac->mac_noise.noi_samples[i][2] = pg->pg_nrssi_lt[noise[2]];
 	mac->mac_noise.noi_samples[i][3] = pg->pg_nrssi_lt[noise[3]];
 	mac->mac_noise.noi_nsamples++;
 	if (mac->mac_noise.noi_nsamples == 8) {
 		average = 0;
 		for (i = 0; i < 8; i++) {
 			for (j = 0; j < 4; j++)
 				average += mac->mac_noise.noi_samples[i][j];
 		}
 		average = (((average / 32) * 125) + 64) / 128;
 		tmp = (bwn_shm_read_2(mac, BWN_SHARED, 0x40c) / 128) & 0x1f;
 		if (tmp >= 8)
 			average += 2;
 		else
 			average -= 25;
 		average -= (tmp == 8) ? 72 : 48;
 
 		mac->mac_stats.link_noise = average;
 		mac->mac_noise.noi_running = 0;
 		return;
 	}
 new:
 	bwn_noise_gensample(mac);
 }
 
 static int
 bwn_pio_rx(struct bwn_pio_rxqueue *prq)
 {
 	struct bwn_mac *mac = prq->prq_mac;
 	struct bwn_softc *sc = mac->mac_sc;
 	unsigned int i;
 
 	BWN_ASSERT_LOCKED(sc);
 
 	if (mac->mac_status < BWN_MAC_STATUS_STARTED)
 		return (0);
 
 	for (i = 0; i < 5000; i++) {
 		if (bwn_pio_rxeof(prq) == 0)
 			break;
 	}
 	if (i >= 5000)
 		device_printf(sc->sc_dev, "too many RX frames in PIO mode\n");
 	return ((i > 0) ? 1 : 0);
 }
 
 static void
 bwn_dma_rx(struct bwn_dma_ring *dr)
 {
 	int slot, curslot;
 
 	KASSERT(!dr->dr_tx, ("%s:%d: fail", __func__, __LINE__));
 	curslot = dr->get_curslot(dr);
 	KASSERT(curslot >= 0 && curslot < dr->dr_numslots,
 	    ("%s:%d: fail", __func__, __LINE__));
 
 	slot = dr->dr_curslot;
 	for (; slot != curslot; slot = bwn_dma_nextslot(dr, slot))
 		bwn_dma_rxeof(dr, &slot);
 
 	bus_dmamap_sync(dr->dr_ring_dtag, dr->dr_ring_dmap,
 	    BUS_DMASYNC_PREWRITE);
 
 	dr->set_curslot(dr, slot);
 	dr->dr_curslot = slot;
 }
 
 static void
 bwn_intr_txeof(struct bwn_mac *mac)
 {
 	struct bwn_txstatus stat;
 	uint32_t stat0, stat1;
 	uint16_t tmp;
 
 	BWN_ASSERT_LOCKED(mac->mac_sc);
 
 	while (1) {
 		stat0 = BWN_READ_4(mac, BWN_XMITSTAT_0);
 		if (!(stat0 & 0x00000001))
 			break;
 		stat1 = BWN_READ_4(mac, BWN_XMITSTAT_1);
 
 		DPRINTF(mac->mac_sc, BWN_DEBUG_XMIT,
 		    "%s: stat0=0x%08x, stat1=0x%08x\n",
 		    __func__,
 		    stat0,
 		    stat1);
 
 		stat.cookie = (stat0 >> 16);
 		stat.seq = (stat1 & 0x0000ffff);
 		stat.phy_stat = ((stat1 & 0x00ff0000) >> 16);
 		tmp = (stat0 & 0x0000ffff);
 		stat.framecnt = ((tmp & 0xf000) >> 12);
 		stat.rtscnt = ((tmp & 0x0f00) >> 8);
 		stat.sreason = ((tmp & 0x001c) >> 2);
 		stat.pm = (tmp & 0x0080) ? 1 : 0;
 		stat.im = (tmp & 0x0040) ? 1 : 0;
 		stat.ampdu = (tmp & 0x0020) ? 1 : 0;
 		stat.ack = (tmp & 0x0002) ? 1 : 0;
 
 		DPRINTF(mac->mac_sc, BWN_DEBUG_XMIT,
 		    "%s: cookie=%d, seq=%d, phystat=0x%02x, framecnt=%d, "
 		    "rtscnt=%d, sreason=%d, pm=%d, im=%d, ampdu=%d, ack=%d\n",
 		    __func__,
 		    stat.cookie,
 		    stat.seq,
 		    stat.phy_stat,
 		    stat.framecnt,
 		    stat.rtscnt,
 		    stat.sreason,
 		    stat.pm,
 		    stat.im,
 		    stat.ampdu,
 		    stat.ack);
 
 		bwn_handle_txeof(mac, &stat);
 	}
 }
 
 static void
 bwn_hwreset(void *arg, int npending)
 {
 	struct bwn_mac *mac = arg;
 	struct bwn_softc *sc = mac->mac_sc;
 	int error = 0;
 	int prev_status;
 
 	BWN_LOCK(sc);
 
 	prev_status = mac->mac_status;
 	if (prev_status >= BWN_MAC_STATUS_STARTED)
 		bwn_core_stop(mac);
 	if (prev_status >= BWN_MAC_STATUS_INITED)
 		bwn_core_exit(mac);
 
 	if (prev_status >= BWN_MAC_STATUS_INITED) {
 		error = bwn_core_init(mac);
 		if (error)
 			goto out;
 	}
 	if (prev_status >= BWN_MAC_STATUS_STARTED)
 		bwn_core_start(mac);
 out:
 	if (error) {
 		device_printf(sc->sc_dev, "%s: failed (%d)\n", __func__, error);
 		sc->sc_curmac = NULL;
 	}
 	BWN_UNLOCK(sc);
 }
 
 static void
 bwn_handle_fwpanic(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	uint16_t reason;
 
 	reason = bwn_shm_read_2(mac, BWN_SCRATCH, BWN_FWPANIC_REASON_REG);
 	device_printf(sc->sc_dev,"fw panic (%u)\n", reason);
 
 	if (reason == BWN_FWPANIC_RESTART)
 		bwn_restart(mac, "ucode panic");
 }
 
 static void
 bwn_load_beacon0(struct bwn_mac *mac)
 {
 
 	KASSERT(0 == 1, ("%s:%d: fail", __func__, __LINE__));
 }
 
 static void
 bwn_load_beacon1(struct bwn_mac *mac)
 {
 
 	KASSERT(0 == 1, ("%s:%d: fail", __func__, __LINE__));
 }
 
 static uint32_t
 bwn_jssi_read(struct bwn_mac *mac)
 {
 	uint32_t val = 0;
 
 	val = bwn_shm_read_2(mac, BWN_SHARED, 0x08a);
 	val <<= 16;
 	val |= bwn_shm_read_2(mac, BWN_SHARED, 0x088);
 
 	return (val);
 }
 
 static void
 bwn_noise_gensample(struct bwn_mac *mac)
 {
 	uint32_t jssi = 0x7f7f7f7f;
 
 	bwn_shm_write_2(mac, BWN_SHARED, 0x088, (jssi & 0x0000ffff));
 	bwn_shm_write_2(mac, BWN_SHARED, 0x08a, (jssi & 0xffff0000) >> 16);
 	BWN_WRITE_4(mac, BWN_MACCMD,
 	    BWN_READ_4(mac, BWN_MACCMD) | BWN_MACCMD_BGNOISE);
 }
 
 static int
 bwn_dma_freeslot(struct bwn_dma_ring *dr)
 {
 	BWN_ASSERT_LOCKED(dr->dr_mac->mac_sc);
 
 	return (dr->dr_numslots - dr->dr_usedslot);
 }
 
 static int
 bwn_dma_nextslot(struct bwn_dma_ring *dr, int slot)
 {
 	BWN_ASSERT_LOCKED(dr->dr_mac->mac_sc);
 
 	KASSERT(slot >= -1 && slot <= dr->dr_numslots - 1,
 	    ("%s:%d: fail", __func__, __LINE__));
 	if (slot == dr->dr_numslots - 1)
 		return (0);
 	return (slot + 1);
 }
 
 static void
 bwn_dma_rxeof(struct bwn_dma_ring *dr, int *slot)
 {
 	struct bwn_mac *mac = dr->dr_mac;
 	struct bwn_softc *sc = mac->mac_sc;
 	struct bwn_dma *dma = &mac->mac_method.dma;
 	struct bwn_dmadesc_generic *desc;
 	struct bwn_dmadesc_meta *meta;
 	struct bwn_rxhdr4 *rxhdr;
 	struct mbuf *m;
 	uint32_t macstat;
 	int32_t tmp;
 	int cnt = 0;
 	uint16_t len;
 
 	dr->getdesc(dr, *slot, &desc, &meta);
 
 	bus_dmamap_sync(dma->rxbuf_dtag, meta->mt_dmap, BUS_DMASYNC_POSTREAD);
 	m = meta->mt_m;
 
 	if (bwn_dma_newbuf(dr, desc, meta, 0)) {
 		counter_u64_add(sc->sc_ic.ic_ierrors, 1);
 		return;
 	}
 
 	rxhdr = mtod(m, struct bwn_rxhdr4 *);
 	len = le16toh(rxhdr->frame_len);
 	if (len <= 0) {
 		counter_u64_add(sc->sc_ic.ic_ierrors, 1);
 		return;
 	}
 	if (bwn_dma_check_redzone(dr, m)) {
 		device_printf(sc->sc_dev, "redzone error.\n");
 		bwn_dma_set_redzone(dr, m);
 		bus_dmamap_sync(dma->rxbuf_dtag, meta->mt_dmap,
 		    BUS_DMASYNC_PREWRITE);
 		return;
 	}
 	if (len > dr->dr_rx_bufsize) {
 		tmp = len;
 		while (1) {
 			dr->getdesc(dr, *slot, &desc, &meta);
 			bwn_dma_set_redzone(dr, meta->mt_m);
 			bus_dmamap_sync(dma->rxbuf_dtag, meta->mt_dmap,
 			    BUS_DMASYNC_PREWRITE);
 			*slot = bwn_dma_nextslot(dr, *slot);
 			cnt++;
 			tmp -= dr->dr_rx_bufsize;
 			if (tmp <= 0)
 				break;
 		}
 		device_printf(sc->sc_dev, "too small buffer "
 		       "(len %u buffer %u dropped %d)\n",
 		       len, dr->dr_rx_bufsize, cnt);
 		return;
 	}
 
 	switch (mac->mac_fw.fw_hdr_format) {
 	case BWN_FW_HDR_351:
 	case BWN_FW_HDR_410:
 		macstat = le32toh(rxhdr->ps4.r351.mac_status);
 		break;
 	case BWN_FW_HDR_598:
 		macstat = le32toh(rxhdr->ps4.r598.mac_status);
 		break;
 	}
 
 	if (macstat & BWN_RX_MAC_FCSERR) {
 		if (!(mac->mac_sc->sc_filters & BWN_MACCTL_PASS_BADFCS)) {
 			device_printf(sc->sc_dev, "RX drop\n");
 			return;
 		}
 	}
 
 	m->m_len = m->m_pkthdr.len = len + dr->dr_frameoffset;
 	m_adj(m, dr->dr_frameoffset);
 
 	bwn_rxeof(dr->dr_mac, m, rxhdr);
 }
 
 static void
 bwn_handle_txeof(struct bwn_mac *mac, const struct bwn_txstatus *status)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	struct bwn_stats *stats = &mac->mac_stats;
 
 	BWN_ASSERT_LOCKED(mac->mac_sc);
 
 	if (status->im)
 		device_printf(sc->sc_dev, "TODO: STATUS IM\n");
 	if (status->ampdu)
 		device_printf(sc->sc_dev, "TODO: STATUS AMPDU\n");
 	if (status->rtscnt) {
 		if (status->rtscnt == 0xf)
 			stats->rtsfail++;
 		else
 			stats->rts++;
 	}
 
 	if (mac->mac_flags & BWN_MAC_FLAG_DMA) {
 		bwn_dma_handle_txeof(mac, status);
 	} else {
 		bwn_pio_handle_txeof(mac, status);
 	}
 
 	bwn_phy_txpower_check(mac, 0);
 }
 
 static uint8_t
 bwn_pio_rxeof(struct bwn_pio_rxqueue *prq)
 {
 	struct bwn_mac *mac = prq->prq_mac;
 	struct bwn_softc *sc = mac->mac_sc;
 	struct bwn_rxhdr4 rxhdr;
 	struct mbuf *m;
 	uint32_t ctl32, macstat, v32;
 	unsigned int i, padding;
 	uint16_t ctl16, len, totlen, v16;
 	unsigned char *mp;
 	char *data;
 
 	memset(&rxhdr, 0, sizeof(rxhdr));
 
 	if (prq->prq_rev >= 8) {
 		ctl32 = bwn_pio_rx_read_4(prq, BWN_PIO8_RXCTL);
 		if (!(ctl32 & BWN_PIO8_RXCTL_FRAMEREADY))
 			return (0);
 		bwn_pio_rx_write_4(prq, BWN_PIO8_RXCTL,
 		    BWN_PIO8_RXCTL_FRAMEREADY);
 		for (i = 0; i < 10; i++) {
 			ctl32 = bwn_pio_rx_read_4(prq, BWN_PIO8_RXCTL);
 			if (ctl32 & BWN_PIO8_RXCTL_DATAREADY)
 				goto ready;
 			DELAY(10);
 		}
 	} else {
 		ctl16 = bwn_pio_rx_read_2(prq, BWN_PIO_RXCTL);
 		if (!(ctl16 & BWN_PIO_RXCTL_FRAMEREADY))
 			return (0);
 		bwn_pio_rx_write_2(prq, BWN_PIO_RXCTL,
 		    BWN_PIO_RXCTL_FRAMEREADY);
 		for (i = 0; i < 10; i++) {
 			ctl16 = bwn_pio_rx_read_2(prq, BWN_PIO_RXCTL);
 			if (ctl16 & BWN_PIO_RXCTL_DATAREADY)
 				goto ready;
 			DELAY(10);
 		}
 	}
 	device_printf(sc->sc_dev, "%s: timed out\n", __func__);
 	return (1);
 ready:
 	if (prq->prq_rev >= 8) {
 		bus_read_multi_4(sc->sc_mem_res,
 		    prq->prq_base + BWN_PIO8_RXDATA, (void *)&rxhdr,
 		    sizeof(rxhdr));
 	} else {
 		bus_read_multi_2(sc->sc_mem_res,
 		    prq->prq_base + BWN_PIO_RXDATA, (void *)&rxhdr,
 		    sizeof(rxhdr));
 	}
 	len = le16toh(rxhdr.frame_len);
 	if (len > 0x700) {
 		device_printf(sc->sc_dev, "%s: len is too big\n", __func__);
 		goto error;
 	}
 	if (len == 0) {
 		device_printf(sc->sc_dev, "%s: len is 0\n", __func__);
 		goto error;
 	}
 
 	switch (mac->mac_fw.fw_hdr_format) {
 	case BWN_FW_HDR_351:
 	case BWN_FW_HDR_410:
 		macstat = le32toh(rxhdr.ps4.r351.mac_status);
 		break;
 	case BWN_FW_HDR_598:
 		macstat = le32toh(rxhdr.ps4.r598.mac_status);
 		break;
 	}
 
 	if (macstat & BWN_RX_MAC_FCSERR) {
 		if (!(mac->mac_sc->sc_filters & BWN_MACCTL_PASS_BADFCS)) {
 			device_printf(sc->sc_dev, "%s: FCS error", __func__);
 			goto error;
 		}
 	}
 
 	padding = (macstat & BWN_RX_MAC_PADDING) ? 2 : 0;
 	totlen = len + padding;
 	KASSERT(totlen <= MCLBYTES, ("too big..\n"));
 	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
 		device_printf(sc->sc_dev, "%s: out of memory", __func__);
 		goto error;
 	}
 	mp = mtod(m, unsigned char *);
 	if (prq->prq_rev >= 8) {
 		bus_read_multi_4(sc->sc_mem_res,
 		    prq->prq_base + BWN_PIO8_RXDATA, (void *)mp, (totlen & ~3));
 		if (totlen & 3) {
 			v32 = bwn_pio_rx_read_4(prq, BWN_PIO8_RXDATA);
 			data = &(mp[totlen - 1]);
 			switch (totlen & 3) {
 			case 3:
 				*data = (v32 >> 16);
 				data--;
 			case 2:
 				*data = (v32 >> 8);
 				data--;
 			case 1:
 				*data = v32;
 			}
 		}
 	} else {
 		bus_read_multi_2(sc->sc_mem_res,
 		    prq->prq_base + BWN_PIO_RXDATA, (void *)mp, (totlen & ~1));
 		if (totlen & 1) {
 			v16 = bwn_pio_rx_read_2(prq, BWN_PIO_RXDATA);
 			mp[totlen - 1] = v16;
 		}
 	}
 
 	m->m_len = m->m_pkthdr.len = totlen;
 
 	bwn_rxeof(prq->prq_mac, m, &rxhdr);
 
 	return (1);
 error:
 	if (prq->prq_rev >= 8)
 		bwn_pio_rx_write_4(prq, BWN_PIO8_RXCTL,
 		    BWN_PIO8_RXCTL_DATAREADY);
 	else
 		bwn_pio_rx_write_2(prq, BWN_PIO_RXCTL, BWN_PIO_RXCTL_DATAREADY);
 	return (1);
 }
 
 static int
 bwn_dma_newbuf(struct bwn_dma_ring *dr, struct bwn_dmadesc_generic *desc,
     struct bwn_dmadesc_meta *meta, int init)
 {
 	struct bwn_mac *mac = dr->dr_mac;
 	struct bwn_dma *dma = &mac->mac_method.dma;
 	struct bwn_rxhdr4 *hdr;
 	bus_dmamap_t map;
 	bus_addr_t paddr;
 	struct mbuf *m;
 	int error;
 
 	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
 		error = ENOBUFS;
 
 		/*
 		 * If the NIC is up and running, we need to:
 		 * - Clear RX buffer's header.
 		 * - Restore RX descriptor settings.
 		 */
 		if (init)
 			return (error);
 		else
 			goto back;
 	}
 	m->m_len = m->m_pkthdr.len = MCLBYTES;
 
 	bwn_dma_set_redzone(dr, m);
 
 	/*
 	 * Try to load RX buf into temporary DMA map
 	 */
 	error = bus_dmamap_load_mbuf(dma->rxbuf_dtag, dr->dr_spare_dmap, m,
 	    bwn_dma_buf_addr, &paddr, BUS_DMA_NOWAIT);
 	if (error) {
 		m_freem(m);
 
 		/*
 		 * See the comment above
 		 */
 		if (init)
 			return (error);
 		else
 			goto back;
 	}
 
 	if (!init)
 		bus_dmamap_unload(dma->rxbuf_dtag, meta->mt_dmap);
 	meta->mt_m = m;
 	meta->mt_paddr = paddr;
 
 	/*
 	 * Swap RX buf's DMA map with the loaded temporary one
 	 */
 	map = meta->mt_dmap;
 	meta->mt_dmap = dr->dr_spare_dmap;
 	dr->dr_spare_dmap = map;
 
 back:
 	/*
 	 * Clear RX buf header
 	 */
 	hdr = mtod(meta->mt_m, struct bwn_rxhdr4 *);
 	bzero(hdr, sizeof(*hdr));
 	bus_dmamap_sync(dma->rxbuf_dtag, meta->mt_dmap,
 	    BUS_DMASYNC_PREWRITE);
 
 	/*
 	 * Setup RX buf descriptor
 	 */
 	dr->setdesc(dr, desc, meta->mt_paddr, meta->mt_m->m_len -
 	    sizeof(*hdr), 0, 0, 0);
 	return (error);
 }
 
 static void
 bwn_dma_buf_addr(void *arg, bus_dma_segment_t *seg, int nseg,
 		 bus_size_t mapsz __unused, int error)
 {
 
 	if (!error) {
 		KASSERT(nseg == 1, ("too many segments(%d)\n", nseg));
 		*((bus_addr_t *)arg) = seg->ds_addr;
 	}
 }
 
 static int
 bwn_hwrate2ieeerate(int rate)
 {
 
 	switch (rate) {
 	case BWN_CCK_RATE_1MB:
 		return (2);
 	case BWN_CCK_RATE_2MB:
 		return (4);
 	case BWN_CCK_RATE_5MB:
 		return (11);
 	case BWN_CCK_RATE_11MB:
 		return (22);
 	case BWN_OFDM_RATE_6MB:
 		return (12);
 	case BWN_OFDM_RATE_9MB:
 		return (18);
 	case BWN_OFDM_RATE_12MB:
 		return (24);
 	case BWN_OFDM_RATE_18MB:
 		return (36);
 	case BWN_OFDM_RATE_24MB:
 		return (48);
 	case BWN_OFDM_RATE_36MB:
 		return (72);
 	case BWN_OFDM_RATE_48MB:
 		return (96);
 	case BWN_OFDM_RATE_54MB:
 		return (108);
 	default:
 		printf("Ooops\n");
 		return (0);
 	}
 }
 
 /*
  * Post process the RX provided RSSI.
  *
  * Valid for A, B, G, LP PHYs.
  */
 static int8_t
 bwn_rx_rssi_calc(struct bwn_mac *mac, uint8_t in_rssi,
     int ofdm, int adjust_2053, int adjust_2050)
 {
 	struct bwn_phy *phy = &mac->mac_phy;
 	struct bwn_phy_g *gphy = &phy->phy_g;
 	int tmp;
 
 	switch (phy->rf_ver) {
 	case 0x2050:
 		if (ofdm) {
 			tmp = in_rssi;
 			if (tmp > 127)
 				tmp -= 256;
 			tmp = tmp * 73 / 64;
 			if (adjust_2050)
 				tmp += 25;
 			else
 				tmp -= 3;
 		} else {
 			if (mac->mac_sc->sc_board_info.board_flags
 			    & BHND_BFL_ADCDIV) {
 				if (in_rssi > 63)
 					in_rssi = 63;
 				tmp = gphy->pg_nrssi_lt[in_rssi];
 				tmp = (31 - tmp) * -131 / 128 - 57;
 			} else {
 				tmp = in_rssi;
 				tmp = (31 - tmp) * -149 / 128 - 68;
 			}
 			if (phy->type == BWN_PHYTYPE_G && adjust_2050)
 				tmp += 25;
 		}
 		break;
 	case 0x2060:
 		if (in_rssi > 127)
 			tmp = in_rssi - 256;
 		else
 			tmp = in_rssi;
 		break;
 	default:
 		tmp = in_rssi;
 		tmp = (tmp - 11) * 103 / 64;
 		if (adjust_2053)
 			tmp -= 109;
 		else
 			tmp -= 83;
 	}
 
 	return (tmp);
 }
 
 static void
 bwn_rxeof(struct bwn_mac *mac, struct mbuf *m, const void *_rxhdr)
 {
 	const struct bwn_rxhdr4 *rxhdr = _rxhdr;
 	struct bwn_plcp6 *plcp;
 	struct bwn_softc *sc = mac->mac_sc;
 	struct ieee80211_frame_min *wh;
 	struct ieee80211_node *ni;
 	struct ieee80211com *ic = &sc->sc_ic;
 	uint32_t macstat;
 	int padding, rate, rssi = 0, noise = 0;
 	uint16_t phytype, phystat0, phystat3, chanstat;
 	unsigned char *mp = mtod(m, unsigned char *);
 
 	BWN_ASSERT_LOCKED(sc);
 
 	phystat0 = le16toh(rxhdr->phy_status0);
 
 	/*
 	 * XXX Note: phy_status3 doesn't exist for HT-PHY; it's only
 	 * used for LP-PHY.
 	 */
 	phystat3 = le16toh(rxhdr->ps3.lp.phy_status3);
 
 	switch (mac->mac_fw.fw_hdr_format) {
 	case BWN_FW_HDR_351:
 	case BWN_FW_HDR_410:
 		macstat = le32toh(rxhdr->ps4.r351.mac_status);
 		chanstat = le16toh(rxhdr->ps4.r351.channel);
 		break;
 	case BWN_FW_HDR_598:
 		macstat = le32toh(rxhdr->ps4.r598.mac_status);
 		chanstat = le16toh(rxhdr->ps4.r598.channel);
 		break;
 	}
 
 	phytype = chanstat & BWN_RX_CHAN_PHYTYPE;
 
 	if (macstat & BWN_RX_MAC_FCSERR)
 		device_printf(sc->sc_dev, "TODO RX: RX_FLAG_FAILED_FCS_CRC\n");
 	if (phystat0 & (BWN_RX_PHYST0_PLCPHCF | BWN_RX_PHYST0_PLCPFV))
 		device_printf(sc->sc_dev, "TODO RX: RX_FLAG_FAILED_PLCP_CRC\n");
 	if (macstat & BWN_RX_MAC_DECERR)
 		goto drop;
 
 	padding = (macstat & BWN_RX_MAC_PADDING) ? 2 : 0;
 	if (m->m_pkthdr.len < (sizeof(struct bwn_plcp6) + padding)) {
 		device_printf(sc->sc_dev, "frame too short (length=%d)\n",
 		    m->m_pkthdr.len);
 		goto drop;
 	}
 	plcp = (struct bwn_plcp6 *)(mp + padding);
 	m_adj(m, sizeof(struct bwn_plcp6) + padding);
 	if (m->m_pkthdr.len < IEEE80211_MIN_LEN) {
 		device_printf(sc->sc_dev, "frame too short (length=%d)\n",
 		    m->m_pkthdr.len);
 		goto drop;
 	}
 	wh = mtod(m, struct ieee80211_frame_min *);
 
 	if (macstat & BWN_RX_MAC_DEC) {
 		DPRINTF(sc, BWN_DEBUG_HWCRYPTO,
 		    "RX decryption attempted (old %d keyidx %#x)\n",
 		    BWN_ISOLDFMT(mac),
 		    (macstat & BWN_RX_MAC_KEYIDX) >> BWN_RX_MAC_KEYIDX_SHIFT);
 	}
 
 	if (phystat0 & BWN_RX_PHYST0_OFDM)
 		rate = bwn_plcp_get_ofdmrate(mac, plcp,
 		    phytype == BWN_PHYTYPE_A);
 	else
 		rate = bwn_plcp_get_cckrate(mac, plcp);
 	if (rate == -1) {
 		if (!(mac->mac_sc->sc_filters & BWN_MACCTL_PASS_BADPLCP))
 			goto drop;
 	}
 	sc->sc_rx_rate = bwn_hwrate2ieeerate(rate);
 
 	/* rssi/noise */
 	switch (phytype) {
 	case BWN_PHYTYPE_A:
 	case BWN_PHYTYPE_B:
 	case BWN_PHYTYPE_G:
 	case BWN_PHYTYPE_LP:
 		rssi = bwn_rx_rssi_calc(mac, rxhdr->phy.abg.rssi,
 		    !! (phystat0 & BWN_RX_PHYST0_OFDM),
 		    !! (phystat0 & BWN_RX_PHYST0_GAINCTL),
 		    !! (phystat3 & BWN_RX_PHYST3_TRSTATE));
 		break;
 	case BWN_PHYTYPE_N:
 		/* Broadcom has code for min/avg, but always used max */
 		if (rxhdr->phy.n.power0 == 16 || rxhdr->phy.n.power0 == 32)
 			rssi = max(rxhdr->phy.n.power1, rxhdr->ps2.n.power2);
 		else
 			rssi = max(rxhdr->phy.n.power0, rxhdr->phy.n.power1);
 #if 0
 		DPRINTF(mac->mac_sc, BWN_DEBUG_RECV,
 		    "%s: power0=%d, power1=%d, power2=%d\n",
 		    __func__,
 		    rxhdr->phy.n.power0,
 		    rxhdr->phy.n.power1,
 		    rxhdr->ps2.n.power2);
 #endif
 		break;
 	default:
 		/* XXX TODO: implement rssi for other PHYs */
 		break;
 	}
 
 	/*
 	 * RSSI here is absolute, not relative to the noise floor.
 	 */
 	noise = mac->mac_stats.link_noise;
 	rssi = rssi - noise;
 
 	/* RX radio tap */
 	if (ieee80211_radiotap_active(ic))
 		bwn_rx_radiotap(mac, m, rxhdr, plcp, rate, rssi, noise);
 	m_adj(m, -IEEE80211_CRC_LEN);
 
 	BWN_UNLOCK(sc);
 
 	ni = ieee80211_find_rxnode(ic, wh);
 	if (ni != NULL) {
 		ieee80211_input(ni, m, rssi, noise);
 		ieee80211_free_node(ni);
 	} else
 		ieee80211_input_all(ic, m, rssi, noise);
 
 	BWN_LOCK(sc);
 	return;
 drop:
 	device_printf(sc->sc_dev, "%s: dropped\n", __func__);
 }
 
 static void
 bwn_ratectl_tx_complete(const struct ieee80211_node *ni,
     const struct bwn_txstatus *status)
 {
 	struct ieee80211_ratectl_tx_status txs;
 	int retrycnt = 0;
 
 	/*
 	 * If we don't get an ACK, then we should log the
 	 * full framecnt.  That may be 0 if it's a PHY
 	 * failure, so ensure that gets logged as some
 	 * retry attempt.
 	 */
 	txs.flags = IEEE80211_RATECTL_STATUS_LONG_RETRY;
 	if (status->ack) {
 		txs.status = IEEE80211_RATECTL_TX_SUCCESS;
 		retrycnt = status->framecnt - 1;
 	} else {
 		txs.status = IEEE80211_RATECTL_TX_FAIL_UNSPECIFIED;
 		retrycnt = status->framecnt;
 		if (retrycnt == 0)
 			retrycnt = 1;
 	}
 	txs.long_retries = retrycnt;
 	ieee80211_ratectl_tx_complete(ni, &txs);
 }
 
 static void
 bwn_dma_handle_txeof(struct bwn_mac *mac,
     const struct bwn_txstatus *status)
 {
 	struct bwn_dma *dma = &mac->mac_method.dma;
 	struct bwn_dma_ring *dr;
 	struct bwn_dmadesc_generic *desc;
 	struct bwn_dmadesc_meta *meta;
 	struct bwn_softc *sc = mac->mac_sc;
 	int slot;
 
 	BWN_ASSERT_LOCKED(sc);
 
 	dr = bwn_dma_parse_cookie(mac, status, status->cookie, &slot);
 	if (dr == NULL) {
 		device_printf(sc->sc_dev, "failed to parse cookie\n");
 		return;
 	}
 	KASSERT(dr->dr_tx, ("%s:%d: fail", __func__, __LINE__));
 
 	while (1) {
 		KASSERT(slot >= 0 && slot < dr->dr_numslots,
 		    ("%s:%d: fail", __func__, __LINE__));
 		dr->getdesc(dr, slot, &desc, &meta);
 
 		if (meta->mt_txtype == BWN_DMADESC_METATYPE_HEADER)
 			bus_dmamap_unload(dr->dr_txring_dtag, meta->mt_dmap);
 		else if (meta->mt_txtype == BWN_DMADESC_METATYPE_BODY)
 			bus_dmamap_unload(dma->txbuf_dtag, meta->mt_dmap);
 
 		if (meta->mt_islast) {
 			KASSERT(meta->mt_m != NULL,
 			    ("%s:%d: fail", __func__, __LINE__));
 
 			bwn_ratectl_tx_complete(meta->mt_ni, status);
 			ieee80211_tx_complete(meta->mt_ni, meta->mt_m, 0);
 			meta->mt_ni = NULL;
 			meta->mt_m = NULL;
 		} else
 			KASSERT(meta->mt_m == NULL,
 			    ("%s:%d: fail", __func__, __LINE__));
 
 		dr->dr_usedslot--;
 		if (meta->mt_islast)
 			break;
 		slot = bwn_dma_nextslot(dr, slot);
 	}
 	sc->sc_watchdog_timer = 0;
 	if (dr->dr_stop) {
 		KASSERT(bwn_dma_freeslot(dr) >= BWN_TX_SLOTS_PER_FRAME,
 		    ("%s:%d: fail", __func__, __LINE__));
 		dr->dr_stop = 0;
 	}
 }
 
 static void
 bwn_pio_handle_txeof(struct bwn_mac *mac,
     const struct bwn_txstatus *status)
 {
 	struct bwn_pio_txqueue *tq;
 	struct bwn_pio_txpkt *tp = NULL;
 	struct bwn_softc *sc = mac->mac_sc;
 
 	BWN_ASSERT_LOCKED(sc);
 
 	tq = bwn_pio_parse_cookie(mac, status->cookie, &tp);
 	if (tq == NULL)
 		return;
 
 	tq->tq_used -= roundup(tp->tp_m->m_pkthdr.len + BWN_HDRSIZE(mac), 4);
 	tq->tq_free++;
 
 	if (tp->tp_ni != NULL) {
 		/*
 		 * Do any tx complete callback.  Note this must
 		 * be done before releasing the node reference.
 		 */
 		bwn_ratectl_tx_complete(tp->tp_ni, status);
 	}
 	ieee80211_tx_complete(tp->tp_ni, tp->tp_m, 0);
 	tp->tp_ni = NULL;
 	tp->tp_m = NULL;
 	TAILQ_INSERT_TAIL(&tq->tq_pktlist, tp, tp_list);
 
 	sc->sc_watchdog_timer = 0;
 }
 
 static void
 bwn_phy_txpower_check(struct bwn_mac *mac, uint32_t flags)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	struct bwn_phy *phy = &mac->mac_phy;
 	struct ieee80211com *ic = &sc->sc_ic;
 	unsigned long now;
 	bwn_txpwr_result_t result;
 
 	BWN_GETTIME(now);
 
 	if (!(flags & BWN_TXPWR_IGNORE_TIME) && ieee80211_time_before(now, phy->nexttime))
 		return;
 	phy->nexttime = now + 2 * 1000;
 
 	if (sc->sc_board_info.board_vendor == PCI_VENDOR_BROADCOM &&
 	    sc->sc_board_info.board_type == BHND_BOARD_BU4306)
 		return;
 
 	if (phy->recalc_txpwr != NULL) {
 		result = phy->recalc_txpwr(mac,
 		    (flags & BWN_TXPWR_IGNORE_TSSI) ? 1 : 0);
 		if (result == BWN_TXPWR_RES_DONE)
 			return;
 		KASSERT(result == BWN_TXPWR_RES_NEED_ADJUST,
 		    ("%s: fail", __func__));
 		KASSERT(phy->set_txpwr != NULL, ("%s: fail", __func__));
 
 		ieee80211_runtask(ic, &mac->mac_txpower);
 	}
 }
 
 static uint16_t
 bwn_pio_rx_read_2(struct bwn_pio_rxqueue *prq, uint16_t offset)
 {
 
 	return (BWN_READ_2(prq->prq_mac, prq->prq_base + offset));
 }
 
 static uint32_t
 bwn_pio_rx_read_4(struct bwn_pio_rxqueue *prq, uint16_t offset)
 {
 
 	return (BWN_READ_4(prq->prq_mac, prq->prq_base + offset));
 }
 
 static void
 bwn_pio_rx_write_2(struct bwn_pio_rxqueue *prq, uint16_t offset, uint16_t value)
 {
 
 	BWN_WRITE_2(prq->prq_mac, prq->prq_base + offset, value);
 }
 
 static void
 bwn_pio_rx_write_4(struct bwn_pio_rxqueue *prq, uint16_t offset, uint32_t value)
 {
 
 	BWN_WRITE_4(prq->prq_mac, prq->prq_base + offset, value);
 }
 
 static int
 bwn_ieeerate2hwrate(struct bwn_softc *sc, int rate)
 {
 
 	switch (rate) {
 	/* OFDM rates (cf IEEE Std 802.11a-1999, pp. 14 Table 80) */
 	case 12:
 		return (BWN_OFDM_RATE_6MB);
 	case 18:
 		return (BWN_OFDM_RATE_9MB);
 	case 24:
 		return (BWN_OFDM_RATE_12MB);
 	case 36:
 		return (BWN_OFDM_RATE_18MB);
 	case 48:
 		return (BWN_OFDM_RATE_24MB);
 	case 72:
 		return (BWN_OFDM_RATE_36MB);
 	case 96:
 		return (BWN_OFDM_RATE_48MB);
 	case 108:
 		return (BWN_OFDM_RATE_54MB);
 	/* CCK rates (NB: not IEEE std, device-specific) */
 	case 2:
 		return (BWN_CCK_RATE_1MB);
 	case 4:
 		return (BWN_CCK_RATE_2MB);
 	case 11:
 		return (BWN_CCK_RATE_5MB);
 	case 22:
 		return (BWN_CCK_RATE_11MB);
 	}
 
 	device_printf(sc->sc_dev, "unsupported rate %d\n", rate);
 	return (BWN_CCK_RATE_1MB);
 }
 
 static uint16_t
 bwn_set_txhdr_phyctl1(struct bwn_mac *mac, uint8_t bitrate)
 {
 	struct bwn_phy *phy = &mac->mac_phy;
 	uint16_t control = 0;
 	uint16_t bw;
 
 	/* XXX TODO: this is for LP phy, what about N-PHY, etc? */
 	bw = BWN_TXH_PHY1_BW_20;
 
 	if (BWN_ISCCKRATE(bitrate) && phy->type != BWN_PHYTYPE_LP) {
 		control = bw;
 	} else {
 		control = bw;
 		/* Figure out coding rate and modulation */
 		/* XXX TODO: table-ize, for MCS transmit */
 		/* Note: this is BWN_*_RATE values */
 		switch (bitrate) {
 		case BWN_CCK_RATE_1MB:
 			control |= 0;
 			break;
 		case BWN_CCK_RATE_2MB:
 			control |= 1;
 			break;
 		case BWN_CCK_RATE_5MB:
 			control |= 2;
 			break;
 		case BWN_CCK_RATE_11MB:
 			control |= 3;
 			break;
 		case BWN_OFDM_RATE_6MB:
 			control |= BWN_TXH_PHY1_CRATE_1_2;
 			control |= BWN_TXH_PHY1_MODUL_BPSK;
 			break;
 		case BWN_OFDM_RATE_9MB:
 			control |= BWN_TXH_PHY1_CRATE_3_4;
 			control |= BWN_TXH_PHY1_MODUL_BPSK;
 			break;
 		case BWN_OFDM_RATE_12MB:
 			control |= BWN_TXH_PHY1_CRATE_1_2;
 			control |= BWN_TXH_PHY1_MODUL_QPSK;
 			break;
 		case BWN_OFDM_RATE_18MB:
 			control |= BWN_TXH_PHY1_CRATE_3_4;
 			control |= BWN_TXH_PHY1_MODUL_QPSK;
 			break;
 		case BWN_OFDM_RATE_24MB:
 			control |= BWN_TXH_PHY1_CRATE_1_2;
 			control |= BWN_TXH_PHY1_MODUL_QAM16;
 			break;
 		case BWN_OFDM_RATE_36MB:
 			control |= BWN_TXH_PHY1_CRATE_3_4;
 			control |= BWN_TXH_PHY1_MODUL_QAM16;
 			break;
 		case BWN_OFDM_RATE_48MB:
 			control |= BWN_TXH_PHY1_CRATE_1_2;
 			control |= BWN_TXH_PHY1_MODUL_QAM64;
 			break;
 		case BWN_OFDM_RATE_54MB:
 			control |= BWN_TXH_PHY1_CRATE_3_4;
 			control |= BWN_TXH_PHY1_MODUL_QAM64;
 			break;
 		default:
 			break;
 		}
 		control |= BWN_TXH_PHY1_MODE_SISO;
 	}
 
 	return control;
 }
 
 static int
 bwn_set_txhdr(struct bwn_mac *mac, struct ieee80211_node *ni,
     struct mbuf *m, struct bwn_txhdr *txhdr, uint16_t cookie)
 {
 	const struct bwn_phy *phy = &mac->mac_phy;
 	struct bwn_softc *sc = mac->mac_sc;
 	struct ieee80211_frame *wh;
 	struct ieee80211_frame *protwh;
 	const struct ieee80211_txparam *tp = ni->ni_txparms;
 	struct ieee80211vap *vap = ni->ni_vap;
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct mbuf *mprot;
 	uint8_t *prot_ptr;
 	unsigned int len;
 	uint32_t macctl = 0;
 	int rts_rate, rts_rate_fb, ismcast, isshort, rix, type;
 	uint16_t phyctl = 0;
 	uint8_t rate, rate_fb;
 	int fill_phy_ctl1 = 0;
 
 	wh = mtod(m, struct ieee80211_frame *);
 	memset(txhdr, 0, sizeof(*txhdr));
 
 	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
 	ismcast = IEEE80211_IS_MULTICAST(wh->i_addr1);
 	isshort = (ic->ic_flags & IEEE80211_F_SHPREAMBLE) != 0;
 
 	if ((phy->type == BWN_PHYTYPE_N) || (phy->type == BWN_PHYTYPE_LP)
 	    || (phy->type == BWN_PHYTYPE_HT))
 		fill_phy_ctl1 = 1;
 
 	/*
 	 * Find TX rate
 	 */
 	if (type != IEEE80211_FC0_TYPE_DATA || (m->m_flags & M_EAPOL))
 		rate = rate_fb = tp->mgmtrate;
 	else if (ismcast)
 		rate = rate_fb = tp->mcastrate;
 	else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE)
 		rate = rate_fb = tp->ucastrate;
 	else {
 		rix = ieee80211_ratectl_rate(ni, NULL, 0);
 		rate = ni->ni_txrate;
 
 		if (rix > 0)
 			rate_fb = ni->ni_rates.rs_rates[rix - 1] &
 			    IEEE80211_RATE_VAL;
 		else
 			rate_fb = rate;
 	}
 
 	sc->sc_tx_rate = rate;
 
 	/* Note: this maps the select ieee80211 rate to hardware rate */
 	rate = bwn_ieeerate2hwrate(sc, rate);
 	rate_fb = bwn_ieeerate2hwrate(sc, rate_fb);
 
 	txhdr->phyrate = (BWN_ISOFDMRATE(rate)) ? bwn_plcp_getofdm(rate) :
 	    bwn_plcp_getcck(rate);
 	bcopy(wh->i_fc, txhdr->macfc, sizeof(txhdr->macfc));
 	bcopy(wh->i_addr1, txhdr->addr1, IEEE80211_ADDR_LEN);
 
 	/* XXX rate/rate_fb is the hardware rate */
 	if ((rate_fb == rate) ||
 	    (*(u_int16_t *)wh->i_dur & htole16(0x8000)) ||
 	    (*(u_int16_t *)wh->i_dur == htole16(0)))
 		txhdr->dur_fb = *(u_int16_t *)wh->i_dur;
 	else
 		txhdr->dur_fb = ieee80211_compute_duration(ic->ic_rt,
 		    m->m_pkthdr.len, rate, isshort);
 
 	/* XXX TX encryption */
 
 	switch (mac->mac_fw.fw_hdr_format) {
 	case BWN_FW_HDR_351:
 		bwn_plcp_genhdr((struct bwn_plcp4 *)(&txhdr->body.r351.plcp),
 		    m->m_pkthdr.len + IEEE80211_CRC_LEN, rate);
 		break;
 	case BWN_FW_HDR_410:
 		bwn_plcp_genhdr((struct bwn_plcp4 *)(&txhdr->body.r410.plcp),
 		    m->m_pkthdr.len + IEEE80211_CRC_LEN, rate);
 		break;
 	case BWN_FW_HDR_598:
 		bwn_plcp_genhdr((struct bwn_plcp4 *)(&txhdr->body.r598.plcp),
 		    m->m_pkthdr.len + IEEE80211_CRC_LEN, rate);
 		break;
 	}
 
 	bwn_plcp_genhdr((struct bwn_plcp4 *)(&txhdr->plcp_fb),
 	    m->m_pkthdr.len + IEEE80211_CRC_LEN, rate_fb);
 
 	txhdr->eftypes |= (BWN_ISOFDMRATE(rate_fb)) ? BWN_TX_EFT_FB_OFDM :
 	    BWN_TX_EFT_FB_CCK;
 	txhdr->chan = phy->chan;
 	phyctl |= (BWN_ISOFDMRATE(rate)) ? BWN_TX_PHY_ENC_OFDM :
 	    BWN_TX_PHY_ENC_CCK;
 	/* XXX preamble? obey net80211 */
 	if (isshort && (rate == BWN_CCK_RATE_2MB || rate == BWN_CCK_RATE_5MB ||
 	     rate == BWN_CCK_RATE_11MB))
 		phyctl |= BWN_TX_PHY_SHORTPRMBL;
 
 	if (! phy->gmode)
 		macctl |= BWN_TX_MAC_5GHZ;
 
 	/* XXX TX antenna selection */
 
 	switch (bwn_antenna_sanitize(mac, 0)) {
 	case 0:
 		phyctl |= BWN_TX_PHY_ANT01AUTO;
 		break;
 	case 1:
 		phyctl |= BWN_TX_PHY_ANT0;
 		break;
 	case 2:
 		phyctl |= BWN_TX_PHY_ANT1;
 		break;
 	case 3:
 		phyctl |= BWN_TX_PHY_ANT2;
 		break;
 	case 4:
 		phyctl |= BWN_TX_PHY_ANT3;
 		break;
 	default:
 		KASSERT(0 == 1, ("%s:%d: fail", __func__, __LINE__));
 	}
 
 	if (!ismcast)
 		macctl |= BWN_TX_MAC_ACK;
 
 	macctl |= (BWN_TX_MAC_HWSEQ | BWN_TX_MAC_START_MSDU);
 	if (!IEEE80211_IS_MULTICAST(wh->i_addr1) &&
 	    m->m_pkthdr.len + IEEE80211_CRC_LEN > vap->iv_rtsthreshold)
 		macctl |= BWN_TX_MAC_LONGFRAME;
 
 	if ((ic->ic_flags & IEEE80211_F_USEPROT) &&
 	    ic->ic_protmode != IEEE80211_PROT_NONE) {
 		/* Note: don't fall back to CCK rates for 5G */
 		if (phy->gmode)
 			rts_rate = BWN_CCK_RATE_1MB;
 		else
 			rts_rate = BWN_OFDM_RATE_6MB;
 		rts_rate_fb = bwn_get_fbrate(rts_rate);
 
 		/* XXX 'rate' here is hardware rate now, not the net80211 rate */
 		mprot = ieee80211_alloc_prot(ni, m, rate, ic->ic_protmode);
 		if (mprot == NULL) {
 			if_inc_counter(vap->iv_ifp, IFCOUNTER_OERRORS, 1);
 			device_printf(sc->sc_dev,
 			    "could not allocate mbuf for protection mode %d\n",
 			    ic->ic_protmode);
 			return (ENOBUFS);
 		}
 
 		switch (mac->mac_fw.fw_hdr_format) {
 		case BWN_FW_HDR_351:
 			prot_ptr = txhdr->body.r351.rts_frame;
 			break;
 		case BWN_FW_HDR_410:
 			prot_ptr = txhdr->body.r410.rts_frame;
 			break;
 		case BWN_FW_HDR_598:
 			prot_ptr = txhdr->body.r598.rts_frame;
 			break;
 		}
 
 		bcopy(mtod(mprot, uint8_t *), prot_ptr, mprot->m_pkthdr.len);
 		m_freem(mprot);
 
 		if (ic->ic_protmode == IEEE80211_PROT_CTSONLY) {
 			macctl |= BWN_TX_MAC_SEND_CTSTOSELF;
 			len = sizeof(struct ieee80211_frame_cts);
 		} else {
 			macctl |= BWN_TX_MAC_SEND_RTSCTS;
 			len = sizeof(struct ieee80211_frame_rts);
 		}
 		len += IEEE80211_CRC_LEN;
 
 		switch (mac->mac_fw.fw_hdr_format) {
 		case BWN_FW_HDR_351:
 			bwn_plcp_genhdr((struct bwn_plcp4 *)
 			    &txhdr->body.r351.rts_plcp, len, rts_rate);
 			break;
 		case BWN_FW_HDR_410:
 			bwn_plcp_genhdr((struct bwn_plcp4 *)
 			    &txhdr->body.r410.rts_plcp, len, rts_rate);
 			break;
 		case BWN_FW_HDR_598:
 			bwn_plcp_genhdr((struct bwn_plcp4 *)
 			    &txhdr->body.r598.rts_plcp, len, rts_rate);
 			break;
 		}
 
 		bwn_plcp_genhdr((struct bwn_plcp4 *)&txhdr->rts_plcp_fb, len,
 		    rts_rate_fb);
 
 		switch (mac->mac_fw.fw_hdr_format) {
 		case BWN_FW_HDR_351:
 			protwh = (struct ieee80211_frame *)
 			    &txhdr->body.r351.rts_frame;
 			break;
 		case BWN_FW_HDR_410:
 			protwh = (struct ieee80211_frame *)
 			    &txhdr->body.r410.rts_frame;
 			break;
 		case BWN_FW_HDR_598:
 			protwh = (struct ieee80211_frame *)
 			    &txhdr->body.r598.rts_frame;
 			break;
 		}
 
 		txhdr->rts_dur_fb = *(u_int16_t *)protwh->i_dur;
 
 		if (BWN_ISOFDMRATE(rts_rate)) {
 			txhdr->eftypes |= BWN_TX_EFT_RTS_OFDM;
 			txhdr->phyrate_rts = bwn_plcp_getofdm(rts_rate);
 		} else {
 			txhdr->eftypes |= BWN_TX_EFT_RTS_CCK;
 			txhdr->phyrate_rts = bwn_plcp_getcck(rts_rate);
 		}
 		txhdr->eftypes |= (BWN_ISOFDMRATE(rts_rate_fb)) ?
 		    BWN_TX_EFT_RTS_FBOFDM : BWN_TX_EFT_RTS_FBCCK;
 
 		if (fill_phy_ctl1) {
 			txhdr->phyctl_1rts = htole16(bwn_set_txhdr_phyctl1(mac, rts_rate));
 			txhdr->phyctl_1rtsfb = htole16(bwn_set_txhdr_phyctl1(mac, rts_rate_fb));
 		}
 	}
 
 	if (fill_phy_ctl1) {
 		txhdr->phyctl_1 = htole16(bwn_set_txhdr_phyctl1(mac, rate));
 		txhdr->phyctl_1fb = htole16(bwn_set_txhdr_phyctl1(mac, rate_fb));
 	}
 
 	switch (mac->mac_fw.fw_hdr_format) {
 	case BWN_FW_HDR_351:
 		txhdr->body.r351.cookie = htole16(cookie);
 		break;
 	case BWN_FW_HDR_410:
 		txhdr->body.r410.cookie = htole16(cookie);
 		break;
 	case BWN_FW_HDR_598:
 		txhdr->body.r598.cookie = htole16(cookie);
 		break;
 	}
 
 	txhdr->macctl = htole32(macctl);
 	txhdr->phyctl = htole16(phyctl);
 
 	/*
 	 * TX radio tap
 	 */
 	if (ieee80211_radiotap_active_vap(vap)) {
 		sc->sc_tx_th.wt_flags = 0;
 		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED)
 			sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP;
 		if (isshort &&
 		    (rate == BWN_CCK_RATE_2MB || rate == BWN_CCK_RATE_5MB ||
 		     rate == BWN_CCK_RATE_11MB))
 			sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
 		sc->sc_tx_th.wt_rate = rate;
 
 		ieee80211_radiotap_tx(vap, m);
 	}
 
 	return (0);
 }
 
 static void
 bwn_plcp_genhdr(struct bwn_plcp4 *plcp, const uint16_t octets,
     const uint8_t rate)
 {
 	uint32_t d, plen;
 	uint8_t *raw = plcp->o.raw;
 
 	if (BWN_ISOFDMRATE(rate)) {
 		d = bwn_plcp_getofdm(rate);
 		KASSERT(!(octets & 0xf000),
 		    ("%s:%d: fail", __func__, __LINE__));
 		d |= (octets << 5);
 		plcp->o.data = htole32(d);
 	} else {
 		plen = octets * 16 / rate;
 		if ((octets * 16 % rate) > 0) {
 			plen++;
 			if ((rate == BWN_CCK_RATE_11MB)
 			    && ((octets * 8 % 11) < 4)) {
 				raw[1] = 0x84;
 			} else
 				raw[1] = 0x04;
 		} else
 			raw[1] = 0x04;
 		plcp->o.data |= htole32(plen << 16);
 		raw[0] = bwn_plcp_getcck(rate);
 	}
 }
 
 static uint8_t
 bwn_antenna_sanitize(struct bwn_mac *mac, uint8_t n)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	uint8_t mask;
 
 	if (n == 0)
 		return (0);
 	if (mac->mac_phy.gmode)
 		mask = sc->sc_ant2g;
 	else
 		mask = sc->sc_ant5g;
 	if (!(mask & (1 << (n - 1))))
 		return (0);
 	return (n);
 }
 
 /*
  * Return a fallback rate for the given rate.
  *
  * Note: Don't fall back from OFDM to CCK.
  */
 static uint8_t
 bwn_get_fbrate(uint8_t bitrate)
 {
 	switch (bitrate) {
 	/* CCK */
 	case BWN_CCK_RATE_1MB:
 		return (BWN_CCK_RATE_1MB);
 	case BWN_CCK_RATE_2MB:
 		return (BWN_CCK_RATE_1MB);
 	case BWN_CCK_RATE_5MB:
 		return (BWN_CCK_RATE_2MB);
 	case BWN_CCK_RATE_11MB:
 		return (BWN_CCK_RATE_5MB);
 
 	/* OFDM */
 	case BWN_OFDM_RATE_6MB:
 		return (BWN_OFDM_RATE_6MB);
 	case BWN_OFDM_RATE_9MB:
 		return (BWN_OFDM_RATE_6MB);
 	case BWN_OFDM_RATE_12MB:
 		return (BWN_OFDM_RATE_9MB);
 	case BWN_OFDM_RATE_18MB:
 		return (BWN_OFDM_RATE_12MB);
 	case BWN_OFDM_RATE_24MB:
 		return (BWN_OFDM_RATE_18MB);
 	case BWN_OFDM_RATE_36MB:
 		return (BWN_OFDM_RATE_24MB);
 	case BWN_OFDM_RATE_48MB:
 		return (BWN_OFDM_RATE_36MB);
 	case BWN_OFDM_RATE_54MB:
 		return (BWN_OFDM_RATE_48MB);
 	}
 	KASSERT(0 == 1, ("%s:%d: fail", __func__, __LINE__));
 	return (0);
 }
 
 static uint32_t
 bwn_pio_write_multi_4(struct bwn_mac *mac, struct bwn_pio_txqueue *tq,
     uint32_t ctl, const void *_data, int len)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	uint32_t value = 0;
 	const uint8_t *data = _data;
 
 	ctl |= BWN_PIO8_TXCTL_0_7 | BWN_PIO8_TXCTL_8_15 |
 	    BWN_PIO8_TXCTL_16_23 | BWN_PIO8_TXCTL_24_31;
 	bwn_pio_write_4(mac, tq, BWN_PIO8_TXCTL, ctl);
 
 	bus_write_multi_4(sc->sc_mem_res, tq->tq_base + BWN_PIO8_TXDATA,
 	    __DECONST(void *, data), (len & ~3));
 	if (len & 3) {
 		ctl &= ~(BWN_PIO8_TXCTL_8_15 | BWN_PIO8_TXCTL_16_23 |
 		    BWN_PIO8_TXCTL_24_31);
 		data = &(data[len - 1]);
 		switch (len & 3) {
 		case 3:
 			ctl |= BWN_PIO8_TXCTL_16_23;
 			value |= (uint32_t)(*data) << 16;
 			data--;
 		case 2:
 			ctl |= BWN_PIO8_TXCTL_8_15;
 			value |= (uint32_t)(*data) << 8;
 			data--;
 		case 1:
 			value |= (uint32_t)(*data);
 		}
 		bwn_pio_write_4(mac, tq, BWN_PIO8_TXCTL, ctl);
 		bwn_pio_write_4(mac, tq, BWN_PIO8_TXDATA, value);
 	}
 
 	return (ctl);
 }
 
 static void
 bwn_pio_write_4(struct bwn_mac *mac, struct bwn_pio_txqueue *tq,
     uint16_t offset, uint32_t value)
 {
 
 	BWN_WRITE_4(mac, tq->tq_base + offset, value);
 }
 
 static uint16_t
 bwn_pio_write_multi_2(struct bwn_mac *mac, struct bwn_pio_txqueue *tq,
     uint16_t ctl, const void *_data, int len)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	const uint8_t *data = _data;
 
 	ctl |= BWN_PIO_TXCTL_WRITELO | BWN_PIO_TXCTL_WRITEHI;
 	BWN_PIO_WRITE_2(mac, tq, BWN_PIO_TXCTL, ctl);
 
 	bus_write_multi_2(sc->sc_mem_res, tq->tq_base + BWN_PIO_TXDATA,
 	    __DECONST(void *, data), (len & ~1));
 	if (len & 1) {
 		ctl &= ~BWN_PIO_TXCTL_WRITEHI;
 		BWN_PIO_WRITE_2(mac, tq, BWN_PIO_TXCTL, ctl);
 		BWN_PIO_WRITE_2(mac, tq, BWN_PIO_TXDATA, data[len - 1]);
 	}
 
 	return (ctl);
 }
 
 static uint16_t
 bwn_pio_write_mbuf_2(struct bwn_mac *mac, struct bwn_pio_txqueue *tq,
     uint16_t ctl, struct mbuf *m0)
 {
 	int i, j = 0;
 	uint16_t data = 0;
 	const uint8_t *buf;
 	struct mbuf *m = m0;
 
 	ctl |= BWN_PIO_TXCTL_WRITELO | BWN_PIO_TXCTL_WRITEHI;
 	BWN_PIO_WRITE_2(mac, tq, BWN_PIO_TXCTL, ctl);
 
 	for (; m != NULL; m = m->m_next) {
 		buf = mtod(m, const uint8_t *);
 		for (i = 0; i < m->m_len; i++) {
 			if (!((j++) % 2))
 				data |= buf[i];
 			else {
 				data |= (buf[i] << 8);
 				BWN_PIO_WRITE_2(mac, tq, BWN_PIO_TXDATA, data);
 				data = 0;
 			}
 		}
 	}
 	if (m0->m_pkthdr.len % 2) {
 		ctl &= ~BWN_PIO_TXCTL_WRITEHI;
 		BWN_PIO_WRITE_2(mac, tq, BWN_PIO_TXCTL, ctl);
 		BWN_PIO_WRITE_2(mac, tq, BWN_PIO_TXDATA, data);
 	}
 
 	return (ctl);
 }
 
 static void
 bwn_set_slot_time(struct bwn_mac *mac, uint16_t time)
 {
 
 	/* XXX should exit if 5GHz band .. */
 	if (mac->mac_phy.type != BWN_PHYTYPE_G)
 		return;
 
 	BWN_WRITE_2(mac, 0x684, 510 + time);
 	/* Disabled in Linux b43, can adversely effect performance */
 #if 0
 	bwn_shm_write_2(mac, BWN_SHARED, 0x0010, time);
 #endif
 }
 
 static struct bwn_dma_ring *
 bwn_dma_select(struct bwn_mac *mac, uint8_t prio)
 {
 
 	if ((mac->mac_flags & BWN_MAC_FLAG_WME) == 0)
 		return (mac->mac_method.dma.wme[WME_AC_BE]);
 
 	switch (prio) {
 	case 3:
 		return (mac->mac_method.dma.wme[WME_AC_VO]);
 	case 2:
 		return (mac->mac_method.dma.wme[WME_AC_VI]);
 	case 0:
 		return (mac->mac_method.dma.wme[WME_AC_BE]);
 	case 1:
 		return (mac->mac_method.dma.wme[WME_AC_BK]);
 	}
 	KASSERT(0 == 1, ("%s:%d: fail", __func__, __LINE__));
 	return (NULL);
 }
 
 static int
 bwn_dma_getslot(struct bwn_dma_ring *dr)
 {
 	int slot;
 
 	BWN_ASSERT_LOCKED(dr->dr_mac->mac_sc);
 
 	KASSERT(dr->dr_tx, ("%s:%d: fail", __func__, __LINE__));
 	KASSERT(!(dr->dr_stop), ("%s:%d: fail", __func__, __LINE__));
 	KASSERT(bwn_dma_freeslot(dr) != 0, ("%s:%d: fail", __func__, __LINE__));
 
 	slot = bwn_dma_nextslot(dr, dr->dr_curslot);
 	KASSERT(!(slot & ~0x0fff), ("%s:%d: fail", __func__, __LINE__));
 	dr->dr_curslot = slot;
 	dr->dr_usedslot++;
 
 	return (slot);
 }
 
 static struct bwn_pio_txqueue *
 bwn_pio_parse_cookie(struct bwn_mac *mac, uint16_t cookie,
     struct bwn_pio_txpkt **pack)
 {
 	struct bwn_pio *pio = &mac->mac_method.pio;
 	struct bwn_pio_txqueue *tq = NULL;
 	unsigned int index;
 
 	switch (cookie & 0xf000) {
 	case 0x1000:
 		tq = &pio->wme[WME_AC_BK];
 		break;
 	case 0x2000:
 		tq = &pio->wme[WME_AC_BE];
 		break;
 	case 0x3000:
 		tq = &pio->wme[WME_AC_VI];
 		break;
 	case 0x4000:
 		tq = &pio->wme[WME_AC_VO];
 		break;
 	case 0x5000:
 		tq = &pio->mcast;
 		break;
 	}
 	KASSERT(tq != NULL, ("%s:%d: fail", __func__, __LINE__));
 	if (tq == NULL)
 		return (NULL);
 	index = (cookie & 0x0fff);
 	KASSERT(index < N(tq->tq_pkts), ("%s:%d: fail", __func__, __LINE__));
 	if (index >= N(tq->tq_pkts))
 		return (NULL);
 	*pack = &tq->tq_pkts[index];
 	KASSERT(*pack != NULL, ("%s:%d: fail", __func__, __LINE__));
 	return (tq);
 }
 
 static void
 bwn_txpwr(void *arg, int npending)
 {
 	struct bwn_mac *mac = arg;
 	struct bwn_softc *sc;
 
 	if (mac == NULL)
 		return;
 
 	sc = mac->mac_sc;
 
 	BWN_LOCK(sc);
 	if (mac->mac_status >= BWN_MAC_STATUS_STARTED &&
 	    mac->mac_phy.set_txpwr != NULL)
 		mac->mac_phy.set_txpwr(mac);
 	BWN_UNLOCK(sc);
 }
 
 static void
 bwn_task_15s(struct bwn_mac *mac)
 {
 	uint16_t reg;
 
 	if (mac->mac_fw.opensource) {
 		reg = bwn_shm_read_2(mac, BWN_SCRATCH, BWN_WATCHDOG_REG);
 		if (reg) {
 			bwn_restart(mac, "fw watchdog");
 			return;
 		}
 		bwn_shm_write_2(mac, BWN_SCRATCH, BWN_WATCHDOG_REG, 1);
 	}
 	if (mac->mac_phy.task_15s)
 		mac->mac_phy.task_15s(mac);
 
 	mac->mac_phy.txerrors = BWN_TXERROR_MAX;
 }
 
 static void
 bwn_task_30s(struct bwn_mac *mac)
 {
 
 	if (mac->mac_phy.type != BWN_PHYTYPE_G || mac->mac_noise.noi_running)
 		return;
 	mac->mac_noise.noi_running = 1;
 	mac->mac_noise.noi_nsamples = 0;
 
 	bwn_noise_gensample(mac);
 }
 
 static void
 bwn_task_60s(struct bwn_mac *mac)
 {
 
 	if (mac->mac_phy.task_60s)
 		mac->mac_phy.task_60s(mac);
 	bwn_phy_txpower_check(mac, BWN_TXPWR_IGNORE_TIME);
 }
 
 static void
 bwn_tasks(void *arg)
 {
 	struct bwn_mac *mac = arg;
 	struct bwn_softc *sc = mac->mac_sc;
 
 	BWN_ASSERT_LOCKED(sc);
 	if (mac->mac_status != BWN_MAC_STATUS_STARTED)
 		return;
 
 	if (mac->mac_task_state % 4 == 0)
 		bwn_task_60s(mac);
 	if (mac->mac_task_state % 2 == 0)
 		bwn_task_30s(mac);
 	bwn_task_15s(mac);
 
 	mac->mac_task_state++;
 	callout_reset(&sc->sc_task_ch, hz * 15, bwn_tasks, mac);
 }
 
 static int
 bwn_plcp_get_ofdmrate(struct bwn_mac *mac, struct bwn_plcp6 *plcp, uint8_t a)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 
 	KASSERT(a == 0, ("not support APHY\n"));
 
 	switch (plcp->o.raw[0] & 0xf) {
 	case 0xb:
 		return (BWN_OFDM_RATE_6MB);
 	case 0xf:
 		return (BWN_OFDM_RATE_9MB);
 	case 0xa:
 		return (BWN_OFDM_RATE_12MB);
 	case 0xe:
 		return (BWN_OFDM_RATE_18MB);
 	case 0x9:
 		return (BWN_OFDM_RATE_24MB);
 	case 0xd:
 		return (BWN_OFDM_RATE_36MB);
 	case 0x8:
 		return (BWN_OFDM_RATE_48MB);
 	case 0xc:
 		return (BWN_OFDM_RATE_54MB);
 	}
 	device_printf(sc->sc_dev, "incorrect OFDM rate %d\n",
 	    plcp->o.raw[0] & 0xf);
 	return (-1);
 }
 
 static int
 bwn_plcp_get_cckrate(struct bwn_mac *mac, struct bwn_plcp6 *plcp)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 
 	switch (plcp->o.raw[0]) {
 	case 0x0a:
 		return (BWN_CCK_RATE_1MB);
 	case 0x14:
 		return (BWN_CCK_RATE_2MB);
 	case 0x37:
 		return (BWN_CCK_RATE_5MB);
 	case 0x6e:
 		return (BWN_CCK_RATE_11MB);
 	}
 	device_printf(sc->sc_dev, "incorrect CCK rate %d\n", plcp->o.raw[0]);
 	return (-1);
 }
 
 static void
 bwn_rx_radiotap(struct bwn_mac *mac, struct mbuf *m,
     const struct bwn_rxhdr4 *rxhdr, struct bwn_plcp6 *plcp, int rate,
     int rssi, int noise)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	const struct ieee80211_frame_min *wh;
 	uint64_t tsf;
 	uint16_t low_mactime_now;
 	uint16_t mt;
 
 	if (htole16(rxhdr->phy_status0) & BWN_RX_PHYST0_SHORTPRMBL)
 		sc->sc_rx_th.wr_flags |= IEEE80211_RADIOTAP_F_SHORTPRE;
 
 	wh = mtod(m, const struct ieee80211_frame_min *);
 	if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED)
 		sc->sc_rx_th.wr_flags |= IEEE80211_RADIOTAP_F_WEP;
 
 	bwn_tsf_read(mac, &tsf);
 	low_mactime_now = tsf;
 	tsf = tsf & ~0xffffULL;
 
 	switch (mac->mac_fw.fw_hdr_format) {
 	case BWN_FW_HDR_351:
 	case BWN_FW_HDR_410:
 		mt = le16toh(rxhdr->ps4.r351.mac_time);
 		break;
 	case BWN_FW_HDR_598:
 		mt = le16toh(rxhdr->ps4.r598.mac_time);
 		break;
 	}
 
 	tsf += mt;
 	if (low_mactime_now < mt)
 		tsf -= 0x10000;
 
 	sc->sc_rx_th.wr_tsf = tsf;
 	sc->sc_rx_th.wr_rate = rate;
 	sc->sc_rx_th.wr_antsignal = rssi;
 	sc->sc_rx_th.wr_antnoise = noise;
 }
 
 static void
 bwn_tsf_read(struct bwn_mac *mac, uint64_t *tsf)
 {
 	uint32_t low, high;
 
 	KASSERT(bhnd_get_hwrev(mac->mac_sc->sc_dev) >= 3,
 	    ("%s:%d: fail", __func__, __LINE__));
 
 	low = BWN_READ_4(mac, BWN_REV3PLUS_TSF_LOW);
 	high = BWN_READ_4(mac, BWN_REV3PLUS_TSF_HIGH);
 	*tsf = high;
 	*tsf <<= 32;
 	*tsf |= low;
 }
 
 static int
 bwn_dma_attach(struct bwn_mac *mac)
 {
 	struct bwn_dma			*dma;
 	struct bwn_softc		*sc;
 	struct bhnd_dma_translation	*dt, dma_translation;
 	bhnd_addr_t			 addrext_req;
 	bus_dma_tag_t			 dmat;
 	bus_addr_t			 lowaddr;
 	u_int				 addrext_shift, addr_width;
 	int				 error;
 
 	dma = &mac->mac_method.dma;
 	sc = mac->mac_sc;
 	dt = NULL;
 
 	if (sc->sc_quirks & BWN_QUIRK_NODMA)
 		return (0);
 
 	KASSERT(bhnd_get_hwrev(sc->sc_dev) >= 5, ("%s: fail", __func__));
 
 	/* Use the DMA engine's maximum host address width to determine the
 	 * addrext constraints, and supported device address width. */
 	switch (mac->mac_dmatype) {
 	case BHND_DMA_ADDR_30BIT:
 		/* 32-bit engine without addrext support */
 		addrext_req = 0x0;
 		addrext_shift = 0;
 
 		/* We can address the full 32-bit device address space */
 		addr_width = BHND_DMA_ADDR_32BIT;
 		break;
 
 	case BHND_DMA_ADDR_32BIT:
 		/* 32-bit engine with addrext support */
 		addrext_req = BWN_DMA32_ADDREXT_MASK;
 		addrext_shift = BWN_DMA32_ADDREXT_SHIFT;
 		addr_width = BHND_DMA_ADDR_32BIT;
 		break;
 
 	case BHND_DMA_ADDR_64BIT:
 		/* 64-bit engine with addrext support */
 		addrext_req = BWN_DMA64_ADDREXT_MASK;
 		addrext_shift = BWN_DMA64_ADDREXT_SHIFT;
 		addr_width = BHND_DMA_ADDR_64BIT;
 		break;
 
 	default:
 		device_printf(sc->sc_dev, "unsupported DMA address width: %d\n",
 		    mac->mac_dmatype);
 		return (ENXIO);
 	}
 
 	/* Fetch our device->host DMA translation and tag */
 	error = bhnd_get_dma_translation(sc->sc_dev, addr_width, 0, &dmat,
 	    &dma_translation);
 	if (error) {
 		device_printf(sc->sc_dev, "error fetching DMA translation: "
 		    "%d\n", error);
 		return (error);
 	}
 
 	/* Verify that our DMA engine's addrext constraints are compatible with
 	 * our DMA translation */
 	if (addrext_req != 0x0 &&
 	    (dma_translation.addrext_mask & addrext_req) != addrext_req)
 	{
 		device_printf(sc->sc_dev, "bus addrext mask %#jx incompatible "
 		    "with device addrext mask %#jx, disabling extended address "
 		    "support\n", (uintmax_t)dma_translation.addrext_mask,
 		    (uintmax_t)addrext_req);
 
 		addrext_req = 0x0;
 		addrext_shift = 0;
 	}
 
 	/* Apply our addrext translation constraint */
 	dma_translation.addrext_mask = addrext_req;
 
 	/* Initialize our DMA engine configuration */
 	mac->mac_flags |= BWN_MAC_FLAG_DMA;
 
 	dma->addrext_shift = addrext_shift;
 	dma->translation = dma_translation;
 
 	dt = &dma->translation;
 
 	/* Dermine our translation's maximum supported address */
 	lowaddr = MIN((dt->addr_mask | dt->addrext_mask), BUS_SPACE_MAXADDR);
 
 	/*
 	 * Create top level DMA tag
 	 */
 	error = bus_dma_tag_create(dmat,		/* parent */
 			       BWN_ALIGN, 0,		/* alignment, bounds */
 			       lowaddr,			/* lowaddr */
 			       BUS_SPACE_MAXADDR,	/* highaddr */
 			       NULL, NULL,		/* filter, filterarg */
 			       BUS_SPACE_MAXSIZE,	/* maxsize */
 			       BUS_SPACE_UNRESTRICTED,	/* nsegments */
 			       BUS_SPACE_MAXSIZE,	/* maxsegsize */
 			       0,			/* flags */
 			       NULL, NULL,		/* lockfunc, lockarg */
 			       &dma->parent_dtag);
 	if (error) {
 		device_printf(sc->sc_dev, "can't create parent DMA tag\n");
 		return (error);
 	}
 
 	/*
 	 * Create TX/RX mbuf DMA tag
 	 */
 	error = bus_dma_tag_create(dma->parent_dtag,
 				1,
 				0,
 				BUS_SPACE_MAXADDR,
 				BUS_SPACE_MAXADDR,
 				NULL, NULL,
 				MCLBYTES,
 				1,
 				BUS_SPACE_MAXSIZE_32BIT,
 				0,
 				NULL, NULL,
 				&dma->rxbuf_dtag);
 	if (error) {
 		device_printf(sc->sc_dev, "can't create mbuf DMA tag\n");
 		goto fail0;
 	}
 	error = bus_dma_tag_create(dma->parent_dtag,
 				1,
 				0,
 				BUS_SPACE_MAXADDR,
 				BUS_SPACE_MAXADDR,
 				NULL, NULL,
 				MCLBYTES,
 				1,
 				BUS_SPACE_MAXSIZE_32BIT,
 				0,
 				NULL, NULL,
 				&dma->txbuf_dtag);
 	if (error) {
 		device_printf(sc->sc_dev, "can't create mbuf DMA tag\n");
 		goto fail1;
 	}
 
 	dma->wme[WME_AC_BK] = bwn_dma_ringsetup(mac, 0, 1);
 	if (!dma->wme[WME_AC_BK])
 		goto fail2;
 
 	dma->wme[WME_AC_BE] = bwn_dma_ringsetup(mac, 1, 1);
 	if (!dma->wme[WME_AC_BE])
 		goto fail3;
 
 	dma->wme[WME_AC_VI] = bwn_dma_ringsetup(mac, 2, 1);
 	if (!dma->wme[WME_AC_VI])
 		goto fail4;
 
 	dma->wme[WME_AC_VO] = bwn_dma_ringsetup(mac, 3, 1);
 	if (!dma->wme[WME_AC_VO])
 		goto fail5;
 
 	dma->mcast = bwn_dma_ringsetup(mac, 4, 1);
 	if (!dma->mcast)
 		goto fail6;
 	dma->rx = bwn_dma_ringsetup(mac, 0, 0);
 	if (!dma->rx)
 		goto fail7;
 
 	return (error);
 
 fail7:	bwn_dma_ringfree(&dma->mcast);
 fail6:	bwn_dma_ringfree(&dma->wme[WME_AC_VO]);
 fail5:	bwn_dma_ringfree(&dma->wme[WME_AC_VI]);
 fail4:	bwn_dma_ringfree(&dma->wme[WME_AC_BE]);
 fail3:	bwn_dma_ringfree(&dma->wme[WME_AC_BK]);
 fail2:	bus_dma_tag_destroy(dma->txbuf_dtag);
 fail1:	bus_dma_tag_destroy(dma->rxbuf_dtag);
 fail0:	bus_dma_tag_destroy(dma->parent_dtag);
 	return (error);
 }
 
 static struct bwn_dma_ring *
 bwn_dma_parse_cookie(struct bwn_mac *mac, const struct bwn_txstatus *status,
     uint16_t cookie, int *slot)
 {
 	struct bwn_dma *dma = &mac->mac_method.dma;
 	struct bwn_dma_ring *dr;
 	struct bwn_softc *sc = mac->mac_sc;
 
 	BWN_ASSERT_LOCKED(mac->mac_sc);
 
 	switch (cookie & 0xf000) {
 	case 0x1000:
 		dr = dma->wme[WME_AC_BK];
 		break;
 	case 0x2000:
 		dr = dma->wme[WME_AC_BE];
 		break;
 	case 0x3000:
 		dr = dma->wme[WME_AC_VI];
 		break;
 	case 0x4000:
 		dr = dma->wme[WME_AC_VO];
 		break;
 	case 0x5000:
 		dr = dma->mcast;
 		break;
 	default:
 		dr = NULL;
 		KASSERT(0 == 1,
 		    ("invalid cookie value %d", cookie & 0xf000));
 	}
 	*slot = (cookie & 0x0fff);
 	if (*slot < 0 || *slot >= dr->dr_numslots) {
 		/*
 		 * XXX FIXME: sometimes H/W returns TX DONE events duplicately
 		 * that it occurs events which have same H/W sequence numbers.
 		 * When it's occurred just prints a WARNING msgs and ignores.
 		 */
 		KASSERT(status->seq == dma->lastseq,
 		    ("%s:%d: fail", __func__, __LINE__));
 		device_printf(sc->sc_dev,
 		    "out of slot ranges (0 < %d < %d)\n", *slot,
 		    dr->dr_numslots);
 		return (NULL);
 	}
 	dma->lastseq = status->seq;
 	return (dr);
 }
 
 static void
 bwn_dma_stop(struct bwn_mac *mac)
 {
 	struct bwn_dma *dma;
 
 	if ((mac->mac_flags & BWN_MAC_FLAG_DMA) == 0)
 		return;
 	dma = &mac->mac_method.dma;
 
 	bwn_dma_ringstop(&dma->rx);
 	bwn_dma_ringstop(&dma->wme[WME_AC_BK]);
 	bwn_dma_ringstop(&dma->wme[WME_AC_BE]);
 	bwn_dma_ringstop(&dma->wme[WME_AC_VI]);
 	bwn_dma_ringstop(&dma->wme[WME_AC_VO]);
 	bwn_dma_ringstop(&dma->mcast);
 }
 
 static void
 bwn_dma_ringstop(struct bwn_dma_ring **dr)
 {
 
 	if (dr == NULL)
 		return;
 
 	bwn_dma_cleanup(*dr);
 }
 
 static void
 bwn_pio_stop(struct bwn_mac *mac)
 {
 	struct bwn_pio *pio;
 
 	if (mac->mac_flags & BWN_MAC_FLAG_DMA)
 		return;
 	pio = &mac->mac_method.pio;
 
 	bwn_destroy_queue_tx(&pio->mcast);
 	bwn_destroy_queue_tx(&pio->wme[WME_AC_VO]);
 	bwn_destroy_queue_tx(&pio->wme[WME_AC_VI]);
 	bwn_destroy_queue_tx(&pio->wme[WME_AC_BE]);
 	bwn_destroy_queue_tx(&pio->wme[WME_AC_BK]);
 }
 
 static int
 bwn_led_attach(struct bwn_mac *mac)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	const uint8_t *led_act = NULL;
 	int error;
 	int i;
 
 	sc->sc_led_idle = (2350 * hz) / 1000;
 	sc->sc_led_blink = 1;
 
 	for (i = 0; i < N(bwn_vendor_led_act); ++i) {
 		if (sc->sc_board_info.board_vendor ==
 		    bwn_vendor_led_act[i].vid) {
 			led_act = bwn_vendor_led_act[i].led_act;
 			break;
 		}
 	}
 	if (led_act == NULL)
 		led_act = bwn_default_led_act;
 
 	_Static_assert(nitems(bwn_led_vars) == BWN_LED_MAX,
 	    "invalid NVRAM variable name array");
 
 	for (i = 0; i < BWN_LED_MAX; ++i) {
 		struct bwn_led	*led;
 		uint8_t		 val;
 
 		led = &sc->sc_leds[i];
 
 		KASSERT(i < nitems(bwn_led_vars), ("unknown LED index"));
 		error = bhnd_nvram_getvar_uint8(sc->sc_dev, bwn_led_vars[i],
 		    &val);
 		if (error) {
 			if (error != ENOENT) {
 				device_printf(sc->sc_dev, "NVRAM variable %s "
 				    "unreadable: %d", bwn_led_vars[i], error);
 				return (error);
 			}
 
 			/* Not found; use default */
 			led->led_act = led_act[i];
 		} else {
 			if (val & BWN_LED_ACT_LOW)
 				led->led_flags |= BWN_LED_F_ACTLOW;
 			led->led_act = val & BWN_LED_ACT_MASK;
 		}
 		led->led_mask = (1 << i);
 
 		if (led->led_act == BWN_LED_ACT_BLINK_SLOW ||
 		    led->led_act == BWN_LED_ACT_BLINK_POLL ||
 		    led->led_act == BWN_LED_ACT_BLINK) {
 			led->led_flags |= BWN_LED_F_BLINK;
 			if (led->led_act == BWN_LED_ACT_BLINK_POLL)
 				led->led_flags |= BWN_LED_F_POLLABLE;
 			else if (led->led_act == BWN_LED_ACT_BLINK_SLOW)
 				led->led_flags |= BWN_LED_F_SLOW;
 
 			if (sc->sc_blink_led == NULL) {
 				sc->sc_blink_led = led;
 				if (led->led_flags & BWN_LED_F_SLOW)
 					BWN_LED_SLOWDOWN(sc->sc_led_idle);
 			}
 		}
 
 		DPRINTF(sc, BWN_DEBUG_LED,
 		    "%dth led, act %d, lowact %d\n", i,
 		    led->led_act, led->led_flags & BWN_LED_F_ACTLOW);
 	}
 	callout_init_mtx(&sc->sc_led_blink_ch, &sc->sc_mtx, 0);
 
 	return (0);
 }
 
 static __inline uint16_t
 bwn_led_onoff(const struct bwn_led *led, uint16_t val, int on)
 {
 
 	if (led->led_flags & BWN_LED_F_ACTLOW)
 		on = !on;
 	if (on)
 		val |= led->led_mask;
 	else
 		val &= ~led->led_mask;
 	return val;
 }
 
 static void
 bwn_led_newstate(struct bwn_mac *mac, enum ieee80211_state nstate)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	uint16_t val;
 	int i;
 
 	if (nstate == IEEE80211_S_INIT) {
 		callout_stop(&sc->sc_led_blink_ch);
 		sc->sc_led_blinking = 0;
 	}
 
 	if ((sc->sc_flags & BWN_FLAG_RUNNING) == 0)
 		return;
 
 	val = BWN_READ_2(mac, BWN_GPIO_CONTROL);
 	for (i = 0; i < BWN_LED_MAX; ++i) {
 		struct bwn_led *led = &sc->sc_leds[i];
 		int on;
 
 		if (led->led_act == BWN_LED_ACT_UNKN ||
 		    led->led_act == BWN_LED_ACT_NULL)
 			continue;
 
 		if ((led->led_flags & BWN_LED_F_BLINK) &&
 		    nstate != IEEE80211_S_INIT)
 			continue;
 
 		switch (led->led_act) {
 		case BWN_LED_ACT_ON:    /* Always on */
 			on = 1;
 			break;
 		case BWN_LED_ACT_OFF:   /* Always off */
 		case BWN_LED_ACT_5GHZ:  /* TODO: 11A */
 			on = 0;
 			break;
 		default:
 			on = 1;
 			switch (nstate) {
 			case IEEE80211_S_INIT:
 				on = 0;
 				break;
 			case IEEE80211_S_RUN:
 				if (led->led_act == BWN_LED_ACT_11G &&
 				    ic->ic_curmode != IEEE80211_MODE_11G)
 					on = 0;
 				break;
 			default:
 				if (led->led_act == BWN_LED_ACT_ASSOC)
 					on = 0;
 				break;
 			}
 			break;
 		}
 
 		val = bwn_led_onoff(led, val, on);
 	}
 	BWN_WRITE_2(mac, BWN_GPIO_CONTROL, val);
 }
 
 static void
 bwn_led_event(struct bwn_mac *mac, int event)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	struct bwn_led *led = sc->sc_blink_led;
 	int rate;
 
 	if (event == BWN_LED_EVENT_POLL) {
 		if ((led->led_flags & BWN_LED_F_POLLABLE) == 0)
 			return;
 		if (ticks - sc->sc_led_ticks < sc->sc_led_idle)
 			return;
 	}
 
 	sc->sc_led_ticks = ticks;
 	if (sc->sc_led_blinking)
 		return;
 
 	switch (event) {
 	case BWN_LED_EVENT_RX:
 		rate = sc->sc_rx_rate;
 		break;
 	case BWN_LED_EVENT_TX:
 		rate = sc->sc_tx_rate;
 		break;
 	case BWN_LED_EVENT_POLL:
 		rate = 0;
 		break;
 	default:
 		panic("unknown LED event %d\n", event);
 		break;
 	}
 	bwn_led_blink_start(mac, bwn_led_duration[rate].on_dur,
 	    bwn_led_duration[rate].off_dur);
 }
 
 static void
 bwn_led_blink_start(struct bwn_mac *mac, int on_dur, int off_dur)
 {
 	struct bwn_softc *sc = mac->mac_sc;
 	struct bwn_led *led = sc->sc_blink_led;
 	uint16_t val;
 
 	val = BWN_READ_2(mac, BWN_GPIO_CONTROL);
 	val = bwn_led_onoff(led, val, 1);
 	BWN_WRITE_2(mac, BWN_GPIO_CONTROL, val);
 
 	if (led->led_flags & BWN_LED_F_SLOW) {
 		BWN_LED_SLOWDOWN(on_dur);
 		BWN_LED_SLOWDOWN(off_dur);
 	}
 
 	sc->sc_led_blinking = 1;
 	sc->sc_led_blink_offdur = off_dur;
 
 	callout_reset(&sc->sc_led_blink_ch, on_dur, bwn_led_blink_next, mac);
 }
 
 static void
 bwn_led_blink_next(void *arg)
 {
 	struct bwn_mac *mac = arg;
 	struct bwn_softc *sc = mac->mac_sc;
 	uint16_t val;
 
 	val = BWN_READ_2(mac, BWN_GPIO_CONTROL);
 	val = bwn_led_onoff(sc->sc_blink_led, val, 0);
 	BWN_WRITE_2(mac, BWN_GPIO_CONTROL, val);
 
 	callout_reset(&sc->sc_led_blink_ch, sc->sc_led_blink_offdur,
 	    bwn_led_blink_end, mac);
 }
 
 static void
 bwn_led_blink_end(void *arg)
 {
 	struct bwn_mac *mac = arg;
 	struct bwn_softc *sc = mac->mac_sc;
 
 	sc->sc_led_blinking = 0;
 }
 
 static int
 bwn_suspend(device_t dev)
 {
 	struct bwn_softc *sc = device_get_softc(dev);
 
 	BWN_LOCK(sc);
 	bwn_stop(sc);
 	BWN_UNLOCK(sc);
 	return (0);
 }
 
 static int
 bwn_resume(device_t dev)
 {
 	struct bwn_softc *sc = device_get_softc(dev);
 	int error = EDOOFUS;
 
 	BWN_LOCK(sc);
 	if (sc->sc_ic.ic_nrunning > 0)
 		error = bwn_init(sc);
 	BWN_UNLOCK(sc);
 	if (error == 0)
 		ieee80211_start_all(&sc->sc_ic);
 	return (0);
 }
 
 static void
 bwn_rfswitch(void *arg)
 {
 	struct bwn_softc *sc = arg;
 	struct bwn_mac *mac = sc->sc_curmac;
 	int cur = 0, prev = 0;
 
 	KASSERT(mac->mac_status >= BWN_MAC_STATUS_STARTED,
 	    ("%s: invalid MAC status %d", __func__, mac->mac_status));
 
 	if (mac->mac_phy.rev >= 3 || mac->mac_phy.type == BWN_PHYTYPE_LP
 	    || mac->mac_phy.type == BWN_PHYTYPE_N) {
 		if (!(BWN_READ_4(mac, BWN_RF_HWENABLED_HI)
 			& BWN_RF_HWENABLED_HI_MASK))
 			cur = 1;
 	} else {
 		if (BWN_READ_2(mac, BWN_RF_HWENABLED_LO)
 		    & BWN_RF_HWENABLED_LO_MASK)
 			cur = 1;
 	}
 
 	if (mac->mac_flags & BWN_MAC_FLAG_RADIO_ON)
 		prev = 1;
 
 	DPRINTF(sc, BWN_DEBUG_RESET, "%s: called; cur=%d, prev=%d\n",
 	    __func__, cur, prev);
 
 	if (cur != prev) {
 		if (cur)
 			mac->mac_flags |= BWN_MAC_FLAG_RADIO_ON;
 		else
 			mac->mac_flags &= ~BWN_MAC_FLAG_RADIO_ON;
 
 		device_printf(sc->sc_dev,
 		    "status of RF switch is changed to %s\n",
 		    cur ? "ON" : "OFF");
 		if (cur != mac->mac_phy.rf_on) {
 			if (cur)
 				bwn_rf_turnon(mac);
 			else
 				bwn_rf_turnoff(mac);
 		}
 	}
 
 	callout_schedule(&sc->sc_rfswitch_ch, hz);
 }
 
 static void
 bwn_sysctl_node(struct bwn_softc *sc)
 {
 	device_t dev = sc->sc_dev;
 	struct bwn_mac *mac;
 	struct bwn_stats *stats;
 
 	/* XXX assume that count of MAC is only 1. */
 
 	if ((mac = sc->sc_curmac) == NULL)
 		return;
 	stats = &mac->mac_stats;
 
 	SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
 	    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
 	    "linknoise", CTLFLAG_RW, &stats->rts, 0, "Noise level");
 	SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
 	    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
 	    "rts", CTLFLAG_RW, &stats->rts, 0, "RTS");
 	SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
 	    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
 	    "rtsfail", CTLFLAG_RW, &stats->rtsfail, 0, "RTS failed to send");
 
 #ifdef BWN_DEBUG
 	SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev),
 	    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO,
 	    "debug", CTLFLAG_RW, &sc->sc_debug, 0, "Debug flags");
 #endif
 }
 
 static device_method_t bwn_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		bwn_probe),
 	DEVMETHOD(device_attach,	bwn_attach),
 	DEVMETHOD(device_detach,	bwn_detach),
 	DEVMETHOD(device_suspend,	bwn_suspend),
 	DEVMETHOD(device_resume,	bwn_resume),
 	DEVMETHOD_END
 };
 
 static driver_t bwn_driver = {
 	"bwn",
 	bwn_methods,
 	sizeof(struct bwn_softc)
 };
 
 DRIVER_MODULE(bwn, bhnd, bwn_driver, 0, 0);
 MODULE_DEPEND(bwn, bhnd, 1, 1, 1);
 MODULE_DEPEND(bwn, gpiobus, 1, 1, 1);
 MODULE_DEPEND(bwn, wlan, 1, 1, 1);		/* 802.11 media layer */
 MODULE_DEPEND(bwn, firmware, 1, 1, 1);		/* firmware support */
 MODULE_DEPEND(bwn, wlan_amrr, 1, 1, 1);
 MODULE_VERSION(bwn, 1);
diff --git a/sys/dev/cxgbe/tom/t4_ddp.c b/sys/dev/cxgbe/tom/t4_ddp.c
index a08ddea00d05..529fc2a5b825 100644
--- a/sys/dev/cxgbe/tom/t4_ddp.c
+++ b/sys/dev/cxgbe/tom/t4_ddp.c
@@ -1,3019 +1,3019 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2012 Chelsio Communications, Inc.
  * All rights reserved.
  * Written by: Navdeep Parhar <np@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 #include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/aio.h>
 #include <sys/bio.h>
 #include <sys/file.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/module.h>
 #include <sys/protosw.h>
 #include <sys/proc.h>
 #include <sys/domain.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/taskqueue.h>
 #include <sys/uio.h>
 #include <netinet/in.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip.h>
 #include <netinet/tcp_var.h>
 #define TCPSTATES
 #include <netinet/tcp_fsm.h>
 #include <netinet/toecore.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
 #include <vm/vm_object.h>
 
 #include <cam/scsi/scsi_all.h>
 #include <cam/ctl/ctl_io.h>
 
 #ifdef TCP_OFFLOAD
 #include "common/common.h"
 #include "common/t4_msg.h"
 #include "common/t4_regs.h"
 #include "common/t4_tcb.h"
 #include "tom/t4_tom.h"
 
 /*
  * Use the 'backend3' field in AIO jobs to store the amount of data
  * received by the AIO job so far.
  */
 #define	aio_received	backend3
 
 static void aio_ddp_requeue_task(void *context, int pending);
 static void ddp_complete_all(struct toepcb *toep, int error);
 static void t4_aio_cancel_active(struct kaiocb *job);
 static void t4_aio_cancel_queued(struct kaiocb *job);
 static int t4_alloc_page_pods_for_rcvbuf(struct ppod_region *pr,
     struct ddp_rcv_buffer *drb);
 static int t4_write_page_pods_for_rcvbuf(struct adapter *sc,
     struct sge_wrq *wrq, int tid, struct ddp_rcv_buffer *drb);
 
 static TAILQ_HEAD(, pageset) ddp_orphan_pagesets;
 static struct mtx ddp_orphan_pagesets_lock;
 static struct task ddp_orphan_task;
 
 #define MAX_DDP_BUFFER_SIZE		(M_TCB_RX_DDP_BUF0_LEN)
 
 /*
  * A page set holds information about a user buffer used for AIO DDP.
  * The page set holds resources such as the VM pages backing the
  * buffer (either held or wired) and the page pods associated with the
  * buffer.  Recently used page sets are cached to allow for efficient
  * reuse of buffers (avoiding the need to re-fault in pages, hold
  * them, etc.).  Note that cached page sets keep the backing pages
  * wired.  The number of wired pages is capped by only allowing for
  * two wired pagesets per connection.  This is not a perfect cap, but
  * is a trade-off for performance.
  *
  * If an application ping-pongs two buffers for a connection via
  * aio_read(2) then those buffers should remain wired and expensive VM
  * fault lookups should be avoided after each buffer has been used
  * once.  If an application uses more than two buffers then this will
  * fall back to doing expensive VM fault lookups for each operation.
  */
 static void
 free_pageset(struct tom_data *td, struct pageset *ps)
 {
 	vm_page_t p;
 	int i;
 
 	if (ps->prsv.prsv_nppods > 0)
 		t4_free_page_pods(&ps->prsv);
 
 	for (i = 0; i < ps->npages; i++) {
 		p = ps->pages[i];
 		vm_page_unwire(p, PQ_INACTIVE);
 	}
 	mtx_lock(&ddp_orphan_pagesets_lock);
 	TAILQ_INSERT_TAIL(&ddp_orphan_pagesets, ps, link);
 	taskqueue_enqueue(taskqueue_thread, &ddp_orphan_task);
 	mtx_unlock(&ddp_orphan_pagesets_lock);
 }
 
 static void
 ddp_free_orphan_pagesets(void *context, int pending)
 {
 	struct pageset *ps;
 
 	mtx_lock(&ddp_orphan_pagesets_lock);
 	while (!TAILQ_EMPTY(&ddp_orphan_pagesets)) {
 		ps = TAILQ_FIRST(&ddp_orphan_pagesets);
 		TAILQ_REMOVE(&ddp_orphan_pagesets, ps, link);
 		mtx_unlock(&ddp_orphan_pagesets_lock);
 		if (ps->vm)
 			vmspace_free(ps->vm);
 		free(ps, M_CXGBE);
 		mtx_lock(&ddp_orphan_pagesets_lock);
 	}
 	mtx_unlock(&ddp_orphan_pagesets_lock);
 }
 
 static void
 recycle_pageset(struct toepcb *toep, struct pageset *ps)
 {
 
 	DDP_ASSERT_LOCKED(toep);
 	if (!(toep->ddp.flags & DDP_DEAD)) {
 		KASSERT(toep->ddp.cached_count + toep->ddp.active_count <
 		    nitems(toep->ddp.db), ("too many wired pagesets"));
 		TAILQ_INSERT_HEAD(&toep->ddp.cached_pagesets, ps, link);
 		toep->ddp.cached_count++;
 	} else
 		free_pageset(toep->td, ps);
 }
 
 static void
 ddp_complete_one(struct kaiocb *job, int error)
 {
 	long copied;
 
 	/*
 	 * If this job had copied data out of the socket buffer before
 	 * it was cancelled, report it as a short read rather than an
 	 * error.
 	 */
 	copied = job->aio_received;
 	if (copied != 0 || error == 0)
 		aio_complete(job, copied, 0);
 	else
 		aio_complete(job, -1, error);
 }
 
 static void
 free_ddp_rcv_buffer(struct toepcb *toep, struct ddp_rcv_buffer *drb)
 {
 	t4_free_page_pods(&drb->prsv);
-	contigfree(drb->buf, drb->len, M_CXGBE);
+	free(drb->buf, M_CXGBE);
 	free(drb, M_CXGBE);
 	counter_u64_add(toep->ofld_rxq->ddp_buffer_free, 1);
 	free_toepcb(toep);
 }
 
 static void
 recycle_ddp_rcv_buffer(struct toepcb *toep, struct ddp_rcv_buffer *drb)
 {
 	DDP_CACHE_LOCK(toep);
 	if (!(toep->ddp.flags & DDP_DEAD) &&
 	    toep->ddp.cached_count < t4_ddp_rcvbuf_cache) {
 		TAILQ_INSERT_HEAD(&toep->ddp.cached_buffers, drb, link);
 		toep->ddp.cached_count++;
 		DDP_CACHE_UNLOCK(toep);
 	} else {
 		DDP_CACHE_UNLOCK(toep);
 		free_ddp_rcv_buffer(toep, drb);
 	}
 }
 
 static struct ddp_rcv_buffer *
 alloc_cached_ddp_rcv_buffer(struct toepcb *toep)
 {
 	struct ddp_rcv_buffer *drb;
 
 	DDP_CACHE_LOCK(toep);
 	if (!TAILQ_EMPTY(&toep->ddp.cached_buffers)) {
 		drb = TAILQ_FIRST(&toep->ddp.cached_buffers);
 		TAILQ_REMOVE(&toep->ddp.cached_buffers, drb, link);
 		toep->ddp.cached_count--;
 		counter_u64_add(toep->ofld_rxq->ddp_buffer_reuse, 1);
 	} else
 		drb = NULL;
 	DDP_CACHE_UNLOCK(toep);
 	return (drb);
 }
 
 static struct ddp_rcv_buffer *
 alloc_ddp_rcv_buffer(struct toepcb *toep, int how)
 {
 	struct tom_data *td = toep->td;
 	struct adapter *sc = td_adapter(td);
 	struct ddp_rcv_buffer *drb;
 	int error;
 
 	drb = malloc(sizeof(*drb), M_CXGBE, how | M_ZERO);
 	if (drb == NULL)
 		return (NULL);
 
 	drb->buf = contigmalloc(t4_ddp_rcvbuf_len, M_CXGBE, how, 0, ~0,
 	    t4_ddp_rcvbuf_len, 0);
 	if (drb->buf == NULL) {
 		free(drb, M_CXGBE);
 		return (NULL);
 	}
 	drb->len = t4_ddp_rcvbuf_len;
 	drb->refs = 1;
 
 	error = t4_alloc_page_pods_for_rcvbuf(&td->pr, drb);
 	if (error != 0) {
-		contigfree(drb->buf, drb->len, M_CXGBE);
+		free(drb->buf, M_CXGBE);
 		free(drb, M_CXGBE);
 		return (NULL);
 	}
 
 	error = t4_write_page_pods_for_rcvbuf(sc, toep->ctrlq, toep->tid, drb);
 	if (error != 0) {
 		t4_free_page_pods(&drb->prsv);
-		contigfree(drb->buf, drb->len, M_CXGBE);
+		free(drb->buf, M_CXGBE);
 		free(drb, M_CXGBE);
 		return (NULL);
 	}
 
 	hold_toepcb(toep);
 	counter_u64_add(toep->ofld_rxq->ddp_buffer_alloc, 1);
 	return (drb);
 }
 
 static void
 free_ddp_buffer(struct toepcb *toep, struct ddp_buffer *db)
 {
 	if ((toep->ddp.flags & DDP_RCVBUF) != 0) {
 		if (db->drb != NULL)
 			free_ddp_rcv_buffer(toep, db->drb);
 #ifdef INVARIANTS
 		db->drb = NULL;
 #endif
 		return;
 	}
 
 	if (db->job) {
 		/*
 		 * XXX: If we are un-offloading the socket then we
 		 * should requeue these on the socket somehow.  If we
 		 * got a FIN from the remote end, then this completes
 		 * any remaining requests with an EOF read.
 		 */
 		if (!aio_clear_cancel_function(db->job))
 			ddp_complete_one(db->job, 0);
 #ifdef INVARIANTS
 		db->job = NULL;
 #endif
 	}
 
 	if (db->ps) {
 		free_pageset(toep->td, db->ps);
 #ifdef INVARIANTS
 		db->ps = NULL;
 #endif
 	}
 }
 
 static void
 ddp_init_toep(struct toepcb *toep)
 {
 
 	toep->ddp.flags = DDP_OK;
 	toep->ddp.active_id = -1;
 	mtx_init(&toep->ddp.lock, "t4 ddp", NULL, MTX_DEF);
 	mtx_init(&toep->ddp.cache_lock, "t4 ddp cache", NULL, MTX_DEF);
 }
 
 void
 ddp_uninit_toep(struct toepcb *toep)
 {
 
 	mtx_destroy(&toep->ddp.lock);
 	mtx_destroy(&toep->ddp.cache_lock);
 }
 
 void
 release_ddp_resources(struct toepcb *toep)
 {
 	struct ddp_rcv_buffer *drb;
 	struct pageset *ps;
 	int i;
 
 	DDP_LOCK(toep);
 	DDP_CACHE_LOCK(toep);
 	toep->ddp.flags |= DDP_DEAD;
 	DDP_CACHE_UNLOCK(toep);
 	for (i = 0; i < nitems(toep->ddp.db); i++) {
 		free_ddp_buffer(toep, &toep->ddp.db[i]);
 	}
 	if ((toep->ddp.flags & DDP_AIO) != 0) {
 		while ((ps = TAILQ_FIRST(&toep->ddp.cached_pagesets)) != NULL) {
 			TAILQ_REMOVE(&toep->ddp.cached_pagesets, ps, link);
 			free_pageset(toep->td, ps);
 		}
 		ddp_complete_all(toep, 0);
 	}
 	if ((toep->ddp.flags & DDP_RCVBUF) != 0) {
 		DDP_CACHE_LOCK(toep);
 		while ((drb = TAILQ_FIRST(&toep->ddp.cached_buffers)) != NULL) {
 			TAILQ_REMOVE(&toep->ddp.cached_buffers, drb, link);
 			free_ddp_rcv_buffer(toep, drb);
 		}
 		DDP_CACHE_UNLOCK(toep);
 	}
 	DDP_UNLOCK(toep);
 }
 
 #ifdef INVARIANTS
 void
 ddp_assert_empty(struct toepcb *toep)
 {
 	int i;
 
 	MPASS((toep->ddp.flags & (DDP_TASK_ACTIVE | DDP_DEAD)) != DDP_TASK_ACTIVE);
 	for (i = 0; i < nitems(toep->ddp.db); i++) {
 		if ((toep->ddp.flags & DDP_AIO) != 0) {
 			MPASS(toep->ddp.db[i].job == NULL);
 			MPASS(toep->ddp.db[i].ps == NULL);
 		} else
 			MPASS(toep->ddp.db[i].drb == NULL);
 	}
 	if ((toep->ddp.flags & DDP_AIO) != 0) {
 		MPASS(TAILQ_EMPTY(&toep->ddp.cached_pagesets));
 		MPASS(TAILQ_EMPTY(&toep->ddp.aiojobq));
 	}
 	if ((toep->ddp.flags & DDP_RCVBUF) != 0)
 		MPASS(TAILQ_EMPTY(&toep->ddp.cached_buffers));
 }
 #endif
 
 static void
 complete_ddp_buffer(struct toepcb *toep, struct ddp_buffer *db,
     unsigned int db_idx)
 {
 	struct ddp_rcv_buffer *drb;
 	unsigned int db_flag;
 
 	toep->ddp.active_count--;
 	if (toep->ddp.active_id == db_idx) {
 		if (toep->ddp.active_count == 0) {
 			if ((toep->ddp.flags & DDP_AIO) != 0)
 				KASSERT(toep->ddp.db[db_idx ^ 1].job == NULL,
 				    ("%s: active_count mismatch", __func__));
 			else
 				KASSERT(toep->ddp.db[db_idx ^ 1].drb == NULL,
 				    ("%s: active_count mismatch", __func__));
 			toep->ddp.active_id = -1;
 		} else
 			toep->ddp.active_id ^= 1;
 #ifdef VERBOSE_TRACES
 		CTR3(KTR_CXGBE, "%s: tid %u, ddp_active_id = %d", __func__,
 		    toep->tid, toep->ddp.active_id);
 #endif
 	} else {
 		KASSERT(toep->ddp.active_count != 0 &&
 		    toep->ddp.active_id != -1,
 		    ("%s: active count mismatch", __func__));
 	}
 
 	if ((toep->ddp.flags & DDP_AIO) != 0) {
 		db->cancel_pending = 0;
 		db->job = NULL;
 		recycle_pageset(toep, db->ps);
 		db->ps = NULL;
 	} else {
 		drb = db->drb;
 		if (atomic_fetchadd_int(&drb->refs, -1) == 1)
 			recycle_ddp_rcv_buffer(toep, drb);
 		db->drb = NULL;
 		db->placed = 0;
 	}
 
 	db_flag = db_idx == 1 ? DDP_BUF1_ACTIVE : DDP_BUF0_ACTIVE;
 	KASSERT(toep->ddp.flags & db_flag,
 	    ("%s: DDP buffer not active. toep %p, ddp_flags 0x%x",
 	    __func__, toep, toep->ddp.flags));
 	toep->ddp.flags &= ~db_flag;
 }
 
 /* Called when m_free drops the last reference. */
 static void
 ddp_rcv_mbuf_done(struct mbuf *m)
 {
 	struct toepcb *toep = m->m_ext.ext_arg1;
 	struct ddp_rcv_buffer *drb = m->m_ext.ext_arg2;
 
 	recycle_ddp_rcv_buffer(toep, drb);
 }
 
 static void
 queue_ddp_rcvbuf_mbuf(struct toepcb *toep, u_int db_idx, u_int len)
 {
 	struct inpcb *inp = toep->inp;
 	struct sockbuf *sb;
 	struct ddp_buffer *db;
 	struct ddp_rcv_buffer *drb;
 	struct mbuf *m;
 
 	m = m_gethdr(M_NOWAIT, MT_DATA);
 	if (m == NULL) {
 		printf("%s: failed to allocate mbuf", __func__);
 		return;
 	}
 	m->m_pkthdr.rcvif = toep->vi->ifp;
 
 	db = &toep->ddp.db[db_idx];
 	drb = db->drb;
 	m_extaddref(m, (char *)drb->buf + db->placed, len, &drb->refs,
 	    ddp_rcv_mbuf_done, toep, drb);
 	m->m_pkthdr.len = len;
 	m->m_len = len;
 
 	sb = &inp->inp_socket->so_rcv;
 	SOCKBUF_LOCK_ASSERT(sb);
 	sbappendstream_locked(sb, m, 0);
 
 	db->placed += len;
 	toep->ofld_rxq->rx_toe_ddp_octets += len;
 }
 
 /* XXX: handle_ddp_data code duplication */
 void
 insert_ddp_data(struct toepcb *toep, uint32_t n)
 {
 	struct inpcb *inp = toep->inp;
 	struct tcpcb *tp = intotcpcb(inp);
 	struct ddp_buffer *db;
 	struct kaiocb *job;
 	size_t placed;
 	long copied;
 	unsigned int db_idx;
 #ifdef INVARIANTS
 	unsigned int db_flag;
 #endif
 	bool ddp_rcvbuf;
 
 	INP_WLOCK_ASSERT(inp);
 	DDP_ASSERT_LOCKED(toep);
 
 	ddp_rcvbuf = (toep->ddp.flags & DDP_RCVBUF) != 0;
 	tp->rcv_nxt += n;
 #ifndef USE_DDP_RX_FLOW_CONTROL
 	KASSERT(tp->rcv_wnd >= n, ("%s: negative window size", __func__));
 	tp->rcv_wnd -= n;
 #endif
 	CTR2(KTR_CXGBE, "%s: placed %u bytes before falling out of DDP",
 	    __func__, n);
 	while (toep->ddp.active_count > 0) {
 		MPASS(toep->ddp.active_id != -1);
 		db_idx = toep->ddp.active_id;
 #ifdef INVARIANTS
 		db_flag = db_idx == 1 ? DDP_BUF1_ACTIVE : DDP_BUF0_ACTIVE;
 #endif
 		MPASS((toep->ddp.flags & db_flag) != 0);
 		db = &toep->ddp.db[db_idx];
 		if (ddp_rcvbuf) {
 			placed = n;
 			if (placed > db->drb->len - db->placed)
 				placed = db->drb->len - db->placed;
 			if (placed != 0)
 				queue_ddp_rcvbuf_mbuf(toep, db_idx, placed);
 			complete_ddp_buffer(toep, db, db_idx);
 			n -= placed;
 			continue;
 		}
 		job = db->job;
 		copied = job->aio_received;
 		placed = n;
 		if (placed > job->uaiocb.aio_nbytes - copied)
 			placed = job->uaiocb.aio_nbytes - copied;
 		if (placed > 0) {
 			job->msgrcv = 1;
 			toep->ofld_rxq->rx_aio_ddp_jobs++;
 		}
 		toep->ofld_rxq->rx_aio_ddp_octets += placed;
 		if (!aio_clear_cancel_function(job)) {
 			/*
 			 * Update the copied length for when
 			 * t4_aio_cancel_active() completes this
 			 * request.
 			 */
 			job->aio_received += placed;
 		} else if (copied + placed != 0) {
 			CTR4(KTR_CXGBE,
 			    "%s: completing %p (copied %ld, placed %lu)",
 			    __func__, job, copied, placed);
 			/* XXX: This always completes if there is some data. */
 			aio_complete(job, copied + placed, 0);
 		} else if (aio_set_cancel_function(job, t4_aio_cancel_queued)) {
 			TAILQ_INSERT_HEAD(&toep->ddp.aiojobq, job, list);
 			toep->ddp.waiting_count++;
 		} else
 			aio_cancel(job);
 		n -= placed;
 		complete_ddp_buffer(toep, db, db_idx);
 	}
 
 	MPASS(n == 0);
 }
 
 /* SET_TCB_FIELD sent as a ULP command looks like this */
 #define LEN__SET_TCB_FIELD_ULP (sizeof(struct ulp_txpkt) + \
     sizeof(struct ulptx_idata) + sizeof(struct cpl_set_tcb_field_core))
 
 /* RX_DATA_ACK sent as a ULP command looks like this */
 #define LEN__RX_DATA_ACK_ULP (sizeof(struct ulp_txpkt) + \
     sizeof(struct ulptx_idata) + sizeof(struct cpl_rx_data_ack_core))
 
 static inline void *
 mk_rx_data_ack_ulp(struct ulp_txpkt *ulpmc, struct toepcb *toep)
 {
 	struct ulptx_idata *ulpsc;
 	struct cpl_rx_data_ack_core *req;
 
 	ulpmc->cmd_dest = htonl(V_ULPTX_CMD(ULP_TX_PKT) | V_ULP_TXPKT_DEST(0));
 	ulpmc->len = htobe32(howmany(LEN__RX_DATA_ACK_ULP, 16));
 
 	ulpsc = (struct ulptx_idata *)(ulpmc + 1);
 	ulpsc->cmd_more = htobe32(V_ULPTX_CMD(ULP_TX_SC_IMM));
 	ulpsc->len = htobe32(sizeof(*req));
 
 	req = (struct cpl_rx_data_ack_core *)(ulpsc + 1);
 	OPCODE_TID(req) = htobe32(MK_OPCODE_TID(CPL_RX_DATA_ACK, toep->tid));
 	req->credit_dack = htobe32(F_RX_MODULATE_RX);
 
 	ulpsc = (struct ulptx_idata *)(req + 1);
 	if (LEN__RX_DATA_ACK_ULP % 16) {
 		ulpsc->cmd_more = htobe32(V_ULPTX_CMD(ULP_TX_SC_NOOP));
 		ulpsc->len = htobe32(0);
 		return (ulpsc + 1);
 	}
 	return (ulpsc);
 }
 
 static struct wrqe *
 mk_update_tcb_for_ddp(struct adapter *sc, struct toepcb *toep, int db_idx,
     struct ppod_reservation *prsv, int offset, uint32_t len,
     uint64_t ddp_flags, uint64_t ddp_flags_mask)
 {
 	struct wrqe *wr;
 	struct work_request_hdr *wrh;
 	struct ulp_txpkt *ulpmc;
 	int wrlen;
 
 	KASSERT(db_idx == 0 || db_idx == 1,
 	    ("%s: bad DDP buffer index %d", __func__, db_idx));
 
 	/*
 	 * We'll send a compound work request that has 3 SET_TCB_FIELDs and an
 	 * RX_DATA_ACK (with RX_MODULATE to speed up delivery).
 	 *
 	 * The work request header is 16B and always ends at a 16B boundary.
 	 * The ULPTX master commands that follow must all end at 16B boundaries
 	 * too so we round up the size to 16.
 	 */
 	wrlen = sizeof(*wrh) + 3 * roundup2(LEN__SET_TCB_FIELD_ULP, 16) +
 	    roundup2(LEN__RX_DATA_ACK_ULP, 16);
 
 	wr = alloc_wrqe(wrlen, toep->ctrlq);
 	if (wr == NULL)
 		return (NULL);
 	wrh = wrtod(wr);
 	INIT_ULPTX_WRH(wrh, wrlen, 1, 0);	/* atomic */
 	ulpmc = (struct ulp_txpkt *)(wrh + 1);
 
 	/* Write the buffer's tag */
 	ulpmc = mk_set_tcb_field_ulp(sc, ulpmc, toep->tid,
 	    W_TCB_RX_DDP_BUF0_TAG + db_idx,
 	    V_TCB_RX_DDP_BUF0_TAG(M_TCB_RX_DDP_BUF0_TAG),
 	    V_TCB_RX_DDP_BUF0_TAG(prsv->prsv_tag));
 
 	/* Update the current offset in the DDP buffer and its total length */
 	if (db_idx == 0)
 		ulpmc = mk_set_tcb_field_ulp(sc, ulpmc, toep->tid,
 		    W_TCB_RX_DDP_BUF0_OFFSET,
 		    V_TCB_RX_DDP_BUF0_OFFSET(M_TCB_RX_DDP_BUF0_OFFSET) |
 		    V_TCB_RX_DDP_BUF0_LEN(M_TCB_RX_DDP_BUF0_LEN),
 		    V_TCB_RX_DDP_BUF0_OFFSET(offset) |
 		    V_TCB_RX_DDP_BUF0_LEN(len));
 	else
 		ulpmc = mk_set_tcb_field_ulp(sc, ulpmc, toep->tid,
 		    W_TCB_RX_DDP_BUF1_OFFSET,
 		    V_TCB_RX_DDP_BUF1_OFFSET(M_TCB_RX_DDP_BUF1_OFFSET) |
 		    V_TCB_RX_DDP_BUF1_LEN((u64)M_TCB_RX_DDP_BUF1_LEN << 32),
 		    V_TCB_RX_DDP_BUF1_OFFSET(offset) |
 		    V_TCB_RX_DDP_BUF1_LEN((u64)len << 32));
 
 	/* Update DDP flags */
 	ulpmc = mk_set_tcb_field_ulp(sc, ulpmc, toep->tid, W_TCB_RX_DDP_FLAGS,
 	    ddp_flags_mask, ddp_flags);
 
 	/* Gratuitous RX_DATA_ACK with RX_MODULATE set to speed up delivery. */
 	ulpmc = mk_rx_data_ack_ulp(ulpmc, toep);
 
 	return (wr);
 }
 
 static int
 handle_ddp_data_aio(struct toepcb *toep, __be32 ddp_report, __be32 rcv_nxt,
     int len)
 {
 	uint32_t report = be32toh(ddp_report);
 	unsigned int db_idx;
 	struct inpcb *inp = toep->inp;
 	struct ddp_buffer *db;
 	struct tcpcb *tp;
 	struct socket *so;
 	struct sockbuf *sb;
 	struct kaiocb *job;
 	long copied;
 
 	db_idx = report & F_DDP_BUF_IDX ? 1 : 0;
 
 	if (__predict_false(!(report & F_DDP_INV)))
 		CXGBE_UNIMPLEMENTED("DDP buffer still valid");
 
 	INP_WLOCK(inp);
 	so = inp_inpcbtosocket(inp);
 	sb = &so->so_rcv;
 	DDP_LOCK(toep);
 
 	KASSERT(toep->ddp.active_id == db_idx,
 	    ("completed DDP buffer (%d) != active_id (%d) for tid %d", db_idx,
 	    toep->ddp.active_id, toep->tid));
 	db = &toep->ddp.db[db_idx];
 	job = db->job;
 
 	if (__predict_false(inp->inp_flags & INP_DROPPED)) {
 		/*
 		 * This can happen due to an administrative tcpdrop(8).
 		 * Just fail the request with ECONNRESET.
 		 */
 		CTR5(KTR_CXGBE, "%s: tid %u, seq 0x%x, len %d, inp_flags 0x%x",
 		    __func__, toep->tid, be32toh(rcv_nxt), len, inp->inp_flags);
 		if (aio_clear_cancel_function(job))
 			ddp_complete_one(job, ECONNRESET);
 		goto completed;
 	}
 
 	tp = intotcpcb(inp);
 
 	/*
 	 * For RX_DDP_COMPLETE, len will be zero and rcv_nxt is the
 	 * sequence number of the next byte to receive.  The length of
 	 * the data received for this message must be computed by
 	 * comparing the new and old values of rcv_nxt.
 	 *
 	 * For RX_DATA_DDP, len might be non-zero, but it is only the
 	 * length of the most recent DMA.  It does not include the
 	 * total length of the data received since the previous update
 	 * for this DDP buffer.  rcv_nxt is the sequence number of the
 	 * first received byte from the most recent DMA.
 	 */
 	len += be32toh(rcv_nxt) - tp->rcv_nxt;
 	tp->rcv_nxt += len;
 	tp->t_rcvtime = ticks;
 #ifndef USE_DDP_RX_FLOW_CONTROL
 	KASSERT(tp->rcv_wnd >= len, ("%s: negative window size", __func__));
 	tp->rcv_wnd -= len;
 #endif
 #ifdef VERBOSE_TRACES
 	CTR5(KTR_CXGBE, "%s: tid %u, DDP[%d] placed %d bytes (%#x)", __func__,
 	    toep->tid, db_idx, len, report);
 #endif
 
 	/* receive buffer autosize */
 	MPASS(toep->vnet == so->so_vnet);
 	CURVNET_SET(toep->vnet);
 	SOCKBUF_LOCK(sb);
 	if (sb->sb_flags & SB_AUTOSIZE &&
 	    V_tcp_do_autorcvbuf &&
 	    sb->sb_hiwat < V_tcp_autorcvbuf_max &&
 	    len > (sbspace(sb) / 8 * 7)) {
 		struct adapter *sc = td_adapter(toep->td);
 		unsigned int hiwat = sb->sb_hiwat;
 		unsigned int newsize = min(hiwat + sc->tt.autorcvbuf_inc,
 		    V_tcp_autorcvbuf_max);
 
 		if (!sbreserve_locked(so, SO_RCV, newsize, NULL))
 			sb->sb_flags &= ~SB_AUTOSIZE;
 	}
 	SOCKBUF_UNLOCK(sb);
 	CURVNET_RESTORE();
 
 	job->msgrcv = 1;
 	toep->ofld_rxq->rx_aio_ddp_jobs++;
 	toep->ofld_rxq->rx_aio_ddp_octets += len;
 	if (db->cancel_pending) {
 		/*
 		 * Update the job's length but defer completion to the
 		 * TCB_RPL callback.
 		 */
 		job->aio_received += len;
 		goto out;
 	} else if (!aio_clear_cancel_function(job)) {
 		/*
 		 * Update the copied length for when
 		 * t4_aio_cancel_active() completes this request.
 		 */
 		job->aio_received += len;
 	} else {
 		copied = job->aio_received;
 #ifdef VERBOSE_TRACES
 		CTR5(KTR_CXGBE,
 		    "%s: tid %u, completing %p (copied %ld, placed %d)",
 		    __func__, toep->tid, job, copied, len);
 #endif
 		aio_complete(job, copied + len, 0);
 		t4_rcvd(&toep->td->tod, tp);
 	}
 
 completed:
 	complete_ddp_buffer(toep, db, db_idx);
 	if (toep->ddp.waiting_count > 0)
 		ddp_queue_toep(toep);
 out:
 	DDP_UNLOCK(toep);
 	INP_WUNLOCK(inp);
 
 	return (0);
 }
 
 static bool
 queue_ddp_rcvbuf(struct toepcb *toep, struct ddp_rcv_buffer *drb)
 {
 	struct adapter *sc = td_adapter(toep->td);
 	struct ddp_buffer *db;
 	struct wrqe *wr;
 	uint64_t ddp_flags, ddp_flags_mask;
 	int buf_flag, db_idx;
 
 	DDP_ASSERT_LOCKED(toep);
 
 	KASSERT((toep->ddp.flags & DDP_DEAD) == 0, ("%s: DDP_DEAD", __func__));
 	KASSERT(toep->ddp.active_count < nitems(toep->ddp.db),
 	    ("%s: no empty DDP buffer slot", __func__));
 
 	/* Determine which DDP buffer to use. */
 	if (toep->ddp.db[0].drb == NULL) {
 		db_idx = 0;
 	} else {
 		MPASS(toep->ddp.db[1].drb == NULL);
 		db_idx = 1;
 	}
 
 	/*
 	 * Permit PSH to trigger a partial completion without
 	 * invalidating the rest of the buffer, but disable the PUSH
 	 * timer.
 	 */
 	ddp_flags = 0;
 	ddp_flags_mask = 0;
 	if (db_idx == 0) {
 		ddp_flags |= V_TF_DDP_PSH_NO_INVALIDATE0(1) |
 		    V_TF_DDP_PUSH_DISABLE_0(0) | V_TF_DDP_PSHF_ENABLE_0(1) |
 		    V_TF_DDP_BUF0_VALID(1);
 		ddp_flags_mask |= V_TF_DDP_PSH_NO_INVALIDATE0(1) |
 		    V_TF_DDP_PUSH_DISABLE_0(1) | V_TF_DDP_PSHF_ENABLE_0(1) |
 		    V_TF_DDP_BUF0_FLUSH(1) | V_TF_DDP_BUF0_VALID(1);
 		buf_flag = DDP_BUF0_ACTIVE;
 	} else {
 		ddp_flags |= V_TF_DDP_PSH_NO_INVALIDATE1(1) |
 		    V_TF_DDP_PUSH_DISABLE_1(0) | V_TF_DDP_PSHF_ENABLE_1(1) |
 		    V_TF_DDP_BUF1_VALID(1);
 		ddp_flags_mask |= V_TF_DDP_PSH_NO_INVALIDATE1(1) |
 		    V_TF_DDP_PUSH_DISABLE_1(1) | V_TF_DDP_PSHF_ENABLE_1(1) |
 		    V_TF_DDP_BUF1_FLUSH(1) | V_TF_DDP_BUF1_VALID(1);
 		buf_flag = DDP_BUF1_ACTIVE;
 	}
 	MPASS((toep->ddp.flags & buf_flag) == 0);
 	if ((toep->ddp.flags & (DDP_BUF0_ACTIVE | DDP_BUF1_ACTIVE)) == 0) {
 		MPASS(db_idx == 0);
 		MPASS(toep->ddp.active_id == -1);
 		MPASS(toep->ddp.active_count == 0);
 		ddp_flags_mask |= V_TF_DDP_ACTIVE_BUF(1);
 	}
 
 	/*
 	 * The TID for this connection should still be valid.  If
 	 * DDP_DEAD is set, SBS_CANTRCVMORE should be set, so we
 	 * shouldn't be this far anyway.
 	 */
 	wr = mk_update_tcb_for_ddp(sc, toep, db_idx, &drb->prsv, 0, drb->len,
 	    ddp_flags, ddp_flags_mask);
 	if (wr == NULL) {
 		recycle_ddp_rcv_buffer(toep, drb);
 		printf("%s: mk_update_tcb_for_ddp failed\n", __func__);
 		return (false);
 	}
 
 #ifdef VERBOSE_TRACES
 	CTR(KTR_CXGBE,
 	    "%s: tid %u, scheduling DDP[%d] (flags %#lx/%#lx)", __func__,
 	    toep->tid, db_idx, ddp_flags, ddp_flags_mask);
 #endif
 	/*
 	 * Hold a reference on scheduled buffers that is dropped in
 	 * complete_ddp_buffer.
 	 */
 	drb->refs = 1;
 
 	/* Give the chip the go-ahead. */
 	t4_wrq_tx(sc, wr);
 	db = &toep->ddp.db[db_idx];
 	db->drb = drb;
 	toep->ddp.flags |= buf_flag;
 	toep->ddp.active_count++;
 	if (toep->ddp.active_count == 1) {
 		MPASS(toep->ddp.active_id == -1);
 		toep->ddp.active_id = db_idx;
 		CTR2(KTR_CXGBE, "%s: ddp_active_id = %d", __func__,
 		    toep->ddp.active_id);
 	}
 	return (true);
 }
 
 static int
 handle_ddp_data_rcvbuf(struct toepcb *toep, __be32 ddp_report, __be32 rcv_nxt,
     int len)
 {
 	uint32_t report = be32toh(ddp_report);
 	struct inpcb *inp = toep->inp;
 	struct tcpcb *tp;
 	struct socket *so;
 	struct sockbuf *sb;
 	struct ddp_buffer *db;
 	struct ddp_rcv_buffer *drb;
 	unsigned int db_idx;
 	bool invalidated;
 
 	db_idx = report & F_DDP_BUF_IDX ? 1 : 0;
 
 	invalidated = (report & F_DDP_INV) != 0;
 
 	INP_WLOCK(inp);
 	so = inp_inpcbtosocket(inp);
 	sb = &so->so_rcv;
 	DDP_LOCK(toep);
 
 	KASSERT(toep->ddp.active_id == db_idx,
 	    ("completed DDP buffer (%d) != active_id (%d) for tid %d", db_idx,
 	    toep->ddp.active_id, toep->tid));
 	db = &toep->ddp.db[db_idx];
 
 	if (__predict_false(inp->inp_flags & INP_DROPPED)) {
 		/*
 		 * This can happen due to an administrative tcpdrop(8).
 		 * Just ignore the received data.
 		 */
 		CTR5(KTR_CXGBE, "%s: tid %u, seq 0x%x, len %d, inp_flags 0x%x",
 		    __func__, toep->tid, be32toh(rcv_nxt), len, inp->inp_flags);
 		if (invalidated)
 			complete_ddp_buffer(toep, db, db_idx);
 		goto out;
 	}
 
 	tp = intotcpcb(inp);
 
 	/*
 	 * For RX_DDP_COMPLETE, len will be zero and rcv_nxt is the
 	 * sequence number of the next byte to receive.  The length of
 	 * the data received for this message must be computed by
 	 * comparing the new and old values of rcv_nxt.
 	 *
 	 * For RX_DATA_DDP, len might be non-zero, but it is only the
 	 * length of the most recent DMA.  It does not include the
 	 * total length of the data received since the previous update
 	 * for this DDP buffer.  rcv_nxt is the sequence number of the
 	 * first received byte from the most recent DMA.
 	 */
 	len += be32toh(rcv_nxt) - tp->rcv_nxt;
 	tp->rcv_nxt += len;
 	tp->t_rcvtime = ticks;
 #ifndef USE_DDP_RX_FLOW_CONTROL
 	KASSERT(tp->rcv_wnd >= len, ("%s: negative window size", __func__));
 	tp->rcv_wnd -= len;
 #endif
 #ifdef VERBOSE_TRACES
 	CTR5(KTR_CXGBE, "%s: tid %u, DDP[%d] placed %d bytes (%#x)", __func__,
 	    toep->tid, db_idx, len, report);
 #endif
 
 	/* receive buffer autosize */
 	MPASS(toep->vnet == so->so_vnet);
 	CURVNET_SET(toep->vnet);
 	SOCKBUF_LOCK(sb);
 	if (sb->sb_flags & SB_AUTOSIZE &&
 	    V_tcp_do_autorcvbuf &&
 	    sb->sb_hiwat < V_tcp_autorcvbuf_max &&
 	    len > (sbspace(sb) / 8 * 7)) {
 		struct adapter *sc = td_adapter(toep->td);
 		unsigned int hiwat = sb->sb_hiwat;
 		unsigned int newsize = min(hiwat + sc->tt.autorcvbuf_inc,
 		    V_tcp_autorcvbuf_max);
 
 		if (!sbreserve_locked(so, SO_RCV, newsize, NULL))
 			sb->sb_flags &= ~SB_AUTOSIZE;
 	}
 
 	if (len > 0) {
 		queue_ddp_rcvbuf_mbuf(toep, db_idx, len);
 		t4_rcvd_locked(&toep->td->tod, tp);
 	}
 	sorwakeup_locked(so);
 	SOCKBUF_UNLOCK_ASSERT(sb);
 	CURVNET_RESTORE();
 
 	if (invalidated)
 		complete_ddp_buffer(toep, db, db_idx);
 	else
 		KASSERT(db->placed < db->drb->len,
 		    ("%s: full DDP buffer not invalidated", __func__));
 
 	if (toep->ddp.active_count != nitems(toep->ddp.db)) {
 		drb = alloc_cached_ddp_rcv_buffer(toep);
 		if (drb == NULL)
 			drb = alloc_ddp_rcv_buffer(toep, M_NOWAIT);
 		if (drb == NULL)
 			ddp_queue_toep(toep);
 		else {
 			if (!queue_ddp_rcvbuf(toep, drb)) {
 				ddp_queue_toep(toep);
 			}
 		}
 	}
 out:
 	DDP_UNLOCK(toep);
 	INP_WUNLOCK(inp);
 
 	return (0);
 }
 
 static int
 handle_ddp_data(struct toepcb *toep, __be32 ddp_report, __be32 rcv_nxt, int len)
 {
 	if ((toep->ddp.flags & DDP_RCVBUF) != 0)
 		return (handle_ddp_data_rcvbuf(toep, ddp_report, rcv_nxt, len));
 	else
 		return (handle_ddp_data_aio(toep, ddp_report, rcv_nxt, len));
 }
 
 void
 handle_ddp_indicate(struct toepcb *toep)
 {
 
 	DDP_ASSERT_LOCKED(toep);
 	if ((toep->ddp.flags & DDP_RCVBUF) != 0) {
 		/*
 		 * Indicates are not meaningful for RCVBUF since
 		 * buffers are activated when the socket option is
 		 * set.
 		 */
 		return;
 	}
 
 	MPASS(toep->ddp.active_count == 0);
 	MPASS((toep->ddp.flags & (DDP_BUF0_ACTIVE | DDP_BUF1_ACTIVE)) == 0);
 	if (toep->ddp.waiting_count == 0) {
 		/*
 		 * The pending requests that triggered the request for an
 		 * an indicate were cancelled.  Those cancels should have
 		 * already disabled DDP.  Just ignore this as the data is
 		 * going into the socket buffer anyway.
 		 */
 		return;
 	}
 	CTR3(KTR_CXGBE, "%s: tid %d indicated (%d waiting)", __func__,
 	    toep->tid, toep->ddp.waiting_count);
 	ddp_queue_toep(toep);
 }
 
 CTASSERT(CPL_COOKIE_DDP0 + 1 == CPL_COOKIE_DDP1);
 
 static int
 do_ddp_tcb_rpl(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m)
 {
 	struct adapter *sc = iq->adapter;
 	const struct cpl_set_tcb_rpl *cpl = (const void *)(rss + 1);
 	unsigned int tid = GET_TID(cpl);
 	unsigned int db_idx;
 	struct toepcb *toep;
 	struct inpcb *inp;
 	struct ddp_buffer *db;
 	struct kaiocb *job;
 	long copied;
 
 	if (cpl->status != CPL_ERR_NONE)
 		panic("XXX: tcp_rpl failed: %d", cpl->status);
 
 	toep = lookup_tid(sc, tid);
 	inp = toep->inp;
 	switch (cpl->cookie) {
 	case V_WORD(W_TCB_RX_DDP_FLAGS) | V_COOKIE(CPL_COOKIE_DDP0):
 	case V_WORD(W_TCB_RX_DDP_FLAGS) | V_COOKIE(CPL_COOKIE_DDP1):
 		/*
 		 * XXX: This duplicates a lot of code with handle_ddp_data().
 		 */
 		KASSERT((toep->ddp.flags & DDP_AIO) != 0,
 		    ("%s: DDP_RCVBUF", __func__));
 		db_idx = G_COOKIE(cpl->cookie) - CPL_COOKIE_DDP0;
 		MPASS(db_idx < nitems(toep->ddp.db));
 		INP_WLOCK(inp);
 		DDP_LOCK(toep);
 		db = &toep->ddp.db[db_idx];
 
 		/*
 		 * handle_ddp_data() should leave the job around until
 		 * this callback runs once a cancel is pending.
 		 */
 		MPASS(db != NULL);
 		MPASS(db->job != NULL);
 		MPASS(db->cancel_pending);
 
 		/*
 		 * XXX: It's not clear what happens if there is data
 		 * placed when the buffer is invalidated.  I suspect we
 		 * need to read the TCB to see how much data was placed.
 		 *
 		 * For now this just pretends like nothing was placed.
 		 *
 		 * XXX: Note that if we did check the PCB we would need to
 		 * also take care of updating the tp, etc.
 		 */
 		job = db->job;
 		copied = job->aio_received;
 		if (copied == 0) {
 			CTR2(KTR_CXGBE, "%s: cancelling %p", __func__, job);
 			aio_cancel(job);
 		} else {
 			CTR3(KTR_CXGBE, "%s: completing %p (copied %ld)",
 			    __func__, job, copied);
 			aio_complete(job, copied, 0);
 			t4_rcvd(&toep->td->tod, intotcpcb(inp));
 		}
 
 		complete_ddp_buffer(toep, db, db_idx);
 		if (toep->ddp.waiting_count > 0)
 			ddp_queue_toep(toep);
 		DDP_UNLOCK(toep);
 		INP_WUNLOCK(inp);
 		break;
 	default:
 		panic("XXX: unknown tcb_rpl offset %#x, cookie %#x",
 		    G_WORD(cpl->cookie), G_COOKIE(cpl->cookie));
 	}
 
 	return (0);
 }
 
 void
 handle_ddp_close(struct toepcb *toep, struct tcpcb *tp, __be32 rcv_nxt)
 {
 	struct socket *so = toep->inp->inp_socket;
 	struct sockbuf *sb = &so->so_rcv;
 	struct ddp_buffer *db;
 	struct kaiocb *job;
 	long copied;
 	unsigned int db_idx;
 #ifdef INVARIANTS
 	unsigned int db_flag;
 #endif
 	int len, placed;
 	bool ddp_rcvbuf;
 
 	INP_WLOCK_ASSERT(toep->inp);
 	DDP_ASSERT_LOCKED(toep);
 
 	ddp_rcvbuf = (toep->ddp.flags & DDP_RCVBUF) != 0;
 
 	/* - 1 is to ignore the byte for FIN */
 	len = be32toh(rcv_nxt) - tp->rcv_nxt - 1;
 	tp->rcv_nxt += len;
 
 	CTR(KTR_CXGBE, "%s: tid %d placed %u bytes before FIN", __func__,
 	    toep->tid, len);
 	while (toep->ddp.active_count > 0) {
 		MPASS(toep->ddp.active_id != -1);
 		db_idx = toep->ddp.active_id;
 #ifdef INVARIANTS
 		db_flag = db_idx == 1 ? DDP_BUF1_ACTIVE : DDP_BUF0_ACTIVE;
 #endif
 		MPASS((toep->ddp.flags & db_flag) != 0);
 		db = &toep->ddp.db[db_idx];
 		if (ddp_rcvbuf) {
 			placed = len;
 			if (placed > db->drb->len - db->placed)
 				placed = db->drb->len - db->placed;
 			if (placed != 0) {
 				SOCKBUF_LOCK(sb);
 				queue_ddp_rcvbuf_mbuf(toep, db_idx, placed);
 				sorwakeup_locked(so);
 				SOCKBUF_UNLOCK_ASSERT(sb);
 			}
 			complete_ddp_buffer(toep, db, db_idx);
 			len -= placed;
 			continue;
 		}
 		job = db->job;
 		copied = job->aio_received;
 		placed = len;
 		if (placed > job->uaiocb.aio_nbytes - copied)
 			placed = job->uaiocb.aio_nbytes - copied;
 		if (placed > 0) {
 			job->msgrcv = 1;
 			toep->ofld_rxq->rx_aio_ddp_jobs++;
 		}
 		toep->ofld_rxq->rx_aio_ddp_octets += placed;
 		if (!aio_clear_cancel_function(job)) {
 			/*
 			 * Update the copied length for when
 			 * t4_aio_cancel_active() completes this
 			 * request.
 			 */
 			job->aio_received += placed;
 		} else {
 			CTR4(KTR_CXGBE, "%s: tid %d completed buf %d len %d",
 			    __func__, toep->tid, db_idx, placed);
 			aio_complete(job, copied + placed, 0);
 		}
 		len -= placed;
 		complete_ddp_buffer(toep, db, db_idx);
 	}
 
 	MPASS(len == 0);
 	if ((toep->ddp.flags & DDP_AIO) != 0)
 		ddp_complete_all(toep, 0);
 }
 
 #define DDP_ERR (F_DDP_PPOD_MISMATCH | F_DDP_LLIMIT_ERR | F_DDP_ULIMIT_ERR |\
 	 F_DDP_PPOD_PARITY_ERR | F_DDP_PADDING_ERR | F_DDP_OFFSET_ERR |\
 	 F_DDP_INVALID_TAG | F_DDP_COLOR_ERR | F_DDP_TID_MISMATCH |\
 	 F_DDP_INVALID_PPOD | F_DDP_HDRCRC_ERR | F_DDP_DATACRC_ERR)
 
 extern cpl_handler_t t4_cpl_handler[];
 
 static int
 do_rx_data_ddp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m)
 {
 	struct adapter *sc = iq->adapter;
 	const struct cpl_rx_data_ddp *cpl = (const void *)(rss + 1);
 	unsigned int tid = GET_TID(cpl);
 	uint32_t vld;
 	struct toepcb *toep = lookup_tid(sc, tid);
 
 	KASSERT(m == NULL, ("%s: wasn't expecting payload", __func__));
 	KASSERT(toep->tid == tid, ("%s: toep tid/atid mismatch", __func__));
 	KASSERT(!(toep->flags & TPF_SYNQE),
 	    ("%s: toep %p claims to be a synq entry", __func__, toep));
 
 	vld = be32toh(cpl->ddpvld);
 	if (__predict_false(vld & DDP_ERR)) {
 		panic("%s: DDP error 0x%x (tid %d, toep %p)",
 		    __func__, vld, tid, toep);
 	}
 
 	if (ulp_mode(toep) == ULP_MODE_ISCSI) {
 		t4_cpl_handler[CPL_RX_ISCSI_DDP](iq, rss, m);
 		return (0);
 	}
 
 	handle_ddp_data(toep, cpl->u.ddp_report, cpl->seq, be16toh(cpl->len));
 
 	return (0);
 }
 
 static int
 do_rx_ddp_complete(struct sge_iq *iq, const struct rss_header *rss,
     struct mbuf *m)
 {
 	struct adapter *sc = iq->adapter;
 	const struct cpl_rx_ddp_complete *cpl = (const void *)(rss + 1);
 	unsigned int tid = GET_TID(cpl);
 	struct toepcb *toep = lookup_tid(sc, tid);
 
 	KASSERT(m == NULL, ("%s: wasn't expecting payload", __func__));
 	KASSERT(toep->tid == tid, ("%s: toep tid/atid mismatch", __func__));
 	KASSERT(!(toep->flags & TPF_SYNQE),
 	    ("%s: toep %p claims to be a synq entry", __func__, toep));
 
 	handle_ddp_data(toep, cpl->ddp_report, cpl->rcv_nxt, 0);
 
 	return (0);
 }
 
 static bool
 set_ddp_ulp_mode(struct toepcb *toep)
 {
 	struct adapter *sc = toep->vi->adapter;
 	struct wrqe *wr;
 	struct work_request_hdr *wrh;
 	struct ulp_txpkt *ulpmc;
 	int fields, len;
 
 	if (!sc->tt.ddp)
 		return (false);
 
 	fields = 0;
 
 	/* Overlay region including W_TCB_RX_DDP_FLAGS */
 	fields += 3;
 
 	/* W_TCB_ULP_TYPE */
 	fields++;
 
 #ifdef USE_DDP_RX_FLOW_CONTROL
 	/* W_TCB_T_FLAGS */
 	fields++;
 #endif
 
 	len = sizeof(*wrh) + fields * roundup2(LEN__SET_TCB_FIELD_ULP, 16);
 	KASSERT(len <= SGE_MAX_WR_LEN,
 	    ("%s: WR with %d TCB field updates too large", __func__, fields));
 
 	wr = alloc_wrqe(len, toep->ctrlq);
 	if (wr == NULL)
 		return (false);
 
 	CTR(KTR_CXGBE, "%s: tid %u", __func__, toep->tid);
 
 	wrh = wrtod(wr);
 	INIT_ULPTX_WRH(wrh, len, 1, 0);	/* atomic */
 	ulpmc = (struct ulp_txpkt *)(wrh + 1);
 
 	/*
 	 * Words 26/27 are zero except for the DDP_OFF flag in
 	 * W_TCB_RX_DDP_FLAGS (27).
 	 */
 	ulpmc = mk_set_tcb_field_ulp(sc, ulpmc, toep->tid, 26,
 	    0xffffffffffffffff, (uint64_t)V_TF_DDP_OFF(1) << 32);
 
 	/* Words 28/29 are zero. */
 	ulpmc = mk_set_tcb_field_ulp(sc, ulpmc, toep->tid, 28,
 	    0xffffffffffffffff, 0);
 
 	/* Words 30/31 are zero. */
 	ulpmc = mk_set_tcb_field_ulp(sc, ulpmc, toep->tid, 30,
 	    0xffffffffffffffff, 0);
 
 	/* Set the ULP mode to ULP_MODE_TCPDDP. */
 	toep->params.ulp_mode = ULP_MODE_TCPDDP;
 	ulpmc = mk_set_tcb_field_ulp(sc, ulpmc, toep->tid, W_TCB_ULP_TYPE,
 	    V_TCB_ULP_TYPE(M_TCB_ULP_TYPE), V_TCB_ULP_TYPE(ULP_MODE_TCPDDP));
 
 #ifdef USE_DDP_RX_FLOW_CONTROL
 	/* Set TF_RX_FLOW_CONTROL_DDP. */
 	ulpmc = mk_set_tcb_field_ulp(sc, ulpmc, toep->tid, W_TCB_T_FLAGS,
 	    V_TF_RX_FLOW_CONTROL_DDP(1), V_TF_RX_FLOW_CONTROL_DDP(1));
 #endif
 
 	ddp_init_toep(toep);
 
 	t4_wrq_tx(sc, wr);
 	return (true);
 }
 
 static void
 enable_ddp(struct adapter *sc, struct toepcb *toep)
 {
 	uint64_t ddp_flags;
 
 	KASSERT((toep->ddp.flags & (DDP_ON | DDP_OK | DDP_SC_REQ)) == DDP_OK,
 	    ("%s: toep %p has bad ddp_flags 0x%x",
 	    __func__, toep, toep->ddp.flags));
 
 	CTR3(KTR_CXGBE, "%s: tid %u (time %u)",
 	    __func__, toep->tid, time_uptime);
 
 	ddp_flags = 0;
 	if ((toep->ddp.flags & DDP_AIO) != 0)
 		ddp_flags |= V_TF_DDP_BUF0_INDICATE(1) |
 		    V_TF_DDP_BUF1_INDICATE(1);
 	DDP_ASSERT_LOCKED(toep);
 	toep->ddp.flags |= DDP_SC_REQ;
 	t4_set_tcb_field(sc, toep->ctrlq, toep, W_TCB_RX_DDP_FLAGS,
 	    V_TF_DDP_OFF(1) | V_TF_DDP_INDICATE_OUT(1) |
 	    V_TF_DDP_BUF0_INDICATE(1) | V_TF_DDP_BUF1_INDICATE(1) |
 	    V_TF_DDP_BUF0_VALID(1) | V_TF_DDP_BUF1_VALID(1), ddp_flags, 0, 0);
 	t4_set_tcb_field(sc, toep->ctrlq, toep, W_TCB_T_FLAGS,
 	    V_TF_RCV_COALESCE_ENABLE(1), 0, 0, 0);
 }
 
 static int
 calculate_hcf(int n1, int n2)
 {
 	int a, b, t;
 
 	if (n1 <= n2) {
 		a = n1;
 		b = n2;
 	} else {
 		a = n2;
 		b = n1;
 	}
 
 	while (a != 0) {
 		t = a;
 		a = b % a;
 		b = t;
 	}
 
 	return (b);
 }
 
 static inline int
 pages_to_nppods(int npages, int ddp_page_shift)
 {
 
 	MPASS(ddp_page_shift >= PAGE_SHIFT);
 
 	return (howmany(npages >> (ddp_page_shift - PAGE_SHIFT), PPOD_PAGES));
 }
 
 static int
 alloc_page_pods(struct ppod_region *pr, u_int nppods, u_int pgsz_idx,
     struct ppod_reservation *prsv)
 {
 	vmem_addr_t addr;       /* relative to start of region */
 
 	if (vmem_alloc(pr->pr_arena, PPOD_SZ(nppods), M_NOWAIT | M_FIRSTFIT,
 	    &addr) != 0)
 		return (ENOMEM);
 
 #ifdef VERBOSE_TRACES
 	CTR5(KTR_CXGBE, "%-17s arena %p, addr 0x%08x, nppods %d, pgsz %d",
 	    __func__, pr->pr_arena, (uint32_t)addr & pr->pr_tag_mask,
 	    nppods, 1 << pr->pr_page_shift[pgsz_idx]);
 #endif
 
 	/*
 	 * The hardware tagmask includes an extra invalid bit but the arena was
 	 * seeded with valid values only.  An allocation out of this arena will
 	 * fit inside the tagmask but won't have the invalid bit set.
 	 */
 	MPASS((addr & pr->pr_tag_mask) == addr);
 	MPASS((addr & pr->pr_invalid_bit) == 0);
 
 	prsv->prsv_pr = pr;
 	prsv->prsv_tag = V_PPOD_PGSZ(pgsz_idx) | addr;
 	prsv->prsv_nppods = nppods;
 
 	return (0);
 }
 
 static int
 t4_alloc_page_pods_for_vmpages(struct ppod_region *pr, vm_page_t *pages,
     int npages, struct ppod_reservation *prsv)
 {
 	int i, hcf, seglen, idx, nppods;
 
 	/*
 	 * The DDP page size is unrelated to the VM page size.  We combine
 	 * contiguous physical pages into larger segments to get the best DDP
 	 * page size possible.  This is the largest of the four sizes in
 	 * A_ULP_RX_TDDP_PSZ that evenly divides the HCF of the segment sizes in
 	 * the page list.
 	 */
 	hcf = 0;
 	for (i = 0; i < npages; i++) {
 		seglen = PAGE_SIZE;
 		while (i < npages - 1 &&
 		    VM_PAGE_TO_PHYS(pages[i]) + PAGE_SIZE ==
 		    VM_PAGE_TO_PHYS(pages[i + 1])) {
 			seglen += PAGE_SIZE;
 			i++;
 		}
 
 		hcf = calculate_hcf(hcf, seglen);
 		if (hcf < (1 << pr->pr_page_shift[1])) {
 			idx = 0;
 			goto have_pgsz;	/* give up, short circuit */
 		}
 	}
 
 #define PR_PAGE_MASK(x) ((1 << pr->pr_page_shift[(x)]) - 1)
 	MPASS((hcf & PR_PAGE_MASK(0)) == 0); /* PAGE_SIZE is >= 4K everywhere */
 	for (idx = nitems(pr->pr_page_shift) - 1; idx > 0; idx--) {
 		if ((hcf & PR_PAGE_MASK(idx)) == 0)
 			break;
 	}
 #undef PR_PAGE_MASK
 
 have_pgsz:
 	MPASS(idx <= M_PPOD_PGSZ);
 
 	nppods = pages_to_nppods(npages, pr->pr_page_shift[idx]);
 	if (alloc_page_pods(pr, nppods, idx, prsv) != 0)
 		return (ENOMEM);
 	MPASS(prsv->prsv_nppods > 0);
 
 	return (0);
 }
 
 int
 t4_alloc_page_pods_for_ps(struct ppod_region *pr, struct pageset *ps)
 {
 	struct ppod_reservation *prsv = &ps->prsv;
 
 	KASSERT(prsv->prsv_nppods == 0,
 	    ("%s: page pods already allocated", __func__));
 
 	return (t4_alloc_page_pods_for_vmpages(pr, ps->pages, ps->npages,
 	    prsv));
 }
 
 int
 t4_alloc_page_pods_for_bio(struct ppod_region *pr, struct bio *bp,
     struct ppod_reservation *prsv)
 {
 
 	MPASS(bp->bio_flags & BIO_UNMAPPED);
 
 	return (t4_alloc_page_pods_for_vmpages(pr, bp->bio_ma, bp->bio_ma_n,
 	    prsv));
 }
 
 int
 t4_alloc_page_pods_for_buf(struct ppod_region *pr, vm_offset_t buf, int len,
     struct ppod_reservation *prsv)
 {
 	int hcf, seglen, idx, npages, nppods;
 	uintptr_t start_pva, end_pva, pva, p1;
 
 	MPASS(buf > 0);
 	MPASS(len > 0);
 
 	/*
 	 * The DDP page size is unrelated to the VM page size.  We combine
 	 * contiguous physical pages into larger segments to get the best DDP
 	 * page size possible.  This is the largest of the four sizes in
 	 * A_ULP_RX_ISCSI_PSZ that evenly divides the HCF of the segment sizes
 	 * in the page list.
 	 */
 	hcf = 0;
 	start_pva = trunc_page(buf);
 	end_pva = trunc_page(buf + len - 1);
 	pva = start_pva;
 	while (pva <= end_pva) {
 		seglen = PAGE_SIZE;
 		p1 = pmap_kextract(pva);
 		pva += PAGE_SIZE;
 		while (pva <= end_pva && p1 + seglen == pmap_kextract(pva)) {
 			seglen += PAGE_SIZE;
 			pva += PAGE_SIZE;
 		}
 
 		hcf = calculate_hcf(hcf, seglen);
 		if (hcf < (1 << pr->pr_page_shift[1])) {
 			idx = 0;
 			goto have_pgsz;	/* give up, short circuit */
 		}
 	}
 
 #define PR_PAGE_MASK(x) ((1 << pr->pr_page_shift[(x)]) - 1)
 	MPASS((hcf & PR_PAGE_MASK(0)) == 0); /* PAGE_SIZE is >= 4K everywhere */
 	for (idx = nitems(pr->pr_page_shift) - 1; idx > 0; idx--) {
 		if ((hcf & PR_PAGE_MASK(idx)) == 0)
 			break;
 	}
 #undef PR_PAGE_MASK
 
 have_pgsz:
 	MPASS(idx <= M_PPOD_PGSZ);
 
 	npages = 1;
 	npages += (end_pva - start_pva) >> pr->pr_page_shift[idx];
 	nppods = howmany(npages, PPOD_PAGES);
 	if (alloc_page_pods(pr, nppods, idx, prsv) != 0)
 		return (ENOMEM);
 	MPASS(prsv->prsv_nppods > 0);
 
 	return (0);
 }
 
 static int
 t4_alloc_page_pods_for_rcvbuf(struct ppod_region *pr,
     struct ddp_rcv_buffer *drb)
 {
 	struct ppod_reservation *prsv = &drb->prsv;
 
 	KASSERT(prsv->prsv_nppods == 0,
 	    ("%s: page pods already allocated", __func__));
 
 	return (t4_alloc_page_pods_for_buf(pr, (vm_offset_t)drb->buf, drb->len,
 	    prsv));
 }
 
 int
 t4_alloc_page_pods_for_sgl(struct ppod_region *pr, struct ctl_sg_entry *sgl,
     int entries, struct ppod_reservation *prsv)
 {
 	int hcf, seglen, idx = 0, npages, nppods, i, len;
 	uintptr_t start_pva, end_pva, pva, p1 ;
 	vm_offset_t buf;
 	struct ctl_sg_entry *sge;
 
 	MPASS(entries > 0);
 	MPASS(sgl);
 
 	/*
 	 * The DDP page size is unrelated to the VM page size.	We combine
 	 * contiguous physical pages into larger segments to get the best DDP
 	 * page size possible.	This is the largest of the four sizes in
 	 * A_ULP_RX_ISCSI_PSZ that evenly divides the HCF of the segment sizes
 	 * in the page list.
 	 */
 	hcf = 0;
 	for (i = entries - 1; i >= 0; i--) {
 		sge = sgl + i;
 		buf = (vm_offset_t)sge->addr;
 		len = sge->len;
 		start_pva = trunc_page(buf);
 		end_pva = trunc_page(buf + len - 1);
 		pva = start_pva;
 		while (pva <= end_pva) {
 			seglen = PAGE_SIZE;
 			p1 = pmap_kextract(pva);
 			pva += PAGE_SIZE;
 			while (pva <= end_pva && p1 + seglen ==
 			    pmap_kextract(pva)) {
 				seglen += PAGE_SIZE;
 				pva += PAGE_SIZE;
 			}
 
 			hcf = calculate_hcf(hcf, seglen);
 			if (hcf < (1 << pr->pr_page_shift[1])) {
 				idx = 0;
 				goto have_pgsz; /* give up, short circuit */
 			}
 		}
 	}
 #define PR_PAGE_MASK(x) ((1 << pr->pr_page_shift[(x)]) - 1)
 	MPASS((hcf & PR_PAGE_MASK(0)) == 0); /* PAGE_SIZE is >= 4K everywhere */
 	for (idx = nitems(pr->pr_page_shift) - 1; idx > 0; idx--) {
 		if ((hcf & PR_PAGE_MASK(idx)) == 0)
 			break;
 	}
 #undef PR_PAGE_MASK
 
 have_pgsz:
 	MPASS(idx <= M_PPOD_PGSZ);
 
 	npages = 0;
 	while (entries--) {
 		npages++;
 		start_pva = trunc_page((vm_offset_t)sgl->addr);
 		end_pva = trunc_page((vm_offset_t)sgl->addr + sgl->len - 1);
 		npages += (end_pva - start_pva) >> pr->pr_page_shift[idx];
 		sgl = sgl + 1;
 	}
 	nppods = howmany(npages, PPOD_PAGES);
 	if (alloc_page_pods(pr, nppods, idx, prsv) != 0)
 		return (ENOMEM);
 	MPASS(prsv->prsv_nppods > 0);
 	return (0);
 }
 
 void
 t4_free_page_pods(struct ppod_reservation *prsv)
 {
 	struct ppod_region *pr = prsv->prsv_pr;
 	vmem_addr_t addr;
 
 	MPASS(prsv != NULL);
 	MPASS(prsv->prsv_nppods != 0);
 
 	addr = prsv->prsv_tag & pr->pr_tag_mask;
 	MPASS((addr & pr->pr_invalid_bit) == 0);
 
 #ifdef VERBOSE_TRACES
 	CTR4(KTR_CXGBE, "%-17s arena %p, addr 0x%08x, nppods %d", __func__,
 	    pr->pr_arena, addr, prsv->prsv_nppods);
 #endif
 
 	vmem_free(pr->pr_arena, addr, PPOD_SZ(prsv->prsv_nppods));
 	prsv->prsv_nppods = 0;
 }
 
 #define NUM_ULP_TX_SC_IMM_PPODS (256 / PPOD_SIZE)
 
 int
 t4_write_page_pods_for_ps(struct adapter *sc, struct sge_wrq *wrq, int tid,
     struct pageset *ps)
 {
 	struct wrqe *wr;
 	struct ulp_mem_io *ulpmc;
 	struct ulptx_idata *ulpsc;
 	struct pagepod *ppod;
 	int i, j, k, n, chunk, len, ddp_pgsz, idx;
 	u_int ppod_addr;
 	uint32_t cmd;
 	struct ppod_reservation *prsv = &ps->prsv;
 	struct ppod_region *pr = prsv->prsv_pr;
 	vm_paddr_t pa;
 
 	KASSERT(!(ps->flags & PS_PPODS_WRITTEN),
 	    ("%s: page pods already written", __func__));
 	MPASS(prsv->prsv_nppods > 0);
 
 	cmd = htobe32(V_ULPTX_CMD(ULP_TX_MEM_WRITE));
 	if (is_t4(sc))
 		cmd |= htobe32(F_ULP_MEMIO_ORDER);
 	else
 		cmd |= htobe32(F_T5_ULP_MEMIO_IMM);
 	ddp_pgsz = 1 << pr->pr_page_shift[G_PPOD_PGSZ(prsv->prsv_tag)];
 	ppod_addr = pr->pr_start + (prsv->prsv_tag & pr->pr_tag_mask);
 	for (i = 0; i < prsv->prsv_nppods; ppod_addr += chunk) {
 		/* How many page pods are we writing in this cycle */
 		n = min(prsv->prsv_nppods - i, NUM_ULP_TX_SC_IMM_PPODS);
 		chunk = PPOD_SZ(n);
 		len = roundup2(sizeof(*ulpmc) + sizeof(*ulpsc) + chunk, 16);
 
 		wr = alloc_wrqe(len, wrq);
 		if (wr == NULL)
 			return (ENOMEM);	/* ok to just bail out */
 		ulpmc = wrtod(wr);
 
 		INIT_ULPTX_WR(ulpmc, len, 0, 0);
 		ulpmc->cmd = cmd;
 		ulpmc->dlen = htobe32(V_ULP_MEMIO_DATA_LEN(chunk / 32));
 		ulpmc->len16 = htobe32(howmany(len - sizeof(ulpmc->wr), 16));
 		ulpmc->lock_addr = htobe32(V_ULP_MEMIO_ADDR(ppod_addr >> 5));
 
 		ulpsc = (struct ulptx_idata *)(ulpmc + 1);
 		ulpsc->cmd_more = htobe32(V_ULPTX_CMD(ULP_TX_SC_IMM));
 		ulpsc->len = htobe32(chunk);
 
 		ppod = (struct pagepod *)(ulpsc + 1);
 		for (j = 0; j < n; i++, j++, ppod++) {
 			ppod->vld_tid_pgsz_tag_color = htobe64(F_PPOD_VALID |
 			    V_PPOD_TID(tid) | prsv->prsv_tag);
 			ppod->len_offset = htobe64(V_PPOD_LEN(ps->len) |
 			    V_PPOD_OFST(ps->offset));
 			ppod->rsvd = 0;
 			idx = i * PPOD_PAGES * (ddp_pgsz / PAGE_SIZE);
 			for (k = 0; k < nitems(ppod->addr); k++) {
 				if (idx < ps->npages) {
 					pa = VM_PAGE_TO_PHYS(ps->pages[idx]);
 					ppod->addr[k] = htobe64(pa);
 					idx += ddp_pgsz / PAGE_SIZE;
 				} else
 					ppod->addr[k] = 0;
 #if 0
 				CTR5(KTR_CXGBE,
 				    "%s: tid %d ppod[%d]->addr[%d] = %p",
 				    __func__, tid, i, k,
 				    be64toh(ppod->addr[k]));
 #endif
 			}
 
 		}
 
 		t4_wrq_tx(sc, wr);
 	}
 	ps->flags |= PS_PPODS_WRITTEN;
 
 	return (0);
 }
 
 static int
 t4_write_page_pods_for_rcvbuf(struct adapter *sc, struct sge_wrq *wrq, int tid,
     struct ddp_rcv_buffer *drb)
 {
 	struct wrqe *wr;
 	struct ulp_mem_io *ulpmc;
 	struct ulptx_idata *ulpsc;
 	struct pagepod *ppod;
 	int i, j, k, n, chunk, len, ddp_pgsz;
 	u_int ppod_addr, offset;
 	uint32_t cmd;
 	struct ppod_reservation *prsv = &drb->prsv;
 	struct ppod_region *pr = prsv->prsv_pr;
 	uintptr_t end_pva, pva;
 	vm_paddr_t pa;
 
 	MPASS(prsv->prsv_nppods > 0);
 
 	cmd = htobe32(V_ULPTX_CMD(ULP_TX_MEM_WRITE));
 	if (is_t4(sc))
 		cmd |= htobe32(F_ULP_MEMIO_ORDER);
 	else
 		cmd |= htobe32(F_T5_ULP_MEMIO_IMM);
 	ddp_pgsz = 1 << pr->pr_page_shift[G_PPOD_PGSZ(prsv->prsv_tag)];
 	offset = (uintptr_t)drb->buf & PAGE_MASK;
 	ppod_addr = pr->pr_start + (prsv->prsv_tag & pr->pr_tag_mask);
 	pva = trunc_page((uintptr_t)drb->buf);
 	end_pva = trunc_page((uintptr_t)drb->buf + drb->len - 1);
 	for (i = 0; i < prsv->prsv_nppods; ppod_addr += chunk) {
 		/* How many page pods are we writing in this cycle */
 		n = min(prsv->prsv_nppods - i, NUM_ULP_TX_SC_IMM_PPODS);
 		MPASS(n > 0);
 		chunk = PPOD_SZ(n);
 		len = roundup2(sizeof(*ulpmc) + sizeof(*ulpsc) + chunk, 16);
 
 		wr = alloc_wrqe(len, wrq);
 		if (wr == NULL)
 			return (ENOMEM);	/* ok to just bail out */
 		ulpmc = wrtod(wr);
 
 		INIT_ULPTX_WR(ulpmc, len, 0, 0);
 		ulpmc->cmd = cmd;
 		ulpmc->dlen = htobe32(V_ULP_MEMIO_DATA_LEN(chunk / 32));
 		ulpmc->len16 = htobe32(howmany(len - sizeof(ulpmc->wr), 16));
 		ulpmc->lock_addr = htobe32(V_ULP_MEMIO_ADDR(ppod_addr >> 5));
 
 		ulpsc = (struct ulptx_idata *)(ulpmc + 1);
 		ulpsc->cmd_more = htobe32(V_ULPTX_CMD(ULP_TX_SC_IMM));
 		ulpsc->len = htobe32(chunk);
 
 		ppod = (struct pagepod *)(ulpsc + 1);
 		for (j = 0; j < n; i++, j++, ppod++) {
 			ppod->vld_tid_pgsz_tag_color = htobe64(F_PPOD_VALID |
 			    V_PPOD_TID(tid) | prsv->prsv_tag);
 			ppod->len_offset = htobe64(V_PPOD_LEN(drb->len) |
 			    V_PPOD_OFST(offset));
 			ppod->rsvd = 0;
 
 			for (k = 0; k < nitems(ppod->addr); k++) {
 				if (pva > end_pva)
 					ppod->addr[k] = 0;
 				else {
 					pa = pmap_kextract(pva);
 					ppod->addr[k] = htobe64(pa);
 					pva += ddp_pgsz;
 				}
 #if 0
 				CTR5(KTR_CXGBE,
 				    "%s: tid %d ppod[%d]->addr[%d] = %p",
 				    __func__, tid, i, k,
 				    be64toh(ppod->addr[k]));
 #endif
 			}
 
 			/*
 			 * Walk back 1 segment so that the first address in the
 			 * next pod is the same as the last one in the current
 			 * pod.
 			 */
 			pva -= ddp_pgsz;
 		}
 
 		t4_wrq_tx(sc, wr);
 	}
 
 	MPASS(pva <= end_pva);
 
 	return (0);
 }
 
 static struct mbuf *
 alloc_raw_wr_mbuf(int len)
 {
 	struct mbuf *m;
 
 	if (len <= MHLEN)
 		m = m_gethdr(M_NOWAIT, MT_DATA);
 	else if (len <= MCLBYTES)
 		m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	else
 		m = NULL;
 	if (m == NULL)
 		return (NULL);
 	m->m_pkthdr.len = len;
 	m->m_len = len;
 	set_mbuf_raw_wr(m, true);
 	return (m);
 }
 
 int
 t4_write_page_pods_for_bio(struct adapter *sc, struct toepcb *toep,
     struct ppod_reservation *prsv, struct bio *bp, struct mbufq *wrq)
 {
 	struct ulp_mem_io *ulpmc;
 	struct ulptx_idata *ulpsc;
 	struct pagepod *ppod;
 	int i, j, k, n, chunk, len, ddp_pgsz, idx;
 	u_int ppod_addr;
 	uint32_t cmd;
 	struct ppod_region *pr = prsv->prsv_pr;
 	vm_paddr_t pa;
 	struct mbuf *m;
 
 	MPASS(bp->bio_flags & BIO_UNMAPPED);
 
 	cmd = htobe32(V_ULPTX_CMD(ULP_TX_MEM_WRITE));
 	if (is_t4(sc))
 		cmd |= htobe32(F_ULP_MEMIO_ORDER);
 	else
 		cmd |= htobe32(F_T5_ULP_MEMIO_IMM);
 	ddp_pgsz = 1 << pr->pr_page_shift[G_PPOD_PGSZ(prsv->prsv_tag)];
 	ppod_addr = pr->pr_start + (prsv->prsv_tag & pr->pr_tag_mask);
 	for (i = 0; i < prsv->prsv_nppods; ppod_addr += chunk) {
 
 		/* How many page pods are we writing in this cycle */
 		n = min(prsv->prsv_nppods - i, NUM_ULP_TX_SC_IMM_PPODS);
 		MPASS(n > 0);
 		chunk = PPOD_SZ(n);
 		len = roundup2(sizeof(*ulpmc) + sizeof(*ulpsc) + chunk, 16);
 
 		m = alloc_raw_wr_mbuf(len);
 		if (m == NULL)
 			return (ENOMEM);
 
 		ulpmc = mtod(m, struct ulp_mem_io *);
 		INIT_ULPTX_WR(ulpmc, len, 0, toep->tid);
 		ulpmc->cmd = cmd;
 		ulpmc->dlen = htobe32(V_ULP_MEMIO_DATA_LEN(chunk / 32));
 		ulpmc->len16 = htobe32(howmany(len - sizeof(ulpmc->wr), 16));
 		ulpmc->lock_addr = htobe32(V_ULP_MEMIO_ADDR(ppod_addr >> 5));
 
 		ulpsc = (struct ulptx_idata *)(ulpmc + 1);
 		ulpsc->cmd_more = htobe32(V_ULPTX_CMD(ULP_TX_SC_IMM));
 		ulpsc->len = htobe32(chunk);
 
 		ppod = (struct pagepod *)(ulpsc + 1);
 		for (j = 0; j < n; i++, j++, ppod++) {
 			ppod->vld_tid_pgsz_tag_color = htobe64(F_PPOD_VALID |
 			    V_PPOD_TID(toep->tid) |
 			    (prsv->prsv_tag & ~V_PPOD_PGSZ(M_PPOD_PGSZ)));
 			ppod->len_offset = htobe64(V_PPOD_LEN(bp->bio_bcount) |
 			    V_PPOD_OFST(bp->bio_ma_offset));
 			ppod->rsvd = 0;
 			idx = i * PPOD_PAGES * (ddp_pgsz / PAGE_SIZE);
 			for (k = 0; k < nitems(ppod->addr); k++) {
 				if (idx < bp->bio_ma_n) {
 					pa = VM_PAGE_TO_PHYS(bp->bio_ma[idx]);
 					ppod->addr[k] = htobe64(pa);
 					idx += ddp_pgsz / PAGE_SIZE;
 				} else
 					ppod->addr[k] = 0;
 #if 0
 				CTR5(KTR_CXGBE,
 				    "%s: tid %d ppod[%d]->addr[%d] = %p",
 				    __func__, toep->tid, i, k,
 				    be64toh(ppod->addr[k]));
 #endif
 			}
 		}
 
 		mbufq_enqueue(wrq, m);
 	}
 
 	return (0);
 }
 
 int
 t4_write_page_pods_for_buf(struct adapter *sc, struct toepcb *toep,
     struct ppod_reservation *prsv, vm_offset_t buf, int buflen,
     struct mbufq *wrq)
 {
 	struct ulp_mem_io *ulpmc;
 	struct ulptx_idata *ulpsc;
 	struct pagepod *ppod;
 	int i, j, k, n, chunk, len, ddp_pgsz;
 	u_int ppod_addr, offset;
 	uint32_t cmd;
 	struct ppod_region *pr = prsv->prsv_pr;
 	uintptr_t end_pva, pva;
 	vm_paddr_t pa;
 	struct mbuf *m;
 
 	cmd = htobe32(V_ULPTX_CMD(ULP_TX_MEM_WRITE));
 	if (is_t4(sc))
 		cmd |= htobe32(F_ULP_MEMIO_ORDER);
 	else
 		cmd |= htobe32(F_T5_ULP_MEMIO_IMM);
 	ddp_pgsz = 1 << pr->pr_page_shift[G_PPOD_PGSZ(prsv->prsv_tag)];
 	offset = buf & PAGE_MASK;
 	ppod_addr = pr->pr_start + (prsv->prsv_tag & pr->pr_tag_mask);
 	pva = trunc_page(buf);
 	end_pva = trunc_page(buf + buflen - 1);
 	for (i = 0; i < prsv->prsv_nppods; ppod_addr += chunk) {
 
 		/* How many page pods are we writing in this cycle */
 		n = min(prsv->prsv_nppods - i, NUM_ULP_TX_SC_IMM_PPODS);
 		MPASS(n > 0);
 		chunk = PPOD_SZ(n);
 		len = roundup2(sizeof(*ulpmc) + sizeof(*ulpsc) + chunk, 16);
 
 		m = alloc_raw_wr_mbuf(len);
 		if (m == NULL)
 			return (ENOMEM);
 		ulpmc = mtod(m, struct ulp_mem_io *);
 
 		INIT_ULPTX_WR(ulpmc, len, 0, toep->tid);
 		ulpmc->cmd = cmd;
 		ulpmc->dlen = htobe32(V_ULP_MEMIO_DATA_LEN(chunk / 32));
 		ulpmc->len16 = htobe32(howmany(len - sizeof(ulpmc->wr), 16));
 		ulpmc->lock_addr = htobe32(V_ULP_MEMIO_ADDR(ppod_addr >> 5));
 
 		ulpsc = (struct ulptx_idata *)(ulpmc + 1);
 		ulpsc->cmd_more = htobe32(V_ULPTX_CMD(ULP_TX_SC_IMM));
 		ulpsc->len = htobe32(chunk);
 
 		ppod = (struct pagepod *)(ulpsc + 1);
 		for (j = 0; j < n; i++, j++, ppod++) {
 			ppod->vld_tid_pgsz_tag_color = htobe64(F_PPOD_VALID |
 			    V_PPOD_TID(toep->tid) |
 			    (prsv->prsv_tag & ~V_PPOD_PGSZ(M_PPOD_PGSZ)));
 			ppod->len_offset = htobe64(V_PPOD_LEN(buflen) |
 			    V_PPOD_OFST(offset));
 			ppod->rsvd = 0;
 
 			for (k = 0; k < nitems(ppod->addr); k++) {
 				if (pva > end_pva)
 					ppod->addr[k] = 0;
 				else {
 					pa = pmap_kextract(pva);
 					ppod->addr[k] = htobe64(pa);
 					pva += ddp_pgsz;
 				}
 #if 0
 				CTR5(KTR_CXGBE,
 				    "%s: tid %d ppod[%d]->addr[%d] = %p",
 				    __func__, toep->tid, i, k,
 				    be64toh(ppod->addr[k]));
 #endif
 			}
 
 			/*
 			 * Walk back 1 segment so that the first address in the
 			 * next pod is the same as the last one in the current
 			 * pod.
 			 */
 			pva -= ddp_pgsz;
 		}
 
 		mbufq_enqueue(wrq, m);
 	}
 
 	MPASS(pva <= end_pva);
 
 	return (0);
 }
 
 int
 t4_write_page_pods_for_sgl(struct adapter *sc, struct toepcb *toep,
     struct ppod_reservation *prsv, struct ctl_sg_entry *sgl, int entries,
     int xferlen, struct mbufq *wrq)
 {
 	struct ulp_mem_io *ulpmc;
 	struct ulptx_idata *ulpsc;
 	struct pagepod *ppod;
 	int i, j, k, n, chunk, len, ddp_pgsz;
 	u_int ppod_addr, offset, sg_offset = 0;
 	uint32_t cmd;
 	struct ppod_region *pr = prsv->prsv_pr;
 	uintptr_t pva;
 	vm_paddr_t pa;
 	struct mbuf *m;
 
 	MPASS(sgl != NULL);
 	MPASS(entries > 0);
 	cmd = htobe32(V_ULPTX_CMD(ULP_TX_MEM_WRITE));
 	if (is_t4(sc))
 		cmd |= htobe32(F_ULP_MEMIO_ORDER);
 	else
 		cmd |= htobe32(F_T5_ULP_MEMIO_IMM);
 	ddp_pgsz = 1 << pr->pr_page_shift[G_PPOD_PGSZ(prsv->prsv_tag)];
 	offset = (vm_offset_t)sgl->addr & PAGE_MASK;
 	ppod_addr = pr->pr_start + (prsv->prsv_tag & pr->pr_tag_mask);
 	pva = trunc_page((vm_offset_t)sgl->addr);
 	for (i = 0; i < prsv->prsv_nppods; ppod_addr += chunk) {
 
 		/* How many page pods are we writing in this cycle */
 		n = min(prsv->prsv_nppods - i, NUM_ULP_TX_SC_IMM_PPODS);
 		MPASS(n > 0);
 		chunk = PPOD_SZ(n);
 		len = roundup2(sizeof(*ulpmc) + sizeof(*ulpsc) + chunk, 16);
 
 		m = alloc_raw_wr_mbuf(len);
 		if (m == NULL)
 			return (ENOMEM);
 		ulpmc = mtod(m, struct ulp_mem_io *);
 
 		INIT_ULPTX_WR(ulpmc, len, 0, toep->tid);
 		ulpmc->cmd = cmd;
 		ulpmc->dlen = htobe32(V_ULP_MEMIO_DATA_LEN(chunk / 32));
 		ulpmc->len16 = htobe32(howmany(len - sizeof(ulpmc->wr), 16));
 		ulpmc->lock_addr = htobe32(V_ULP_MEMIO_ADDR(ppod_addr >> 5));
 
 		ulpsc = (struct ulptx_idata *)(ulpmc + 1);
 		ulpsc->cmd_more = htobe32(V_ULPTX_CMD(ULP_TX_SC_IMM));
 		ulpsc->len = htobe32(chunk);
 
 		ppod = (struct pagepod *)(ulpsc + 1);
 		for (j = 0; j < n; i++, j++, ppod++) {
 			ppod->vld_tid_pgsz_tag_color = htobe64(F_PPOD_VALID |
 			    V_PPOD_TID(toep->tid) |
 			    (prsv->prsv_tag & ~V_PPOD_PGSZ(M_PPOD_PGSZ)));
 			ppod->len_offset = htobe64(V_PPOD_LEN(xferlen) |
 			    V_PPOD_OFST(offset));
 			ppod->rsvd = 0;
 
 			for (k = 0; k < nitems(ppod->addr); k++) {
 				if (entries != 0) {
 					pa = pmap_kextract(pva + sg_offset);
 					ppod->addr[k] = htobe64(pa);
 				} else
 					ppod->addr[k] = 0;
 
 #if 0
 				CTR5(KTR_CXGBE,
 				    "%s: tid %d ppod[%d]->addr[%d] = %p",
 				    __func__, toep->tid, i, k,
 				    be64toh(ppod->addr[k]));
 #endif
 
 				/*
 				 * If this is the last entry in a pod,
 				 * reuse the same entry for first address
 				 * in the next pod.
 				 */
 				if (k + 1 == nitems(ppod->addr))
 					break;
 
 				/*
 				 * Don't move to the next DDP page if the
 				 * sgl is already finished.
 				 */
 				if (entries == 0)
 					continue;
 
 				sg_offset += ddp_pgsz;
 				if (sg_offset == sgl->len) {
 					/*
 					 * This sgl entry is done.  Go
 					 * to the next.
 					 */
 					entries--;
 					sgl++;
 					sg_offset = 0;
 					if (entries != 0)
 						pva = trunc_page(
 						    (vm_offset_t)sgl->addr);
 				}
 			}
 		}
 
 		mbufq_enqueue(wrq, m);
 	}
 
 	return (0);
 }
 
 /*
  * Prepare a pageset for DDP.  This sets up page pods.
  */
 static int
 prep_pageset(struct adapter *sc, struct toepcb *toep, struct pageset *ps)
 {
 	struct tom_data *td = sc->tom_softc;
 
 	if (ps->prsv.prsv_nppods == 0 &&
 	    t4_alloc_page_pods_for_ps(&td->pr, ps) != 0) {
 		return (0);
 	}
 	if (!(ps->flags & PS_PPODS_WRITTEN) &&
 	    t4_write_page_pods_for_ps(sc, toep->ctrlq, toep->tid, ps) != 0) {
 		return (0);
 	}
 
 	return (1);
 }
 
 int
 t4_init_ppod_region(struct ppod_region *pr, struct t4_range *r, u_int psz,
     const char *name)
 {
 	int i;
 
 	MPASS(pr != NULL);
 	MPASS(r->size > 0);
 
 	pr->pr_start = r->start;
 	pr->pr_len = r->size;
 	pr->pr_page_shift[0] = 12 + G_HPZ0(psz);
 	pr->pr_page_shift[1] = 12 + G_HPZ1(psz);
 	pr->pr_page_shift[2] = 12 + G_HPZ2(psz);
 	pr->pr_page_shift[3] = 12 + G_HPZ3(psz);
 
 	/* The SGL -> page pod algorithm requires the sizes to be in order. */
 	for (i = 1; i < nitems(pr->pr_page_shift); i++) {
 		if (pr->pr_page_shift[i] <= pr->pr_page_shift[i - 1])
 			return (ENXIO);
 	}
 
 	pr->pr_tag_mask = ((1 << fls(r->size)) - 1) & V_PPOD_TAG(M_PPOD_TAG);
 	pr->pr_alias_mask = V_PPOD_TAG(M_PPOD_TAG) & ~pr->pr_tag_mask;
 	if (pr->pr_tag_mask == 0 || pr->pr_alias_mask == 0)
 		return (ENXIO);
 	pr->pr_alias_shift = fls(pr->pr_tag_mask);
 	pr->pr_invalid_bit = 1 << (pr->pr_alias_shift - 1);
 
 	pr->pr_arena = vmem_create(name, 0, pr->pr_len, PPOD_SIZE, 0,
 	    M_FIRSTFIT | M_NOWAIT);
 	if (pr->pr_arena == NULL)
 		return (ENOMEM);
 
 	return (0);
 }
 
 void
 t4_free_ppod_region(struct ppod_region *pr)
 {
 
 	MPASS(pr != NULL);
 
 	if (pr->pr_arena)
 		vmem_destroy(pr->pr_arena);
 	bzero(pr, sizeof(*pr));
 }
 
 static int
 pscmp(struct pageset *ps, struct vmspace *vm, vm_offset_t start, int npages,
     int pgoff, int len)
 {
 
 	if (ps->start != start || ps->npages != npages ||
 	    ps->offset != pgoff || ps->len != len)
 		return (1);
 
 	return (ps->vm != vm || ps->vm_timestamp != vm->vm_map.timestamp);
 }
 
 static int
 hold_aio(struct toepcb *toep, struct kaiocb *job, struct pageset **pps)
 {
 	struct vmspace *vm;
 	vm_map_t map;
 	vm_offset_t start, end, pgoff;
 	struct pageset *ps;
 	int n;
 
 	DDP_ASSERT_LOCKED(toep);
 
 	/*
 	 * The AIO subsystem will cancel and drain all requests before
 	 * permitting a process to exit or exec, so p_vmspace should
 	 * be stable here.
 	 */
 	vm = job->userproc->p_vmspace;
 	map = &vm->vm_map;
 	start = (uintptr_t)job->uaiocb.aio_buf;
 	pgoff = start & PAGE_MASK;
 	end = round_page(start + job->uaiocb.aio_nbytes);
 	start = trunc_page(start);
 
 	if (end - start > MAX_DDP_BUFFER_SIZE) {
 		/*
 		 * Truncate the request to a short read.
 		 * Alternatively, we could DDP in chunks to the larger
 		 * buffer, but that would be quite a bit more work.
 		 *
 		 * When truncating, round the request down to avoid
 		 * crossing a cache line on the final transaction.
 		 */
 		end = rounddown2(start + MAX_DDP_BUFFER_SIZE, CACHE_LINE_SIZE);
 #ifdef VERBOSE_TRACES
 		CTR4(KTR_CXGBE, "%s: tid %d, truncating size from %lu to %lu",
 		    __func__, toep->tid, (unsigned long)job->uaiocb.aio_nbytes,
 		    (unsigned long)(end - (start + pgoff)));
 		job->uaiocb.aio_nbytes = end - (start + pgoff);
 #endif
 		end = round_page(end);
 	}
 
 	n = atop(end - start);
 
 	/*
 	 * Try to reuse a cached pageset.
 	 */
 	TAILQ_FOREACH(ps, &toep->ddp.cached_pagesets, link) {
 		if (pscmp(ps, vm, start, n, pgoff,
 		    job->uaiocb.aio_nbytes) == 0) {
 			TAILQ_REMOVE(&toep->ddp.cached_pagesets, ps, link);
 			toep->ddp.cached_count--;
 			*pps = ps;
 			return (0);
 		}
 	}
 
 	/*
 	 * If there are too many cached pagesets to create a new one,
 	 * free a pageset before creating a new one.
 	 */
 	KASSERT(toep->ddp.active_count + toep->ddp.cached_count <=
 	    nitems(toep->ddp.db), ("%s: too many wired pagesets", __func__));
 	if (toep->ddp.active_count + toep->ddp.cached_count ==
 	    nitems(toep->ddp.db)) {
 		KASSERT(toep->ddp.cached_count > 0,
 		    ("no cached pageset to free"));
 		ps = TAILQ_LAST(&toep->ddp.cached_pagesets, pagesetq);
 		TAILQ_REMOVE(&toep->ddp.cached_pagesets, ps, link);
 		toep->ddp.cached_count--;
 		free_pageset(toep->td, ps);
 	}
 	DDP_UNLOCK(toep);
 
 	/* Create a new pageset. */
 	ps = malloc(sizeof(*ps) + n * sizeof(vm_page_t), M_CXGBE, M_WAITOK |
 	    M_ZERO);
 	ps->pages = (vm_page_t *)(ps + 1);
 	ps->vm_timestamp = map->timestamp;
 	ps->npages = vm_fault_quick_hold_pages(map, start, end - start,
 	    VM_PROT_WRITE, ps->pages, n);
 
 	DDP_LOCK(toep);
 	if (ps->npages < 0) {
 		free(ps, M_CXGBE);
 		return (EFAULT);
 	}
 
 	KASSERT(ps->npages == n, ("hold_aio: page count mismatch: %d vs %d",
 	    ps->npages, n));
 
 	ps->offset = pgoff;
 	ps->len = job->uaiocb.aio_nbytes;
 	refcount_acquire(&vm->vm_refcnt);
 	ps->vm = vm;
 	ps->start = start;
 
 	CTR5(KTR_CXGBE, "%s: tid %d, new pageset %p for job %p, npages %d",
 	    __func__, toep->tid, ps, job, ps->npages);
 	*pps = ps;
 	return (0);
 }
 
 static void
 ddp_complete_all(struct toepcb *toep, int error)
 {
 	struct kaiocb *job;
 
 	DDP_ASSERT_LOCKED(toep);
 	KASSERT((toep->ddp.flags & DDP_AIO) != 0, ("%s: DDP_RCVBUF", __func__));
 	while (!TAILQ_EMPTY(&toep->ddp.aiojobq)) {
 		job = TAILQ_FIRST(&toep->ddp.aiojobq);
 		TAILQ_REMOVE(&toep->ddp.aiojobq, job, list);
 		toep->ddp.waiting_count--;
 		if (aio_clear_cancel_function(job))
 			ddp_complete_one(job, error);
 	}
 }
 
 static void
 aio_ddp_cancel_one(struct kaiocb *job)
 {
 	long copied;
 
 	/*
 	 * If this job had copied data out of the socket buffer before
 	 * it was cancelled, report it as a short read rather than an
 	 * error.
 	 */
 	copied = job->aio_received;
 	if (copied != 0)
 		aio_complete(job, copied, 0);
 	else
 		aio_cancel(job);
 }
 
 /*
  * Called when the main loop wants to requeue a job to retry it later.
  * Deals with the race of the job being cancelled while it was being
  * examined.
  */
 static void
 aio_ddp_requeue_one(struct toepcb *toep, struct kaiocb *job)
 {
 
 	DDP_ASSERT_LOCKED(toep);
 	if (!(toep->ddp.flags & DDP_DEAD) &&
 	    aio_set_cancel_function(job, t4_aio_cancel_queued)) {
 		TAILQ_INSERT_HEAD(&toep->ddp.aiojobq, job, list);
 		toep->ddp.waiting_count++;
 	} else
 		aio_ddp_cancel_one(job);
 }
 
 static void
 aio_ddp_requeue(struct toepcb *toep)
 {
 	struct adapter *sc = td_adapter(toep->td);
 	struct socket *so;
 	struct sockbuf *sb;
 	struct inpcb *inp;
 	struct kaiocb *job;
 	struct ddp_buffer *db;
 	size_t copied, offset, resid;
 	struct pageset *ps;
 	struct mbuf *m;
 	uint64_t ddp_flags, ddp_flags_mask;
 	struct wrqe *wr;
 	int buf_flag, db_idx, error;
 
 	DDP_ASSERT_LOCKED(toep);
 
 restart:
 	if (toep->ddp.flags & DDP_DEAD) {
 		MPASS(toep->ddp.waiting_count == 0);
 		MPASS(toep->ddp.active_count == 0);
 		return;
 	}
 
 	if (toep->ddp.waiting_count == 0 ||
 	    toep->ddp.active_count == nitems(toep->ddp.db)) {
 		return;
 	}
 
 	job = TAILQ_FIRST(&toep->ddp.aiojobq);
 	so = job->fd_file->f_data;
 	sb = &so->so_rcv;
 	SOCKBUF_LOCK(sb);
 
 	/* We will never get anything unless we are or were connected. */
 	if (!(so->so_state & (SS_ISCONNECTED|SS_ISDISCONNECTED))) {
 		SOCKBUF_UNLOCK(sb);
 		ddp_complete_all(toep, ENOTCONN);
 		return;
 	}
 
 	KASSERT(toep->ddp.active_count == 0 || sbavail(sb) == 0,
 	    ("%s: pending sockbuf data and DDP is active", __func__));
 
 	/* Abort if socket has reported problems. */
 	/* XXX: Wait for any queued DDP's to finish and/or flush them? */
 	if (so->so_error && sbavail(sb) == 0) {
 		toep->ddp.waiting_count--;
 		TAILQ_REMOVE(&toep->ddp.aiojobq, job, list);
 		if (!aio_clear_cancel_function(job)) {
 			SOCKBUF_UNLOCK(sb);
 			goto restart;
 		}
 
 		/*
 		 * If this job has previously copied some data, report
 		 * a short read and leave the error to be reported by
 		 * a future request.
 		 */
 		copied = job->aio_received;
 		if (copied != 0) {
 			SOCKBUF_UNLOCK(sb);
 			aio_complete(job, copied, 0);
 			goto restart;
 		}
 		error = so->so_error;
 		so->so_error = 0;
 		SOCKBUF_UNLOCK(sb);
 		aio_complete(job, -1, error);
 		goto restart;
 	}
 
 	/*
 	 * Door is closed.  If there is pending data in the socket buffer,
 	 * deliver it.  If there are pending DDP requests, wait for those
 	 * to complete.  Once they have completed, return EOF reads.
 	 */
 	if (sb->sb_state & SBS_CANTRCVMORE && sbavail(sb) == 0) {
 		SOCKBUF_UNLOCK(sb);
 		if (toep->ddp.active_count != 0)
 			return;
 		ddp_complete_all(toep, 0);
 		return;
 	}
 
 	/*
 	 * If DDP is not enabled and there is no pending socket buffer
 	 * data, try to enable DDP.
 	 */
 	if (sbavail(sb) == 0 && (toep->ddp.flags & DDP_ON) == 0) {
 		SOCKBUF_UNLOCK(sb);
 
 		/*
 		 * Wait for the card to ACK that DDP is enabled before
 		 * queueing any buffers.  Currently this waits for an
 		 * indicate to arrive.  This could use a TCB_SET_FIELD_RPL
 		 * message to know that DDP was enabled instead of waiting
 		 * for the indicate which would avoid copying the indicate
 		 * if no data is pending.
 		 *
 		 * XXX: Might want to limit the indicate size to the size
 		 * of the first queued request.
 		 */
 		if ((toep->ddp.flags & DDP_SC_REQ) == 0)
 			enable_ddp(sc, toep);
 		return;
 	}
 	SOCKBUF_UNLOCK(sb);
 
 	/*
 	 * If another thread is queueing a buffer for DDP, let it
 	 * drain any work and return.
 	 */
 	if (toep->ddp.queueing != NULL)
 		return;
 
 	/* Take the next job to prep it for DDP. */
 	toep->ddp.waiting_count--;
 	TAILQ_REMOVE(&toep->ddp.aiojobq, job, list);
 	if (!aio_clear_cancel_function(job))
 		goto restart;
 	toep->ddp.queueing = job;
 
 	/* NB: This drops DDP_LOCK while it holds the backing VM pages. */
 	error = hold_aio(toep, job, &ps);
 	if (error != 0) {
 		ddp_complete_one(job, error);
 		toep->ddp.queueing = NULL;
 		goto restart;
 	}
 
 	SOCKBUF_LOCK(sb);
 	if (so->so_error && sbavail(sb) == 0) {
 		copied = job->aio_received;
 		if (copied != 0) {
 			SOCKBUF_UNLOCK(sb);
 			recycle_pageset(toep, ps);
 			aio_complete(job, copied, 0);
 			toep->ddp.queueing = NULL;
 			goto restart;
 		}
 
 		error = so->so_error;
 		so->so_error = 0;
 		SOCKBUF_UNLOCK(sb);
 		recycle_pageset(toep, ps);
 		aio_complete(job, -1, error);
 		toep->ddp.queueing = NULL;
 		goto restart;
 	}
 
 	if (sb->sb_state & SBS_CANTRCVMORE && sbavail(sb) == 0) {
 		SOCKBUF_UNLOCK(sb);
 		recycle_pageset(toep, ps);
 		if (toep->ddp.active_count != 0) {
 			/*
 			 * The door is closed, but there are still pending
 			 * DDP buffers.  Requeue.  These jobs will all be
 			 * completed once those buffers drain.
 			 */
 			aio_ddp_requeue_one(toep, job);
 			toep->ddp.queueing = NULL;
 			return;
 		}
 		ddp_complete_one(job, 0);
 		ddp_complete_all(toep, 0);
 		toep->ddp.queueing = NULL;
 		return;
 	}
 
 sbcopy:
 	/*
 	 * If the toep is dead, there shouldn't be any data in the socket
 	 * buffer, so the above case should have handled this.
 	 */
 	MPASS(!(toep->ddp.flags & DDP_DEAD));
 
 	/*
 	 * If there is pending data in the socket buffer (either
 	 * from before the requests were queued or a DDP indicate),
 	 * copy those mbufs out directly.
 	 */
 	copied = 0;
 	offset = ps->offset + job->aio_received;
 	MPASS(job->aio_received <= job->uaiocb.aio_nbytes);
 	resid = job->uaiocb.aio_nbytes - job->aio_received;
 	m = sb->sb_mb;
 	KASSERT(m == NULL || toep->ddp.active_count == 0,
 	    ("%s: sockbuf data with active DDP", __func__));
 	while (m != NULL && resid > 0) {
 		struct iovec iov[1];
 		struct uio uio;
 #ifdef INVARIANTS
 		int error;
 #endif
 
 		iov[0].iov_base = mtod(m, void *);
 		iov[0].iov_len = m->m_len;
 		if (iov[0].iov_len > resid)
 			iov[0].iov_len = resid;
 		uio.uio_iov = iov;
 		uio.uio_iovcnt = 1;
 		uio.uio_offset = 0;
 		uio.uio_resid = iov[0].iov_len;
 		uio.uio_segflg = UIO_SYSSPACE;
 		uio.uio_rw = UIO_WRITE;
 #ifdef INVARIANTS
 		error = uiomove_fromphys(ps->pages, offset + copied,
 		    uio.uio_resid, &uio);
 #else
 		uiomove_fromphys(ps->pages, offset + copied, uio.uio_resid, &uio);
 #endif
 		MPASS(error == 0 && uio.uio_resid == 0);
 		copied += uio.uio_offset;
 		resid -= uio.uio_offset;
 		m = m->m_next;
 	}
 	if (copied != 0) {
 		sbdrop_locked(sb, copied);
 		job->aio_received += copied;
 		job->msgrcv = 1;
 		copied = job->aio_received;
 		inp = sotoinpcb(so);
 		if (!INP_TRY_WLOCK(inp)) {
 			/*
 			 * The reference on the socket file descriptor in
 			 * the AIO job should keep 'sb' and 'inp' stable.
 			 * Our caller has a reference on the 'toep' that
 			 * keeps it stable.
 			 */
 			SOCKBUF_UNLOCK(sb);
 			DDP_UNLOCK(toep);
 			INP_WLOCK(inp);
 			DDP_LOCK(toep);
 			SOCKBUF_LOCK(sb);
 
 			/*
 			 * If the socket has been closed, we should detect
 			 * that and complete this request if needed on
 			 * the next trip around the loop.
 			 */
 		}
 		t4_rcvd_locked(&toep->td->tod, intotcpcb(inp));
 		INP_WUNLOCK(inp);
 		if (resid == 0 || toep->ddp.flags & DDP_DEAD) {
 			/*
 			 * We filled the entire buffer with socket
 			 * data, DDP is not being used, or the socket
 			 * is being shut down, so complete the
 			 * request.
 			 */
 			SOCKBUF_UNLOCK(sb);
 			recycle_pageset(toep, ps);
 			aio_complete(job, copied, 0);
 			toep->ddp.queueing = NULL;
 			goto restart;
 		}
 
 		/*
 		 * If DDP is not enabled, requeue this request and restart.
 		 * This will either enable DDP or wait for more data to
 		 * arrive on the socket buffer.
 		 */
 		if ((toep->ddp.flags & (DDP_ON | DDP_SC_REQ)) != DDP_ON) {
 			SOCKBUF_UNLOCK(sb);
 			recycle_pageset(toep, ps);
 			aio_ddp_requeue_one(toep, job);
 			toep->ddp.queueing = NULL;
 			goto restart;
 		}
 
 		/*
 		 * An indicate might have arrived and been added to
 		 * the socket buffer while it was unlocked after the
 		 * copy to lock the INP.  If so, restart the copy.
 		 */
 		if (sbavail(sb) != 0)
 			goto sbcopy;
 	}
 	SOCKBUF_UNLOCK(sb);
 
 	if (prep_pageset(sc, toep, ps) == 0) {
 		recycle_pageset(toep, ps);
 		aio_ddp_requeue_one(toep, job);
 		toep->ddp.queueing = NULL;
 
 		/*
 		 * XXX: Need to retry this later.  Mostly need a trigger
 		 * when page pods are freed up.
 		 */
 		printf("%s: prep_pageset failed\n", __func__);
 		return;
 	}
 
 	/* Determine which DDP buffer to use. */
 	if (toep->ddp.db[0].job == NULL) {
 		db_idx = 0;
 	} else {
 		MPASS(toep->ddp.db[1].job == NULL);
 		db_idx = 1;
 	}
 
 	ddp_flags = 0;
 	ddp_flags_mask = 0;
 	if (db_idx == 0) {
 		ddp_flags |= V_TF_DDP_BUF0_VALID(1);
 		if (so->so_state & SS_NBIO)
 			ddp_flags |= V_TF_DDP_BUF0_FLUSH(1);
 		ddp_flags_mask |= V_TF_DDP_PSH_NO_INVALIDATE0(1) |
 		    V_TF_DDP_PUSH_DISABLE_0(1) | V_TF_DDP_PSHF_ENABLE_0(1) |
 		    V_TF_DDP_BUF0_FLUSH(1) | V_TF_DDP_BUF0_VALID(1);
 		buf_flag = DDP_BUF0_ACTIVE;
 	} else {
 		ddp_flags |= V_TF_DDP_BUF1_VALID(1);
 		if (so->so_state & SS_NBIO)
 			ddp_flags |= V_TF_DDP_BUF1_FLUSH(1);
 		ddp_flags_mask |= V_TF_DDP_PSH_NO_INVALIDATE1(1) |
 		    V_TF_DDP_PUSH_DISABLE_1(1) | V_TF_DDP_PSHF_ENABLE_1(1) |
 		    V_TF_DDP_BUF1_FLUSH(1) | V_TF_DDP_BUF1_VALID(1);
 		buf_flag = DDP_BUF1_ACTIVE;
 	}
 	MPASS((toep->ddp.flags & buf_flag) == 0);
 	if ((toep->ddp.flags & (DDP_BUF0_ACTIVE | DDP_BUF1_ACTIVE)) == 0) {
 		MPASS(db_idx == 0);
 		MPASS(toep->ddp.active_id == -1);
 		MPASS(toep->ddp.active_count == 0);
 		ddp_flags_mask |= V_TF_DDP_ACTIVE_BUF(1);
 	}
 
 	/*
 	 * The TID for this connection should still be valid.  If DDP_DEAD
 	 * is set, SBS_CANTRCVMORE should be set, so we shouldn't be
 	 * this far anyway.  Even if the socket is closing on the other
 	 * end, the AIO job holds a reference on this end of the socket
 	 * which will keep it open and keep the TCP PCB attached until
 	 * after the job is completed.
 	 */
 	wr = mk_update_tcb_for_ddp(sc, toep, db_idx, &ps->prsv, ps->len,
 	    job->aio_received, ddp_flags, ddp_flags_mask);
 	if (wr == NULL) {
 		recycle_pageset(toep, ps);
 		aio_ddp_requeue_one(toep, job);
 		toep->ddp.queueing = NULL;
 
 		/*
 		 * XXX: Need a way to kick a retry here.
 		 *
 		 * XXX: We know the fixed size needed and could
 		 * preallocate this using a blocking request at the
 		 * start of the task to avoid having to handle this
 		 * edge case.
 		 */
 		printf("%s: mk_update_tcb_for_ddp failed\n", __func__);
 		return;
 	}
 
 	if (!aio_set_cancel_function(job, t4_aio_cancel_active)) {
 		free_wrqe(wr);
 		recycle_pageset(toep, ps);
 		aio_ddp_cancel_one(job);
 		toep->ddp.queueing = NULL;
 		goto restart;
 	}
 
 #ifdef VERBOSE_TRACES
 	CTR6(KTR_CXGBE,
 	    "%s: tid %u, scheduling %p for DDP[%d] (flags %#lx/%#lx)", __func__,
 	    toep->tid, job, db_idx, ddp_flags, ddp_flags_mask);
 #endif
 	/* Give the chip the go-ahead. */
 	t4_wrq_tx(sc, wr);
 	db = &toep->ddp.db[db_idx];
 	db->cancel_pending = 0;
 	db->job = job;
 	db->ps = ps;
 	toep->ddp.queueing = NULL;
 	toep->ddp.flags |= buf_flag;
 	toep->ddp.active_count++;
 	if (toep->ddp.active_count == 1) {
 		MPASS(toep->ddp.active_id == -1);
 		toep->ddp.active_id = db_idx;
 		CTR2(KTR_CXGBE, "%s: ddp_active_id = %d", __func__,
 		    toep->ddp.active_id);
 	}
 	goto restart;
 }
 
 void
 ddp_queue_toep(struct toepcb *toep)
 {
 
 	DDP_ASSERT_LOCKED(toep);
 	if (toep->ddp.flags & DDP_TASK_ACTIVE)
 		return;
 	toep->ddp.flags |= DDP_TASK_ACTIVE;
 	hold_toepcb(toep);
 	soaio_enqueue(&toep->ddp.requeue_task);
 }
 
 static void
 aio_ddp_requeue_task(void *context, int pending)
 {
 	struct toepcb *toep = context;
 
 	DDP_LOCK(toep);
 	aio_ddp_requeue(toep);
 	toep->ddp.flags &= ~DDP_TASK_ACTIVE;
 	DDP_UNLOCK(toep);
 
 	free_toepcb(toep);
 }
 
 static void
 t4_aio_cancel_active(struct kaiocb *job)
 {
 	struct socket *so = job->fd_file->f_data;
 	struct tcpcb *tp = sototcpcb(so);
 	struct toepcb *toep = tp->t_toe;
 	struct adapter *sc = td_adapter(toep->td);
 	uint64_t valid_flag;
 	int i;
 
 	DDP_LOCK(toep);
 	if (aio_cancel_cleared(job)) {
 		DDP_UNLOCK(toep);
 		aio_ddp_cancel_one(job);
 		return;
 	}
 
 	for (i = 0; i < nitems(toep->ddp.db); i++) {
 		if (toep->ddp.db[i].job == job) {
 			/* Should only ever get one cancel request for a job. */
 			MPASS(toep->ddp.db[i].cancel_pending == 0);
 
 			/*
 			 * Invalidate this buffer.  It will be
 			 * cancelled or partially completed once the
 			 * card ACKs the invalidate.
 			 */
 			valid_flag = i == 0 ? V_TF_DDP_BUF0_VALID(1) :
 			    V_TF_DDP_BUF1_VALID(1);
 			t4_set_tcb_field(sc, toep->ctrlq, toep,
 			    W_TCB_RX_DDP_FLAGS, valid_flag, 0, 1,
 			    CPL_COOKIE_DDP0 + i);
 			toep->ddp.db[i].cancel_pending = 1;
 			CTR2(KTR_CXGBE, "%s: request %p marked pending",
 			    __func__, job);
 			break;
 		}
 	}
 	DDP_UNLOCK(toep);
 }
 
 static void
 t4_aio_cancel_queued(struct kaiocb *job)
 {
 	struct socket *so = job->fd_file->f_data;
 	struct tcpcb *tp = sototcpcb(so);
 	struct toepcb *toep = tp->t_toe;
 
 	DDP_LOCK(toep);
 	if (!aio_cancel_cleared(job)) {
 		TAILQ_REMOVE(&toep->ddp.aiojobq, job, list);
 		toep->ddp.waiting_count--;
 		if (toep->ddp.waiting_count == 0)
 			ddp_queue_toep(toep);
 	}
 	CTR2(KTR_CXGBE, "%s: request %p cancelled", __func__, job);
 	DDP_UNLOCK(toep);
 
 	aio_ddp_cancel_one(job);
 }
 
 int
 t4_aio_queue_ddp(struct socket *so, struct kaiocb *job)
 {
 	struct inpcb *inp = sotoinpcb(so);
 	struct tcpcb *tp = intotcpcb(inp);
 	struct toepcb *toep = tp->t_toe;
 
 	/* Ignore writes. */
 	if (job->uaiocb.aio_lio_opcode != LIO_READ)
 		return (EOPNOTSUPP);
 
 	INP_WLOCK(inp);
 	if (__predict_false(ulp_mode(toep) == ULP_MODE_NONE)) {
 		if (!set_ddp_ulp_mode(toep)) {
 			INP_WUNLOCK(inp);
 			return (EOPNOTSUPP);
 		}
 	}
 	INP_WUNLOCK(inp);
 
 	DDP_LOCK(toep);
 
 	/*
 	 * If DDP is being used for all normal receive, don't use it
 	 * for AIO.
 	 */
 	if ((toep->ddp.flags & DDP_RCVBUF) != 0) {
 		DDP_UNLOCK(toep);
 		return (EOPNOTSUPP);
 	}
 
 	/*
 	 * XXX: Think about possibly returning errors for ENOTCONN,
 	 * etc.  Perhaps the caller would only queue the request
 	 * if it failed with EOPNOTSUPP?
 	 */
 
 #ifdef VERBOSE_TRACES
 	CTR3(KTR_CXGBE, "%s: queueing %p for tid %u", __func__, job, toep->tid);
 #endif
 	if (!aio_set_cancel_function(job, t4_aio_cancel_queued))
 		panic("new job was cancelled");
 	TAILQ_INSERT_TAIL(&toep->ddp.aiojobq, job, list);
 	toep->ddp.waiting_count++;
 
 	if ((toep->ddp.flags & DDP_AIO) == 0) {
 		toep->ddp.flags |= DDP_AIO;
 		TAILQ_INIT(&toep->ddp.cached_pagesets);
 		TAILQ_INIT(&toep->ddp.aiojobq);
 		TASK_INIT(&toep->ddp.requeue_task, 0, aio_ddp_requeue_task,
 		    toep);
 	}
 
 	/*
 	 * Try to handle this request synchronously.  If this has
 	 * to block because the task is running, it will just bail
 	 * and let the task handle it instead.
 	 */
 	aio_ddp_requeue(toep);
 	DDP_UNLOCK(toep);
 	return (0);
 }
 
 static void
 ddp_rcvbuf_requeue(struct toepcb *toep)
 {
 	struct socket *so;
 	struct sockbuf *sb;
 	struct inpcb *inp;
 	struct ddp_rcv_buffer *drb;
 
 	DDP_ASSERT_LOCKED(toep);
 restart:
 	if ((toep->ddp.flags & DDP_DEAD) != 0) {
 		MPASS(toep->ddp.active_count == 0);
 		return;
 	}
 
 	/* If both buffers are active, nothing to do. */
 	if (toep->ddp.active_count == nitems(toep->ddp.db)) {
 		return;
 	}
 
 	inp = toep->inp;
 	so = inp->inp_socket;
 	sb = &so->so_rcv;
 
 	drb = alloc_cached_ddp_rcv_buffer(toep);
 	DDP_UNLOCK(toep);
 
 	if (drb == NULL) {
 		drb = alloc_ddp_rcv_buffer(toep, M_WAITOK);
 		if (drb == NULL) {
 			printf("%s: failed to allocate buffer\n", __func__);
 			DDP_LOCK(toep);
 			return;
 		}
 	}
 
 	DDP_LOCK(toep);
 	if ((toep->ddp.flags & DDP_DEAD) != 0 ||
 	    toep->ddp.active_count == nitems(toep->ddp.db)) {
 		recycle_ddp_rcv_buffer(toep, drb);
 		return;
 	}
 
 	/* We will never get anything unless we are or were connected. */
 	SOCKBUF_LOCK(sb);
 	if (!(so->so_state & (SS_ISCONNECTED|SS_ISDISCONNECTED))) {
 		SOCKBUF_UNLOCK(sb);
 		recycle_ddp_rcv_buffer(toep, drb);
 		return;
 	}
 
 	/* Abort if socket has reported problems or is closed. */
 	if (so->so_error != 0 || (sb->sb_state & SBS_CANTRCVMORE) != 0) {
 		SOCKBUF_UNLOCK(sb);
 		recycle_ddp_rcv_buffer(toep, drb);
 		return;
 	}
 	SOCKBUF_UNLOCK(sb);
 
 	if (!queue_ddp_rcvbuf(toep, drb)) {
 		/*
 		 * XXX: Need a way to kick a retry here.
 		 *
 		 * XXX: We know the fixed size needed and could
 		 * preallocate the work request using a blocking
 		 * request at the start of the task to avoid having to
 		 * handle this edge case.
 		 */
 		return;
 	}
 	goto restart;
 }
 
 static void
 ddp_rcvbuf_requeue_task(void *context, int pending)
 {
 	struct toepcb *toep = context;
 
 	DDP_LOCK(toep);
 	ddp_rcvbuf_requeue(toep);
 	toep->ddp.flags &= ~DDP_TASK_ACTIVE;
 	DDP_UNLOCK(toep);
 
 	free_toepcb(toep);
 }
 
 int
 t4_enable_ddp_rcv(struct socket *so, struct toepcb *toep)
 {
 	struct inpcb *inp = sotoinpcb(so);
 	struct adapter *sc = td_adapter(toep->td);
 
 	INP_WLOCK(inp);
 	switch (ulp_mode(toep)) {
 	case ULP_MODE_TCPDDP:
 		break;
 	case ULP_MODE_NONE:
 		if (set_ddp_ulp_mode(toep))
 			break;
 		/* FALLTHROUGH */
 	default:
 		INP_WUNLOCK(inp);
 		return (EOPNOTSUPP);
 	}
 	INP_WUNLOCK(inp);
 
 	DDP_LOCK(toep);
 
 	/*
 	 * If DDP is being used for AIO already, don't use it for
 	 * normal receive.
 	 */
 	if ((toep->ddp.flags & DDP_AIO) != 0) {
 		DDP_UNLOCK(toep);
 		return (EOPNOTSUPP);
 	}
 
 	if ((toep->ddp.flags & DDP_RCVBUF) != 0) {
 		DDP_UNLOCK(toep);
 		return (EBUSY);
 	}
 
 	toep->ddp.flags |= DDP_RCVBUF;
 	TAILQ_INIT(&toep->ddp.cached_buffers);
 	enable_ddp(sc, toep);
 	TASK_INIT(&toep->ddp.requeue_task, 0, ddp_rcvbuf_requeue_task, toep);
 	ddp_queue_toep(toep);
 	DDP_UNLOCK(toep);
 	return (0);
 }
 
 void
 t4_ddp_mod_load(void)
 {
 	if (t4_ddp_rcvbuf_len < PAGE_SIZE)
 		t4_ddp_rcvbuf_len = PAGE_SIZE;
 	if (t4_ddp_rcvbuf_len > MAX_DDP_BUFFER_SIZE)
 		t4_ddp_rcvbuf_len = MAX_DDP_BUFFER_SIZE;
 	if (!powerof2(t4_ddp_rcvbuf_len))
 		t4_ddp_rcvbuf_len = 1 << fls(t4_ddp_rcvbuf_len);
 
 	t4_register_shared_cpl_handler(CPL_SET_TCB_RPL, do_ddp_tcb_rpl,
 	    CPL_COOKIE_DDP0);
 	t4_register_shared_cpl_handler(CPL_SET_TCB_RPL, do_ddp_tcb_rpl,
 	    CPL_COOKIE_DDP1);
 	t4_register_cpl_handler(CPL_RX_DATA_DDP, do_rx_data_ddp);
 	t4_register_cpl_handler(CPL_RX_DDP_COMPLETE, do_rx_ddp_complete);
 	TAILQ_INIT(&ddp_orphan_pagesets);
 	mtx_init(&ddp_orphan_pagesets_lock, "ddp orphans", NULL, MTX_DEF);
 	TASK_INIT(&ddp_orphan_task, 0, ddp_free_orphan_pagesets, NULL);
 }
 
 void
 t4_ddp_mod_unload(void)
 {
 
 	taskqueue_drain(taskqueue_thread, &ddp_orphan_task);
 	MPASS(TAILQ_EMPTY(&ddp_orphan_pagesets));
 	mtx_destroy(&ddp_orphan_pagesets_lock);
 	t4_register_shared_cpl_handler(CPL_SET_TCB_RPL, NULL, CPL_COOKIE_DDP0);
 	t4_register_shared_cpl_handler(CPL_SET_TCB_RPL, NULL, CPL_COOKIE_DDP1);
 	t4_register_cpl_handler(CPL_RX_DATA_DDP, NULL);
 	t4_register_cpl_handler(CPL_RX_DDP_COMPLETE, NULL);
 }
 #endif
diff --git a/sys/dev/dcons/dcons_os.c b/sys/dev/dcons/dcons_os.c
index 0d96ab51659b..4e34659fb3e8 100644
--- a/sys/dev/dcons/dcons_os.c
+++ b/sys/dev/dcons/dcons_os.c
@@ -1,513 +1,513 @@
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
  *
  * Copyright (C) 2003,2004
  * 	Hidetoshi Shimokawa. 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.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *
  *	This product includes software developed by Hidetoshi Shimokawa.
  *
  * 4. Neither the name of the author nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 #include <sys/eventhandler.h>
 #include <sys/kdb.h>
 #include <gdb/gdb.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/cons.h>
 #include <sys/consio.h>
 #include <sys/tty.h>
 #include <sys/malloc.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/ucred.h>
 
 #include <machine/atomic.h>
 #include <machine/bus.h>
 
 #include <dev/dcons/dcons.h>
 #include <dev/dcons/dcons_os.h>
 
 #include <ddb/ddb.h>
 #include <sys/reboot.h>
 
 #include <sys/sysctl.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
 #include "opt_dcons.h"
 #include "opt_kdb.h"
 #include "opt_gdb.h"
 #include "opt_ddb.h"
 
 
 #ifndef DCONS_POLL_HZ
 #define DCONS_POLL_HZ	25
 #endif
 
 #ifndef DCONS_POLL_IDLE
 #define DCONS_POLL_IDLE	256
 #endif
 
 #ifndef DCONS_BUF_SIZE
 #define DCONS_BUF_SIZE (16*1024)
 #endif
 
 #ifndef DCONS_FORCE_CONSOLE
 #define DCONS_FORCE_CONSOLE	0	/* Mostly for FreeBSD-4/DragonFly */
 #endif
 
 #ifndef KLD_MODULE
 static char bssbuf[DCONS_BUF_SIZE];	/* buf in bss */
 #endif
 
 /* global data */
 static struct dcons_global dg;
 struct dcons_global *dcons_conf;
 static int poll_hz = DCONS_POLL_HZ;
 static u_int poll_idle = DCONS_POLL_HZ * DCONS_POLL_IDLE;
 
 static struct dcons_softc sc[DCONS_NPORT];
 
 static SYSCTL_NODE(_kern, OID_AUTO, dcons, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
     "Dumb Console");
 SYSCTL_INT(_kern_dcons, OID_AUTO, poll_hz, CTLFLAG_RW, &poll_hz, 0,
 				"dcons polling rate");
 
 static int drv_init = 0;
 static struct callout dcons_callout;
 struct dcons_buf *dcons_buf;		/* for local dconschat */
 
 static void	dcons_timeout(void *);
 static int	dcons_drv_init(int);
 
 static cn_probe_t	dcons_cnprobe;
 static cn_init_t	dcons_cninit;
 static cn_term_t	dcons_cnterm;
 static cn_getc_t	dcons_cngetc;
 static cn_putc_t	dcons_cnputc;
 static cn_grab_t	dcons_cngrab;
 static cn_ungrab_t	dcons_cnungrab;
 
 CONSOLE_DRIVER(dcons);
 
 #if defined(GDB)
 static gdb_probe_f	dcons_dbg_probe;
 static gdb_init_f	dcons_dbg_init;
 static gdb_term_f	dcons_dbg_term;
 static gdb_getc_f	dcons_dbg_getc;
 static gdb_putc_f	dcons_dbg_putc;
 
 GDB_DBGPORT(dcons, dcons_dbg_probe, dcons_dbg_init, dcons_dbg_term,
     dcons_dbg_getc, dcons_dbg_putc);
 
 extern struct gdb_dbgport *gdb_cur;
 #endif
 
 static tsw_outwakeup_t dcons_outwakeup;
 static tsw_free_t      dcons_free;
 
 static struct ttydevsw dcons_ttydevsw = {
 	.tsw_flags      = TF_NOPREFIX,
 	.tsw_outwakeup  = dcons_outwakeup,
 	.tsw_free       = dcons_free,
 };
 
 static int dcons_close_refs;
 
 #if (defined(GDB) || defined(DDB))
 static int
 dcons_check_break(struct dcons_softc *dc, int c)
 {
 
 	if (c < 0)
 		return (c);
 
 #ifdef GDB
 	if ((dc->flags & DC_GDB) != 0 && gdb_cur == &dcons_gdb_dbgport)
 		kdb_alt_break_gdb(c, &dc->brk_state);
 	else
 #endif
 		kdb_alt_break(c, &dc->brk_state);
 
 	return (c);
 }
 #else
 #define	dcons_check_break(dc, c)	(c)
 #endif
 
 static int
 dcons_os_checkc_nopoll(struct dcons_softc *dc)
 {
 	int c;
 
 	if (dg.dma_tag != NULL)
 		bus_dmamap_sync(dg.dma_tag, dg.dma_map, BUS_DMASYNC_POSTREAD);
 
 	c = dcons_check_break(dc, dcons_checkc(dc));
 
 	if (dg.dma_tag != NULL)
 		bus_dmamap_sync(dg.dma_tag, dg.dma_map, BUS_DMASYNC_PREREAD);
 
 	return (c);
 }
 
 static int
 dcons_os_checkc(struct dcons_softc *dc)
 {
 	EVENTHANDLER_INVOKE(dcons_poll, 0);
 	return (dcons_os_checkc_nopoll(dc));
 }
 
 static void
 dcons_os_putc(struct dcons_softc *dc, int c)
 {
 	if (dg.dma_tag != NULL)
 		bus_dmamap_sync(dg.dma_tag, dg.dma_map, BUS_DMASYNC_POSTWRITE);
 
 	dcons_putc(dc, c);
 
 	if (dg.dma_tag != NULL)
 		bus_dmamap_sync(dg.dma_tag, dg.dma_map, BUS_DMASYNC_PREWRITE);
 }
 
 static void
 dcons_free(void *xsc __unused)
 {
 
 	/* Our deferred free has arrived, now we're waiting for one fewer. */
 	atomic_subtract_rel_int(&dcons_close_refs, 1);
 }
 
 static void
 dcons_outwakeup(struct tty *tp)
 {
 	struct dcons_softc *dc;
 	char ch;
 
 	dc = tty_softc(tp);
 
 	while (ttydisc_getc(tp, &ch, sizeof ch) != 0)
 		dcons_os_putc(dc, ch);
 }
 
 static void
 dcons_timeout(void *v)
 {
 	struct	tty *tp;
 	struct dcons_softc *dc;
 	int i, c, polltime;
 
 	for (i = 0; i < DCONS_NPORT; i ++) {
 		dc = &sc[i];
 		tp = dc->tty;
 
 		tty_lock(tp);
 		while ((c = dcons_os_checkc_nopoll(dc)) != -1) {
 			ttydisc_rint(tp, c, 0);
 			poll_idle = 0;
 		}
 		ttydisc_rint_done(tp);
 		tty_unlock(tp);
 	}
 	poll_idle++;
 	polltime = hz;
 	if (poll_idle <= (poll_hz * DCONS_POLL_IDLE))
 		polltime /= poll_hz;
 	callout_reset(&dcons_callout, polltime, dcons_timeout, tp);
 }
 
 static void
 dcons_cnprobe(struct consdev *cp)
 {
 	sprintf(cp->cn_name, "dcons");
 #if DCONS_FORCE_CONSOLE
 	cp->cn_pri = CN_REMOTE;
 #else
 	cp->cn_pri = CN_NORMAL;
 #endif
 }
 
 static void
 dcons_cninit(struct consdev *cp)
 {
 	dcons_drv_init(0);
 	cp->cn_arg = (void *)&sc[DCONS_CON]; /* share port0 with unit0 */
 }
 
 static void
 dcons_cnterm(struct consdev *cp)
 {
 }
 
 static void
 dcons_cngrab(struct consdev *cp)
 {
 }
 
 static void
 dcons_cnungrab(struct consdev *cp)
 {
 }
 
 static int
 dcons_cngetc(struct consdev *cp)
 {
 	struct dcons_softc *dc = (struct dcons_softc *)cp->cn_arg;
 	return (dcons_os_checkc(dc));
 }
 
 static void
 dcons_cnputc(struct consdev *cp, int c)
 {
 	struct dcons_softc *dc = (struct dcons_softc *)cp->cn_arg;
 	dcons_os_putc(dc, c);
 }
 
 static int
 dcons_drv_init(int stage)
 {
 #if defined(__i386__) || defined(__amd64__)
 	quad_t addr, size;
 #endif
 
 	if (drv_init)
 		return(drv_init);
 
 	drv_init = -1;
 
 	bzero(&dg, sizeof(dg));
 	dcons_conf = &dg;
 	dg.cdev = &dcons_consdev;
 	dg.buf = NULL;
 	dg.size = DCONS_BUF_SIZE;
 
 #if defined(__i386__) || defined(__amd64__)
 	if (getenv_quad("dcons.addr", &addr) > 0 &&
 	    getenv_quad("dcons.size", &size) > 0) {
 #ifdef __i386__
 		vm_paddr_t pa;
 		/*
 		 * Allow read/write access to dcons buffer.
 		 */
 		for (pa = trunc_page(addr); pa < addr + size; pa += PAGE_SIZE)
 			pmap_ksetrw(PMAP_MAP_LOW + pa);
 		invltlb();
 #endif
 		/* XXX P to V */
 #ifdef __amd64__
 		dg.buf = (struct dcons_buf *)(vm_offset_t)(KERNBASE + addr);
 #else /* __i386__ */
 		dg.buf = (struct dcons_buf *)(vm_offset_t)(PMAP_MAP_LOW +
 		    addr);
 #endif
 		dg.size = size;
 		if (dcons_load_buffer(dg.buf, dg.size, sc) < 0)
 			dg.buf = NULL;
 	}
 #endif
 	if (dg.buf != NULL)
 		goto ok;
 
 #ifndef KLD_MODULE
 	if (stage == 0) { /* XXX or cold */
 		/*
 		 * DCONS_FORCE_CONSOLE == 1 and statically linked.
 		 * called from cninit(). can't use contigmalloc yet .
 		 */
 		dg.buf = (struct dcons_buf *) bssbuf;
 		dcons_init(dg.buf, dg.size, sc);
 	} else
 #endif
 	{
 		/*
 		 * DCONS_FORCE_CONSOLE == 0 or kernel module case.
 		 * if the module is loaded after boot,
 		 * bssbuf could be non-continuous.
 		 */ 
 		dg.buf = (struct dcons_buf *) contigmalloc(dg.size,
 			M_DEVBUF, 0, 0x10000, 0xffffffff, PAGE_SIZE, 0ul);
 		if (dg.buf == NULL)
 			return (-1);
 		dcons_init(dg.buf, dg.size, sc);
 	}
 
 ok:
 	dcons_buf = dg.buf;
 
 	drv_init = 1;
 
 	return 0;
 }
 
 
 static int
 dcons_attach_port(int port, char *name, int flags)
 {
 	struct dcons_softc *dc;
 	struct tty *tp;
 
 	dc = &sc[port];
 	tp = tty_alloc(&dcons_ttydevsw, dc);
 	dc->flags = flags;
 	dc->tty   = tp;
 	tty_init_console(tp, 0);
 	tty_makedev(tp, NULL, "%s", name);
 	return(0);
 }
 
 static int
 dcons_attach(void)
 {
 	int polltime;
 
 	dcons_attach_port(DCONS_CON, "dcons", 0);
 	dcons_attach_port(DCONS_GDB, "dgdb", DC_GDB);
 	callout_init(&dcons_callout, 1);
 	polltime = hz / poll_hz;
 	callout_reset(&dcons_callout, polltime, dcons_timeout, NULL);
 	return(0);
 }
 
 static int
 dcons_detach(int port)
 {
 	struct	tty *tp;
 	struct dcons_softc *dc;
 
 	dc = &sc[port];
 	tp = dc->tty;
 
 	/* tty_rel_gone() schedules a deferred free callback, count it. */
 	atomic_add_int(&dcons_close_refs, 1);
 	tty_lock(tp);
 	tty_rel_gone(tp);
 
 	return(0);
 }
 
 static int
 dcons_modevent(module_t mode, int type, void *data)
 {
 	int err = 0, ret;
 
 	switch (type) {
 	case MOD_LOAD:
 		ret = dcons_drv_init(1);
 		if (ret != -1)
 			dcons_attach();
 		if (ret == 0) {
 			dcons_cnprobe(&dcons_consdev);
 			dcons_cninit(&dcons_consdev);
 			cnadd(&dcons_consdev);
 		}
 		break;
 	case MOD_UNLOAD:
 		printf("dcons: unload\n");
 		if (drv_init == 1) {
 			callout_stop(&dcons_callout);
 			cnremove(&dcons_consdev);
 			dcons_detach(DCONS_CON);
 			dcons_detach(DCONS_GDB);
 			dg.buf->magic = 0;
 
-			contigfree(dg.buf, DCONS_BUF_SIZE, M_DEVBUF);
+			free(dg.buf, M_DEVBUF);
 		}
 
 		/* Wait for tty deferred free callbacks to complete. */
 		while (atomic_load_acq_int(&dcons_close_refs) > 0)
                         pause_sbt("dcunld", mstosbt(50), mstosbt(10), 0);
 		break;
 	case MOD_SHUTDOWN:
 #if 0		/* Keep connection after halt */
 		dg.buf->magic = 0;
 #endif
 		break;
 	default:
 		err = EOPNOTSUPP;
 		break;
 	}
 	return(err);
 }
 
 #if defined(GDB)
 /* Debugger interface */
 
 static int
 dcons_os_getc(struct dcons_softc *dc)
 {
 	int c;
 
 	while ((c = dcons_os_checkc(dc)) == -1);
 
 	return (c & 0xff);
 }
 
 static int
 dcons_dbg_probe(void)
 {
 	int dcons_gdb;
 
 	if (getenv_int("dcons_gdb", &dcons_gdb) == 0)
 		return (-1);
 	return (dcons_gdb);
 }
 
 static void
 dcons_dbg_init(void)
 {
 }
 
 static void
 dcons_dbg_term(void)
 {
 }
 
 static void
 dcons_dbg_putc(int c)
 {
 	struct dcons_softc *dc = &sc[DCONS_GDB];
 	dcons_os_putc(dc, c);
 }
 
 static int
 dcons_dbg_getc(void)
 {
 	struct dcons_softc *dc = &sc[DCONS_GDB];
 	return (dcons_os_getc(dc));
 }
 #endif
 
 DEV_MODULE(dcons, dcons_modevent, NULL);
 MODULE_VERSION(dcons, DCONS_VERSION);
diff --git a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
index 32d3e465c569..225c91b44f21 100644
--- a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
+++ b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
@@ -1,1400 +1,1400 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2011 HighPoint Technologies, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <dev/hpt27xx/hpt27xx_config.h>
 
 #include <dev/hpt27xx/os_bsd.h>
 #include <dev/hpt27xx/hptintf.h>
 
 static HIM *hpt_match(device_t dev, int scan)
 {
 	PCI_ID pci_id;
 	HIM *him;
 	int i;
 
 	for (him = him_list; him; him = him->next) {
 		for (i=0; him->get_supported_device_id(i, &pci_id); i++) {
 			if (scan && him->get_controller_count)
 				him->get_controller_count(&pci_id,0,0);
 			if ((pci_get_vendor(dev) == pci_id.vid) &&
 				(pci_get_device(dev) == pci_id.did)){
 				return (him);
 			}
 		}
 	}
 	return (NULL);
 }
 
 static int hpt_probe(device_t dev)
 {
 	HIM *him;
 
 	him = hpt_match(dev, 0);
 	if (him != NULL) {
 		KdPrint(("hpt_probe: adapter at PCI %d:%d:%d, IRQ %d",
 			pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev), pci_get_irq(dev)
 			));
 		device_set_desc(dev, him->name);
 		return (BUS_PROBE_DEFAULT);
 	}
 
 	return (ENXIO);
 }
 
 static int hpt_attach(device_t dev)
 {
 	PHBA hba = (PHBA)device_get_softc(dev);
 	HIM *him;
 	PCI_ID pci_id;
 	HPT_UINT size;
 	PVBUS vbus;
 	PVBUS_EXT vbus_ext;
 	
 	if (pci_get_domain(dev) != 0) {
 		device_printf(dev, "does not support PCI domains\n");
 		return (ENXIO);
 	}
 
 	KdPrint(("hpt_attach(%d/%d/%d)", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev)));
 
 	him = hpt_match(dev, 1);
 	hba->ext_type = EXT_TYPE_HBA;
 	hba->ldm_adapter.him = him;
 	pci_enable_busmaster(dev);
 
 	pci_id.vid = pci_get_vendor(dev);
 	pci_id.did = pci_get_device(dev);
 	pci_id.rev = pci_get_revid(dev);
 	pci_id.subsys = (HPT_U32)(pci_get_subdevice(dev)) << 16 | pci_get_subvendor(dev);
 
 	size = him->get_adapter_size(&pci_id);
 	hba->ldm_adapter.him_handle = malloc(size, M_DEVBUF, M_WAITOK);
 	if (!hba->ldm_adapter.him_handle)
 		return ENXIO;
 
 	hba->pcidev = dev;
 	hba->pciaddr.tree = 0;
 	hba->pciaddr.bus = pci_get_bus(dev);
 	hba->pciaddr.device = pci_get_slot(dev);
 	hba->pciaddr.function = pci_get_function(dev);
 
 	if (!him->create_adapter(&pci_id, hba->pciaddr, hba->ldm_adapter.him_handle, hba)) {
 		free(hba->ldm_adapter.him_handle, M_DEVBUF);
 		return ENXIO;
 	}
 
 	os_printk("adapter at PCI %d:%d:%d, IRQ %d",
 		hba->pciaddr.bus, hba->pciaddr.device, hba->pciaddr.function, pci_get_irq(dev));
 
 	if (!ldm_register_adapter(&hba->ldm_adapter)) {
 		size = ldm_get_vbus_size();
 		vbus_ext = malloc(sizeof(VBUS_EXT) + size, M_DEVBUF, M_WAITOK);
 		if (!vbus_ext) {
 			free(hba->ldm_adapter.him_handle, M_DEVBUF);
 			return ENXIO;
 		}
 		memset(vbus_ext, 0, sizeof(VBUS_EXT));
 		vbus_ext->ext_type = EXT_TYPE_VBUS;
 		ldm_create_vbus((PVBUS)vbus_ext->vbus, vbus_ext);
 		ldm_register_adapter(&hba->ldm_adapter);
 	}
 
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		if (hba->ldm_adapter.vbus==vbus) {
 			hba->vbus_ext = vbus_ext;
 			hba->next = vbus_ext->hba_list;
 			vbus_ext->hba_list = hba;
 			break;
 		}
 	}
 	return 0;
 }
 
 /*
  * Maybe we'd better to use the bus_dmamem_alloc to alloc DMA memory,
  * but there are some problems currently (alignment, etc).
  */
 static __inline void *__get_free_pages(int order)
 {
 	/* don't use low memory - other devices may get starved */
 	return contigmalloc(PAGE_SIZE<<order, 
 			M_DEVBUF, M_WAITOK, BUS_SPACE_MAXADDR_24BIT, BUS_SPACE_MAXADDR, PAGE_SIZE, 0);
 }
 
-static __inline void free_pages(void *p, int order)
+static __inline void free_pages(void *p)
 {
-	contigfree(p, PAGE_SIZE<<order, M_DEVBUF);
+	free(p, M_DEVBUF);
 }
 
 static int hpt_alloc_mem(PVBUS_EXT vbus_ext)
 {
 	PHBA hba;
 	struct freelist *f;
 	HPT_UINT i;
 	void **p;
 
 	for (hba = vbus_ext->hba_list; hba; hba = hba->next)
 		hba->ldm_adapter.him->get_meminfo(hba->ldm_adapter.him_handle);
 
 	ldm_get_mem_info((PVBUS)vbus_ext->vbus, 0);
 
 	for (f=vbus_ext->freelist_head; f; f=f->next) {
 		KdPrint(("%s: %d*%d=%d bytes",
 			f->tag, f->count, f->size, f->count*f->size));
 		for (i=0; i<f->count; i++) {
 			p = (void **)malloc(f->size, M_DEVBUF, M_WAITOK);
 			if (!p)	return (ENXIO);
 			*p = f->head;
 			f->head = p;
 		}
 	}
 
 	for (f=vbus_ext->freelist_dma_head; f; f=f->next) {
 		int order, size, j;
 
 		HPT_ASSERT((f->size & (f->alignment-1))==0);
 
 		for (order=0, size=PAGE_SIZE; size<f->size; order++, size<<=1)
 			;
 
 		KdPrint(("%s: %d*%d=%d bytes, order %d",
 			f->tag, f->count, f->size, f->count*f->size, order));
 		HPT_ASSERT(f->alignment<=PAGE_SIZE);
 
 		for (i=0; i<f->count;) {
 			p = (void **)__get_free_pages(order);
 			if (!p) return -1;
 			for (j = size/f->size; j && i<f->count; i++,j--) {
 				*p = f->head;
 				*(BUS_ADDRESS *)(p+1) = (BUS_ADDRESS)vtophys(p);
 				f->head = p;
 				p = (void **)((unsigned long)p + f->size);
 			}
 		}
 	}
 	
 	HPT_ASSERT(PAGE_SIZE==DMAPOOL_PAGE_SIZE);
 
 	for (i=0; i<os_max_cache_pages; i++) {
 		p = (void **)__get_free_pages(0);
 		if (!p) return -1;
 		HPT_ASSERT(((HPT_UPTR)p & (DMAPOOL_PAGE_SIZE-1))==0);
 		dmapool_put_page((PVBUS)vbus_ext->vbus, p, (BUS_ADDRESS)vtophys(p));
 	}
 
 	return 0;
 }
 
 static void hpt_free_mem(PVBUS_EXT vbus_ext)
 {
 	struct freelist *f;
 	void *p;
 	int i;
 	BUS_ADDRESS bus;
 
 	for (f=vbus_ext->freelist_head; f; f=f->next) {
 #if DBG
 		if (f->count!=f->reserved_count) {
 			KdPrint(("memory leak for freelist %s (%d/%d)", f->tag, f->count, f->reserved_count));
 		}
 #endif
 		while ((p=freelist_get(f)))
 			free(p, M_DEVBUF);
 	}
 
 	for (i=0; i<os_max_cache_pages; i++) {
 		p = dmapool_get_page((PVBUS)vbus_ext->vbus, &bus);
 		HPT_ASSERT(p);
-		free_pages(p, 0);
+		free_pages(p);
 	}
 
 	for (f=vbus_ext->freelist_dma_head; f; f=f->next) {
 		int order, size;
 #if DBG
 		if (f->count!=f->reserved_count) {
 			KdPrint(("memory leak for dma freelist %s (%d/%d)", f->tag, f->count, f->reserved_count));
 		}
 #endif
 		for (order=0, size=PAGE_SIZE; size<f->size; order++, size<<=1) ;
 
 		while ((p=freelist_get_dma(f, &bus))) {
 			if (order)
-				free_pages(p, order);
+				free_pages(p);
 			else {
 			/* can't free immediately since other blocks in this page may still be in the list */
 				if (((HPT_UPTR)p & (PAGE_SIZE-1))==0)
 					dmapool_put_page((PVBUS)vbus_ext->vbus, p, bus);
 			}
 		}
 	}
 	
 	while ((p = dmapool_get_page((PVBUS)vbus_ext->vbus, &bus)))
-		free_pages(p, 0);
+		free_pages(p);
 }
 
 static int hpt_init_vbus(PVBUS_EXT vbus_ext)
 {
 	PHBA hba;
 
 	for (hba = vbus_ext->hba_list; hba; hba = hba->next)
 		if (!hba->ldm_adapter.him->initialize(hba->ldm_adapter.him_handle)) {
 			KdPrint(("fail to initialize %p", hba));
 			return -1;
 		}
 
 	ldm_initialize_vbus((PVBUS)vbus_ext->vbus, &vbus_ext->hba_list->ldm_adapter);
 	return 0;
 }
 
 static void hpt_flush_done(PCOMMAND pCmd)
 {
 	PVDEV vd = pCmd->target;
 
 	if (mIsArray(vd->type) && vd->u.array.transform && vd!=vd->u.array.transform->target) {
 		vd = vd->u.array.transform->target;
 		HPT_ASSERT(vd);
 		pCmd->target = vd;
 		pCmd->Result = RETURN_PENDING;
 		vdev_queue_cmd(pCmd);
 		return;
 	}
 
 	*(int *)pCmd->priv = 1;
 	wakeup(pCmd);
 }
 
 /*
  * flush a vdev (without retry).
  */
 static int hpt_flush_vdev(PVBUS_EXT vbus_ext, PVDEV vd)
 {
 	PCOMMAND pCmd;
 	int result = 0, done;
 	HPT_UINT count;
 
 	KdPrint(("flusing dev %p", vd));
 
 	hpt_lock_vbus(vbus_ext);
 
 	if (mIsArray(vd->type) && vd->u.array.transform)
 		count = max(vd->u.array.transform->source->cmds_per_request,
 					vd->u.array.transform->target->cmds_per_request);
 	else
 		count = vd->cmds_per_request;
 
 	pCmd = ldm_alloc_cmds(vd->vbus, count);
 
 	if (!pCmd) {
 		hpt_unlock_vbus(vbus_ext);
 		return -1;
 	}
 
 	pCmd->type = CMD_TYPE_FLUSH;
 	pCmd->flags.hard_flush = 1;
 	pCmd->target = vd;
 	pCmd->done = hpt_flush_done;
 	done = 0;
 	pCmd->priv = &done;
 
 	ldm_queue_cmd(pCmd);
 	
 	if (!done) {
 		while (hpt_sleep(vbus_ext, pCmd, PPAUSE, "hptfls", HPT_OSM_TIMEOUT)) {
 			ldm_reset_vbus(vd->vbus);
 		}
 	}
 
 	KdPrint(("flush result %d", pCmd->Result));
 
 	if (pCmd->Result!=RETURN_SUCCESS)
 		result = -1;
 
 	ldm_free_cmds(pCmd);
 
 	hpt_unlock_vbus(vbus_ext);
 
 	return result;
 }
 
 static void hpt_stop_tasks(PVBUS_EXT vbus_ext);
 static void hpt_shutdown_vbus(PVBUS_EXT vbus_ext, int howto)
 {
 	PVBUS     vbus = (PVBUS)vbus_ext->vbus;
 	PHBA hba;
 	int i;
 	
 	KdPrint(("hpt_shutdown_vbus"));
 
 	/* stop all ctl tasks and disable the worker taskqueue */
 	hpt_stop_tasks(vbus_ext);
 	vbus_ext->worker.ta_context = 0;
 
 	/* flush devices */
 	for (i=0; i<osm_max_targets; i++) {
 		PVDEV vd = ldm_find_target(vbus, i);
 		if (vd) {
 			/* retry once */
 			if (hpt_flush_vdev(vbus_ext, vd))
 				hpt_flush_vdev(vbus_ext, vd);
 		}
 	}
 
 	hpt_lock_vbus(vbus_ext);
 	ldm_shutdown(vbus);
 	hpt_unlock_vbus(vbus_ext);
 
 	ldm_release_vbus(vbus);
 
 	for (hba=vbus_ext->hba_list; hba; hba=hba->next)
 		bus_teardown_intr(hba->pcidev, hba->irq_res, hba->irq_handle);
 
 	hpt_free_mem(vbus_ext);
 
 	while ((hba=vbus_ext->hba_list)) {
 		vbus_ext->hba_list = hba->next;
 		free(hba->ldm_adapter.him_handle, M_DEVBUF);
 	}
 	callout_drain(&vbus_ext->timer);
 	mtx_destroy(&vbus_ext->lock);
 	free(vbus_ext, M_DEVBUF);
 	KdPrint(("hpt_shutdown_vbus done"));
 }
 
 static void __hpt_do_tasks(PVBUS_EXT vbus_ext)
 {
 	OSM_TASK *tasks;
 
 	tasks = vbus_ext->tasks;
 	vbus_ext->tasks = 0;
 
 	while (tasks) {
 		OSM_TASK *t = tasks;
 		tasks = t->next;
 		t->next = 0;
 		t->func(vbus_ext->vbus, t->data);
 	}
 }
 
 static void hpt_do_tasks(PVBUS_EXT vbus_ext, int pending)
 {
 	if(vbus_ext){
 		hpt_lock_vbus(vbus_ext);
 		__hpt_do_tasks(vbus_ext);
 		hpt_unlock_vbus(vbus_ext);
 	}
 }
 
 static void hpt_action(struct cam_sim *sim, union ccb *ccb);
 static void hpt_poll(struct cam_sim *sim);
 static void hpt_async(void * callback_arg, u_int32_t code, struct cam_path * path, void * arg);
 static void hpt_pci_intr(void *arg);
 
 static __inline POS_CMDEXT cmdext_get(PVBUS_EXT vbus_ext)
 {
 	POS_CMDEXT p = vbus_ext->cmdext_list;
 	if (p)
 		vbus_ext->cmdext_list = p->next;
 	return p;
 }
 
 static __inline void cmdext_put(POS_CMDEXT p)
 {
 	p->next = p->vbus_ext->cmdext_list;
 	p->vbus_ext->cmdext_list = p;
 }
 
 static void hpt_timeout(void *arg)
 {
 	PCOMMAND pCmd = (PCOMMAND)arg;
 	POS_CMDEXT ext = (POS_CMDEXT)pCmd->priv;
 	
 	KdPrint(("pCmd %p timeout", pCmd));
 	
 	ldm_reset_vbus((PVBUS)ext->vbus_ext->vbus);
 }
 
 static void os_cmddone(PCOMMAND pCmd)
 {
 	POS_CMDEXT ext = (POS_CMDEXT)pCmd->priv;
 	union ccb *ccb = ext->ccb;
 
 	KdPrint(("<8>os_cmddone(%p, %d)", pCmd, pCmd->Result));
 	callout_stop(&ext->timeout);
 	switch(pCmd->Result) {
 	case RETURN_SUCCESS:
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 	case RETURN_BAD_DEVICE:
 		ccb->ccb_h.status = CAM_DEV_NOT_THERE;
 		break;
 	case RETURN_DEVICE_BUSY:
 		ccb->ccb_h.status = CAM_BUSY;
 		break;
 	case RETURN_INVALID_REQUEST:
 		ccb->ccb_h.status = CAM_REQ_INVALID;
 		break;
 	case RETURN_SELECTION_TIMEOUT:
 		ccb->ccb_h.status = CAM_SEL_TIMEOUT;
 		break;
 	case RETURN_RETRY:
 		ccb->ccb_h.status = CAM_BUSY;
 		break;
 	default:
 		ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR;
 		break;
 	}
 
 	if (pCmd->flags.data_in) {
 		bus_dmamap_sync(ext->vbus_ext->io_dmat, ext->dma_map, BUS_DMASYNC_POSTREAD);
 	}
 	else if (pCmd->flags.data_out) {
 		bus_dmamap_sync(ext->vbus_ext->io_dmat, ext->dma_map, BUS_DMASYNC_POSTWRITE);
 	}
 	
 	bus_dmamap_unload(ext->vbus_ext->io_dmat, ext->dma_map);
 
 	cmdext_put(ext);
 	ldm_free_cmds(pCmd);
 	xpt_done(ccb);
 }
 
 static int os_buildsgl(PCOMMAND pCmd, PSG pSg, int logical)
 {
 	POS_CMDEXT ext = (POS_CMDEXT)pCmd->priv;
 	union ccb *ccb = ext->ccb;
 
 	if(logical)	{
 		os_set_sgptr(pSg, (HPT_U8 *)ccb->csio.data_ptr);
 		pSg->size = ccb->csio.dxfer_len;
 		pSg->eot = 1;
 		return TRUE;
 	}
 	/* since we have provided physical sg, nobody will ask us to build physical sg */
 	HPT_ASSERT(0);
 	return FALSE;
 }
 
 static void hpt_io_dmamap_callback(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
 {
 	PCOMMAND pCmd = (PCOMMAND)arg;
 	POS_CMDEXT ext = (POS_CMDEXT)pCmd->priv;
 	PSG psg = pCmd->psg;
 	int idx;
 	
 	HPT_ASSERT(pCmd->flags.physical_sg);
 	
 	if (error)
 		panic("busdma error");
 		
 	HPT_ASSERT(nsegs<=os_max_sg_descriptors);
 
 	if (nsegs != 0) {
 		for (idx = 0; idx < nsegs; idx++, psg++) {
 			psg->addr.bus = segs[idx].ds_addr;
 			psg->size = segs[idx].ds_len;
 			psg->eot = 0;
 		}
 		psg[-1].eot = 1;
 	
 		if (pCmd->flags.data_in) {
 			bus_dmamap_sync(ext->vbus_ext->io_dmat, ext->dma_map,
 			    BUS_DMASYNC_PREREAD);
 		}
 		else if (pCmd->flags.data_out) {
 			bus_dmamap_sync(ext->vbus_ext->io_dmat, ext->dma_map,
 			    BUS_DMASYNC_PREWRITE);
 		}
 	}
 	callout_reset(&ext->timeout, HPT_OSM_TIMEOUT, hpt_timeout, pCmd);
 	ldm_queue_cmd(pCmd);
 }
 
 static void hpt_scsi_io(PVBUS_EXT vbus_ext, union ccb *ccb)
 {
 	PVBUS vbus = (PVBUS)vbus_ext->vbus;
 	PVDEV vd;
 	PCOMMAND pCmd;
 	POS_CMDEXT ext;
 	HPT_U8 *cdb;
 	int error;
 
 	if (ccb->ccb_h.flags & CAM_CDB_POINTER)
 		cdb = ccb->csio.cdb_io.cdb_ptr;
 	else
 		cdb = ccb->csio.cdb_io.cdb_bytes;
 	
 	KdPrint(("<8>hpt_scsi_io: ccb %x id %d lun %d cdb %x-%x-%x",
 		ccb,
 		ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
 		*(HPT_U32 *)&cdb[0], *(HPT_U32 *)&cdb[4], *(HPT_U32 *)&cdb[8]
 	));
 
 	/* ccb->ccb_h.path_id is not our bus id - don't check it */
 	if (ccb->ccb_h.target_lun != 0 ||
 		ccb->ccb_h.target_id >= osm_max_targets ||
 		(ccb->ccb_h.flags & CAM_CDB_PHYS))
 	{
 		ccb->ccb_h.status = CAM_TID_INVALID;
 		xpt_done(ccb);
 		return;
 	}
 
 	vd = ldm_find_target(vbus, ccb->ccb_h.target_id);
 
 	if (!vd) {
 		ccb->ccb_h.status = CAM_SEL_TIMEOUT;
 		xpt_done(ccb);
 		return;
 	}
    
 	switch (cdb[0]) {
 	case TEST_UNIT_READY:
 	case START_STOP_UNIT:
 	case SYNCHRONIZE_CACHE:
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 
 	case INQUIRY:
 		{
 			PINQUIRYDATA inquiryData;
 			memset(ccb->csio.data_ptr, 0, ccb->csio.dxfer_len);
 			inquiryData = (PINQUIRYDATA)ccb->csio.data_ptr;
 		
 			inquiryData->AdditionalLength = 31;
 			inquiryData->CommandQueue = 1;
 			memcpy(&inquiryData->VendorId, "HPT     ", 8);
 			memcpy(&inquiryData->ProductId, "DISK 0_0        ", 16);
 	
 			if (vd->target_id / 10) {
 				inquiryData->ProductId[7] = (vd->target_id % 100) / 10 + '0';
 				inquiryData->ProductId[8] = (vd->target_id % 100) % 10 + '0';
 			}
 			else
 				inquiryData->ProductId[7] = (vd->target_id % 100) % 10 + '0';
 	
 			memcpy(&inquiryData->ProductRevisionLevel, "4.00", 4);
 	
 			ccb->ccb_h.status = CAM_REQ_CMP;
 		}
 		break;
 
 	case READ_CAPACITY:
 	{
 		HPT_U8 *rbuf = ccb->csio.data_ptr;
 		HPT_U32 cap;
 		HPT_U8 sector_size_shift = 0;
 		HPT_U64 new_cap;
 		HPT_U32 sector_size = 0;
 
 		if (mIsArray(vd->type))
 			sector_size_shift = vd->u.array.sector_size_shift;
 		else{
 			if(vd->type == VD_RAW){
 				sector_size = vd->u.raw.logical_sector_size;
 			}
 		
 			switch (sector_size) {
 				case 0x1000:
 					KdPrint(("set 4k setctor size in READ_CAPACITY"));
 					sector_size_shift = 3;
 					break;
 				default:
 					break;
 			}			
 		}
 		new_cap = vd->capacity >> sector_size_shift;
 		
 		if (new_cap > 0xfffffffful)
 			cap = 0xffffffff;
 		else
 			cap = new_cap - 1;
 			
 		rbuf[0] = (HPT_U8)(cap>>24);
 		rbuf[1] = (HPT_U8)(cap>>16);
 		rbuf[2] = (HPT_U8)(cap>>8);
 		rbuf[3] = (HPT_U8)cap;
 		rbuf[4] = 0;
 		rbuf[5] = 0;
 		rbuf[6] = 2 << sector_size_shift;
 		rbuf[7] = 0;
 
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 	}
 	case REPORT_LUNS:
 	{
 		HPT_U8 *rbuf = ccb->csio.data_ptr;
 		memset(rbuf, 0, 16);
 		rbuf[3] = 8;
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;				
 	}
 	case SERVICE_ACTION_IN: 
 	{
 		HPT_U8 *rbuf = ccb->csio.data_ptr;
 		HPT_U64	cap = 0;
 		HPT_U8 sector_size_shift = 0;
 		HPT_U32 sector_size = 0;
 
 		if(mIsArray(vd->type))
 			sector_size_shift = vd->u.array.sector_size_shift;
 		else{
 			if(vd->type == VD_RAW){
 				sector_size = vd->u.raw.logical_sector_size;
 			}
 		
 			switch (sector_size) {
 				case 0x1000:
 					KdPrint(("set 4k setctor size in SERVICE_ACTION_IN"));
 					sector_size_shift = 3;
 					break;
 				default:
 					break;
 			}			
 		}
 		cap = (vd->capacity >> sector_size_shift) - 1;
 					
 		rbuf[0] = (HPT_U8)(cap>>56);
 		rbuf[1] = (HPT_U8)(cap>>48);
 		rbuf[2] = (HPT_U8)(cap>>40);
 		rbuf[3] = (HPT_U8)(cap>>32);
 		rbuf[4] = (HPT_U8)(cap>>24);
 		rbuf[5] = (HPT_U8)(cap>>16);
 		rbuf[6] = (HPT_U8)(cap>>8);
 		rbuf[7] = (HPT_U8)cap;
 		rbuf[8] = 0;
 		rbuf[9] = 0;
 		rbuf[10] = 2 << sector_size_shift;
 		rbuf[11] = 0;
 		
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;	
 	}
 	
 	case READ_6:
 	case READ_10:
 	case READ_16:
 	case WRITE_6:
 	case WRITE_10:
 	case WRITE_16:
 	case 0x13:
 	case 0x2f:
 	case 0x8f: /* VERIFY_16 */
 	{
 		HPT_U8 sector_size_shift = 0;
 		HPT_U32 sector_size = 0;
 		pCmd = ldm_alloc_cmds(vbus, vd->cmds_per_request);
 		if(!pCmd){
 			KdPrint(("Failed to allocate command!"));
 			ccb->ccb_h.status = CAM_BUSY;
 			break;
 		}
 
 		switch (cdb[0])	{
 		case READ_6:
 		case WRITE_6:
 		case 0x13:
 			pCmd->uCmd.Ide.Lba =  ((HPT_U32)cdb[1] << 16) | ((HPT_U32)cdb[2] << 8) | (HPT_U32)cdb[3];
 			pCmd->uCmd.Ide.nSectors = (HPT_U16) cdb[4];
 			break;
 		case READ_16:
 		case WRITE_16:
 		case 0x8f: /* VERIFY_16 */
 		{
 			HPT_U64 block =
 				((HPT_U64)cdb[2]<<56) |
 				((HPT_U64)cdb[3]<<48) |
 				((HPT_U64)cdb[4]<<40) |
 				((HPT_U64)cdb[5]<<32) |
 				((HPT_U64)cdb[6]<<24) |
 				((HPT_U64)cdb[7]<<16) |
 				((HPT_U64)cdb[8]<<8) |
 				((HPT_U64)cdb[9]);
 			pCmd->uCmd.Ide.Lba = block;
 			pCmd->uCmd.Ide.nSectors = (HPT_U16)cdb[13] | ((HPT_U16)cdb[12]<<8);
 			break;
 		}
 		
 		default:
 			pCmd->uCmd.Ide.Lba = (HPT_U32)cdb[5] | ((HPT_U32)cdb[4] << 8) | ((HPT_U32)cdb[3] << 16) | ((HPT_U32)cdb[2] << 24);
 			pCmd->uCmd.Ide.nSectors = (HPT_U16) cdb[8] | ((HPT_U16)cdb[7]<<8);
 			break;
 		}
 
 		if(mIsArray(vd->type)) {
 			sector_size_shift = vd->u.array.sector_size_shift;
 		}
 		else{
 			if(vd->type == VD_RAW){
 				sector_size = vd->u.raw.logical_sector_size;
 			}
 	  		
 			switch (sector_size) {
 				case 0x1000:
 					KdPrint(("<8>resize sector size from 4k to 512"));
 					sector_size_shift = 3;
 					break;
 				default:
 					break;
 	 		}			
 		}
 		pCmd->uCmd.Ide.Lba <<= sector_size_shift;
 		pCmd->uCmd.Ide.nSectors <<= sector_size_shift;
 
 		
 		switch (cdb[0]) {
 		case READ_6:
 		case READ_10:
 		case READ_16:
 			pCmd->flags.data_in = 1;
 			break;
 		case WRITE_6:
 		case WRITE_10:
 		case WRITE_16:
 			pCmd->flags.data_out = 1;
 			break;
 		}
 		pCmd->priv = ext = cmdext_get(vbus_ext);
 		HPT_ASSERT(ext);
 		ext->ccb = ccb;
 		pCmd->target = vd;
 		pCmd->done = os_cmddone;
 		pCmd->buildsgl = os_buildsgl;
 
 		pCmd->psg = ext->psg;
 		pCmd->flags.physical_sg = 1;
 		error = bus_dmamap_load_ccb(vbus_ext->io_dmat,
 					ext->dma_map, ccb,
 					hpt_io_dmamap_callback, pCmd,
 					BUS_DMA_WAITOK
 				);
 		KdPrint(("<8>bus_dmamap_load return %d", error));
 		if (error && error!=EINPROGRESS) {
 			os_printk("bus_dmamap_load error %d", error);
 			cmdext_put(ext);
 			ldm_free_cmds(pCmd);
 			ccb->ccb_h.status = CAM_REQ_CMP_ERR;
 			xpt_done(ccb);
 		}
 		return;
 	}
 
 	default:
 		ccb->ccb_h.status = CAM_REQ_INVALID;
 		break;
 	}
 
 	xpt_done(ccb);
 	return;
 }
 
 static void hpt_action(struct cam_sim *sim, union ccb *ccb)
 {
 	PVBUS_EXT vbus_ext = (PVBUS_EXT)cam_sim_softc(sim);
 
 	KdPrint(("<8>hpt_action(fn=%d, id=%d)", ccb->ccb_h.func_code, ccb->ccb_h.target_id));
 
 	hpt_assert_vbus_locked(vbus_ext);
 	switch (ccb->ccb_h.func_code) {
 
 	case XPT_SCSI_IO:
 		hpt_scsi_io(vbus_ext, ccb);
 		return;
 
 	case XPT_RESET_BUS:
 		ldm_reset_vbus((PVBUS)vbus_ext->vbus);
 		break;
 
 	case XPT_GET_TRAN_SETTINGS:
 	case XPT_SET_TRAN_SETTINGS:
 		ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
 		break;
 
 	case XPT_CALC_GEOMETRY:
 		ccb->ccg.heads = 255;
 		ccb->ccg.secs_per_track = 63;
 		ccb->ccg.cylinders = ccb->ccg.volume_size / (ccb->ccg.heads * ccb->ccg.secs_per_track);
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 
 	case XPT_PATH_INQ:
 	{
 		struct ccb_pathinq *cpi = &ccb->cpi;
 
 		cpi->version_num = 1;
 		cpi->hba_inquiry = PI_SDTR_ABLE;
 		cpi->target_sprt = 0;
 		cpi->hba_misc = PIM_NOBUSRESET;
 		cpi->hba_eng_cnt = 0;
 		cpi->max_target = osm_max_targets;
 		cpi->max_lun = 0;
 		cpi->unit_number = cam_sim_unit(sim);
 		cpi->bus_id = cam_sim_bus(sim);
 		cpi->initiator_id = osm_max_targets;
 		cpi->base_transfer_speed = 3300;
 
 		strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
 		strlcpy(cpi->hba_vid, "HPT   ", HBA_IDLEN);
 		strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
 		cpi->transport = XPORT_SPI;
 		cpi->transport_version = 2;
 		cpi->protocol = PROTO_SCSI;
 		cpi->protocol_version = SCSI_REV_2;
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		break;
 	}
 
 	default:
 		ccb->ccb_h.status = CAM_REQ_INVALID;
 		break;
 	}
 
 	xpt_done(ccb);
 	return;
 }
 
 static void hpt_pci_intr(void *arg)
 {	
 	PVBUS_EXT vbus_ext = (PVBUS_EXT)arg;
 	hpt_lock_vbus(vbus_ext);
 	ldm_intr((PVBUS)vbus_ext->vbus);
 	hpt_unlock_vbus(vbus_ext);
 }
 
 static void hpt_poll(struct cam_sim *sim)
 {
 	PVBUS_EXT vbus_ext = (PVBUS_EXT)cam_sim_softc(sim);
 
 	hpt_assert_vbus_locked(vbus_ext);
 	ldm_intr((PVBUS)vbus_ext->vbus);
 }
 
 static void hpt_async(void * callback_arg, u_int32_t code, struct cam_path * path, void * arg)
 {
 	KdPrint(("<8>hpt_async"));
 }
 
 static int hpt_shutdown(device_t dev)
 {
 	KdPrint(("hpt_shutdown(dev=%p)", dev));
 	return 0;
 }
 
 static int hpt_detach(device_t dev)
 {
 	/* we don't allow the driver to be unloaded. */
 	return EBUSY;
 }
 
 static void hpt_ioctl_done(struct _IOCTL_ARG *arg)
 {
 	arg->ioctl_cmnd = 0;
 	wakeup(arg);
 }
 
 static void __hpt_do_ioctl(PVBUS_EXT vbus_ext, IOCTL_ARG *ioctl_args)
 {
 	ioctl_args->result = -1;
 	ioctl_args->done = hpt_ioctl_done;
 	ioctl_args->ioctl_cmnd = (void *)1;
 
 	hpt_lock_vbus(vbus_ext);
 	ldm_ioctl((PVBUS)vbus_ext->vbus, ioctl_args);
 
 	while (ioctl_args->ioctl_cmnd) {
 		if (hpt_sleep(vbus_ext, ioctl_args, PPAUSE, "hptctl", HPT_OSM_TIMEOUT)==0)
 			break;
 		ldm_reset_vbus((PVBUS)vbus_ext->vbus);
 		__hpt_do_tasks(vbus_ext);
 	}
 
 	/* KdPrint(("ioctl %x result %d", ioctl_args->dwIoControlCode, ioctl_args->result)); */
 
 	hpt_unlock_vbus(vbus_ext);
 }
 
 static void hpt_do_ioctl(IOCTL_ARG *ioctl_args)
 {
 	PVBUS vbus;
 	PVBUS_EXT vbus_ext;
 	
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		__hpt_do_ioctl(vbus_ext, ioctl_args);
 		if (ioctl_args->result!=HPT_IOCTL_RESULT_WRONG_VBUS)
 			return;
 	}
 }
 
 #define HPT_DO_IOCTL(code, inbuf, insize, outbuf, outsize) ({\
 	IOCTL_ARG arg;\
 	arg.dwIoControlCode = code;\
 	arg.lpInBuffer = inbuf;\
 	arg.lpOutBuffer = outbuf;\
 	arg.nInBufferSize = insize;\
 	arg.nOutBufferSize = outsize;\
 	arg.lpBytesReturned = 0;\
 	hpt_do_ioctl(&arg);\
 	arg.result;\
 })
 
 #define DEVICEID_VALID(id) ((id) && ((HPT_U32)(id)!=0xffffffff))
 
 static int hpt_get_logical_devices(DEVICEID * pIds, int nMaxCount)
 {
 	int i;
 	HPT_U32 count = nMaxCount-1;
 	
 	if (HPT_DO_IOCTL(HPT_IOCTL_GET_LOGICAL_DEVICES,
 			&count, sizeof(HPT_U32), pIds, sizeof(DEVICEID)*nMaxCount))
 		return -1;
 
 	nMaxCount = (int)pIds[0];
 	for (i=0; i<nMaxCount; i++) pIds[i] = pIds[i+1];
 	return nMaxCount;
 }
 
 static int hpt_get_device_info_v3(DEVICEID id, PLOGICAL_DEVICE_INFO_V3 pInfo)
 {
 	return HPT_DO_IOCTL(HPT_IOCTL_GET_DEVICE_INFO_V3,
 				&id, sizeof(DEVICEID), pInfo, sizeof(LOGICAL_DEVICE_INFO_V3));
 }
 
 /* not belong to this file logically, but we want to use ioctl interface */
 static int __hpt_stop_tasks(PVBUS_EXT vbus_ext, DEVICEID id)
 {
 	LOGICAL_DEVICE_INFO_V3 devinfo;
 	int i, result;
 	DEVICEID param[2] = { id, 0 };
 	
 	if (hpt_get_device_info_v3(id, &devinfo))
 		return -1;
 		
 	if (devinfo.Type!=LDT_ARRAY)
 		return -1;
 		
 	if (devinfo.u.array.Flags & ARRAY_FLAG_REBUILDING)
 		param[1] = AS_REBUILD_ABORT;
 	else if (devinfo.u.array.Flags & ARRAY_FLAG_VERIFYING)
 		param[1] = AS_VERIFY_ABORT;
 	else if (devinfo.u.array.Flags & ARRAY_FLAG_INITIALIZING)
 		param[1] = AS_INITIALIZE_ABORT;
 	else if (devinfo.u.array.Flags & ARRAY_FLAG_TRANSFORMING)
 		param[1] = AS_TRANSFORM_ABORT;
 	else
 		return -1;
 
 	KdPrint(("SET_ARRAY_STATE(%x, %d)", param[0], param[1]));
 	result = HPT_DO_IOCTL(HPT_IOCTL_SET_ARRAY_STATE,
 				param, sizeof(param), 0, 0);
 				
 	for (i=0; i<devinfo.u.array.nDisk; i++)
 		if (DEVICEID_VALID(devinfo.u.array.Members[i]))
 			__hpt_stop_tasks(vbus_ext, devinfo.u.array.Members[i]);
 			
 	return result;
 }
 
 static void hpt_stop_tasks(PVBUS_EXT vbus_ext)
 {
 	DEVICEID ids[32];
 	int i, count;
 
 	count = hpt_get_logical_devices((DEVICEID *)&ids, sizeof(ids)/sizeof(ids[0]));
 	
 	for (i=0; i<count; i++)
 		__hpt_stop_tasks(vbus_ext, ids[i]);
 }
 
 static	d_open_t	hpt_open;
 static	d_close_t	hpt_close;
 static	d_ioctl_t	hpt_ioctl;
 static  int 		hpt_rescan_bus(void);
 
 static struct cdevsw hpt_cdevsw = {
 	.d_open =	hpt_open,
 	.d_close =	hpt_close,
 	.d_ioctl =	hpt_ioctl,
 	.d_name =	driver_name,
 	.d_version =	D_VERSION,
 };
 
 static struct intr_config_hook hpt_ich;
 
 /*
  * hpt_final_init will be called after all hpt_attach.
  */
 static void hpt_final_init(void *dummy)
 {
 	int       i,unit_number=0;
 	PVBUS_EXT vbus_ext;
 	PVBUS vbus;
 	PHBA hba;
 
 	/* Clear the config hook */
 	config_intrhook_disestablish(&hpt_ich);
 
 	/* allocate memory */
 	i = 0;
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		if (hpt_alloc_mem(vbus_ext)) {
 			os_printk("out of memory");
 			return;
 		}
 		i++;
 	}
 
 	if (!i) {
 		if (bootverbose)
 			os_printk("no controller detected.");
 		return;
 	}
 
 	/* initializing hardware */
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		/* make timer available here */
 		mtx_init(&vbus_ext->lock, "hptsleeplock", NULL, MTX_DEF);
 		callout_init_mtx(&vbus_ext->timer, &vbus_ext->lock, 0);
 		if (hpt_init_vbus(vbus_ext)) {
 			os_printk("fail to initialize hardware");
 			break; /* FIXME */
 		}
 	}
 
 	/* register CAM interface */
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		struct cam_devq *devq;
 		struct ccb_setasync	ccb;
 		
 		if (bus_dma_tag_create(NULL,/* parent */
 				4,	/* alignment */
 				BUS_SPACE_MAXADDR_32BIT+1, /* boundary */
 				BUS_SPACE_MAXADDR,	/* lowaddr */
 				BUS_SPACE_MAXADDR, 	/* highaddr */
 				NULL, NULL, 		/* filter, filterarg */
 				PAGE_SIZE * (os_max_sg_descriptors-1),	/* maxsize */
 				os_max_sg_descriptors,	/* nsegments */
 				0x10000,	/* maxsegsize */
 				BUS_DMA_WAITOK,		/* flags */
 				busdma_lock_mutex,	/* lockfunc */
 				&vbus_ext->lock,		/* lockfuncarg */
 				&vbus_ext->io_dmat	/* tag */))
 		{
 			return ;
 		}
 
 		for (i=0; i<os_max_queue_comm; i++) {
 			POS_CMDEXT ext = (POS_CMDEXT)malloc(sizeof(OS_CMDEXT), M_DEVBUF, M_WAITOK);
 			if (!ext) {
 				os_printk("Can't alloc cmdext(%d)", i);
 				return ;
 			}
 			ext->vbus_ext = vbus_ext;
 			ext->next = vbus_ext->cmdext_list;
 			vbus_ext->cmdext_list = ext;
 	
 			if (bus_dmamap_create(vbus_ext->io_dmat, 0, &ext->dma_map)) {
 				os_printk("Can't create dma map(%d)", i);
 				return ;
 			}
 			callout_init_mtx(&ext->timeout, &vbus_ext->lock, 0);
 		}
 
 		if ((devq = cam_simq_alloc(os_max_queue_comm)) == NULL) {
 			os_printk("cam_simq_alloc failed");
 			return ;
 		}
 		vbus_ext->sim = cam_sim_alloc(hpt_action, hpt_poll, driver_name,
 				vbus_ext, unit_number, &vbus_ext->lock, os_max_queue_comm, /*tagged*/8,  devq);
 		unit_number++;
 		if (!vbus_ext->sim) {
 			os_printk("cam_sim_alloc failed");
 			cam_simq_free(devq);
 			return ;
 		}
 
 		hpt_lock_vbus(vbus_ext);
 		if (xpt_bus_register(vbus_ext->sim, NULL, 0) != CAM_SUCCESS) {
 			hpt_unlock_vbus(vbus_ext);
 			os_printk("xpt_bus_register failed");
 			cam_sim_free(vbus_ext->sim, /*free devq*/ TRUE);
 			vbus_ext->sim = NULL;
 			return ;
 		}
 	
 		if (xpt_create_path(&vbus_ext->path, /*periph */ NULL,
 				cam_sim_path(vbus_ext->sim), CAM_TARGET_WILDCARD,
 				CAM_LUN_WILDCARD) != CAM_REQ_CMP)
 		{
 			hpt_unlock_vbus(vbus_ext);
 			os_printk("xpt_create_path failed");
 			xpt_bus_deregister(cam_sim_path(vbus_ext->sim));
 			cam_sim_free(vbus_ext->sim, /*free_devq*/TRUE);
 			vbus_ext->sim = NULL;
 			return ;
 		}
 
 		memset(&ccb, 0, sizeof(ccb));
 		xpt_setup_ccb(&ccb.ccb_h, vbus_ext->path, /*priority*/5);
 		ccb.ccb_h.func_code = XPT_SASYNC_CB;
 		ccb.event_enable = AC_LOST_DEVICE;
 		ccb.callback = hpt_async;
 		ccb.callback_arg = vbus_ext;
 		xpt_action((union ccb *)&ccb);
 		hpt_unlock_vbus(vbus_ext);
 
 		for (hba = vbus_ext->hba_list; hba; hba = hba->next) {
 			int rid = 0;
 			if ((hba->irq_res = bus_alloc_resource_any(hba->pcidev,
 				SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL)
 			{
 				os_printk("can't allocate interrupt");
 				return ;
 			}
 			if (bus_setup_intr(hba->pcidev, hba->irq_res, INTR_TYPE_CAM | INTR_MPSAFE,
 				NULL, hpt_pci_intr, vbus_ext, &hba->irq_handle)) 
 			{
 				os_printk("can't set up interrupt");
 				return ;
 			}
 			hba->ldm_adapter.him->intr_control(hba->ldm_adapter.him_handle, HPT_TRUE);
 
 		}
 
 		vbus_ext->shutdown_eh = EVENTHANDLER_REGISTER(shutdown_final, 
 									hpt_shutdown_vbus, vbus_ext, SHUTDOWN_PRI_DEFAULT);
 		if (!vbus_ext->shutdown_eh)
 			os_printk("Shutdown event registration failed");
 	}
 	
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		TASK_INIT(&vbus_ext->worker, 0, (task_fn_t *)hpt_do_tasks, vbus_ext);
 		if (vbus_ext->tasks)
 			TASK_ENQUEUE(&vbus_ext->worker);
 	}	
 
 	make_dev(&hpt_cdevsw, DRIVER_MINOR, UID_ROOT, GID_OPERATOR,
 	    S_IRUSR | S_IWUSR, "%s", driver_name);
 }
 
 #if defined(KLD_MODULE)
 
 typedef struct driverlink *driverlink_t;
 struct driverlink {
 	kobj_class_t	driver;
 	TAILQ_ENTRY(driverlink) link;	/* list of drivers in devclass */
 };
 
 typedef TAILQ_HEAD(driver_list, driverlink) driver_list_t;
 
 struct devclass {
 	TAILQ_ENTRY(devclass) link;
 	devclass_t	parent;		/* parent in devclass hierarchy */
 	driver_list_t	drivers;     /* bus devclasses store drivers for bus */
 	char		*name;
 	device_t	*devices;	/* array of devices indexed by unit */
 	int		maxunit;	/* size of devices array */
 };
 
 static void override_kernel_driver(void)
 {
 	driverlink_t dl, dlfirst;
 	driver_t *tmpdriver;
 	devclass_t dc = devclass_find("pci");
 	
 	if (dc){
 		dlfirst = TAILQ_FIRST(&dc->drivers);
 		for (dl = dlfirst; dl; dl = TAILQ_NEXT(dl, link)) {
 			if(strcmp(dl->driver->name, driver_name) == 0) {
 				tmpdriver=dl->driver;
 				dl->driver=dlfirst->driver;
 				dlfirst->driver=tmpdriver;
 				break;
 			}
 		}
 	}
 }
 
 #else 
 #define override_kernel_driver()
 #endif
 
 static void hpt_init(void *dummy)
 {
 	if (bootverbose)
 		os_printk("%s %s", driver_name_long, driver_ver);
 
 	override_kernel_driver();
 	init_config();
 
 	hpt_ich.ich_func = hpt_final_init;
 	hpt_ich.ich_arg = NULL;
 	if (config_intrhook_establish(&hpt_ich) != 0) {
 		printf("%s: cannot establish configuration hook\n",
 		    driver_name_long);
 	}
 
 }
 SYSINIT(hptinit, SI_SUB_CONFIGURE, SI_ORDER_FIRST, hpt_init, NULL);
 
 /*
  * CAM driver interface
  */
 static device_method_t driver_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		hpt_probe),
 	DEVMETHOD(device_attach,	hpt_attach),
 	DEVMETHOD(device_detach,	hpt_detach),
 	DEVMETHOD(device_shutdown,	hpt_shutdown),
 	{ 0, 0 }
 };
 
 static driver_t hpt_pci_driver = {
 	driver_name,
 	driver_methods,
 	sizeof(HBA)
 };
 
 #ifndef TARGETNAME
 #error "no TARGETNAME found"
 #endif
 
 /* use this to make TARGETNAME be expanded */
 #define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5)
 #define __MODULE_VERSION(p1, p2) MODULE_VERSION(p1, p2)
 #define __MODULE_DEPEND(p1, p2, p3, p4, p5) MODULE_DEPEND(p1, p2, p3, p4, p5)
 __DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, 0, 0);
 __MODULE_VERSION(TARGETNAME, 1);
 __MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
 
 static int hpt_open(struct cdev *dev, int flags, int devtype, struct thread *td)
 {
 	return 0;
 }
 
 static int hpt_close(struct cdev *dev, int flags, int devtype, struct thread *td)
 {
 	return 0;
 }
 
 static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread *td)
 {
 	PHPT_IOCTL_PARAM piop=(PHPT_IOCTL_PARAM)data;
 	IOCTL_ARG ioctl_args;
 	HPT_U32 bytesReturned = 0;
 
 	switch (cmd){
 	case HPT_DO_IOCONTROL:
 	{	
 		if (piop->Magic == HPT_IOCTL_MAGIC || piop->Magic == HPT_IOCTL_MAGIC32) {
 			KdPrint(("<8>ioctl=%x in=%p len=%d out=%p len=%d\n",
 				piop->dwIoControlCode,
 				piop->lpInBuffer,
 				piop->nInBufferSize,
 				piop->lpOutBuffer,
 				piop->nOutBufferSize));
 			
 		memset(&ioctl_args, 0, sizeof(ioctl_args));
 		
 		ioctl_args.dwIoControlCode = piop->dwIoControlCode;
 		ioctl_args.nInBufferSize = piop->nInBufferSize;
 		ioctl_args.nOutBufferSize = piop->nOutBufferSize;
 		ioctl_args.lpBytesReturned = &bytesReturned;
 
 		if (ioctl_args.nInBufferSize) {
 			ioctl_args.lpInBuffer = malloc(ioctl_args.nInBufferSize, M_DEVBUF, M_WAITOK);
 			if (!ioctl_args.lpInBuffer)
 				goto invalid;
 			if (copyin((void*)piop->lpInBuffer,
 					ioctl_args.lpInBuffer, piop->nInBufferSize))
 				goto invalid;
 		}
 	
 		if (ioctl_args.nOutBufferSize) {
 			ioctl_args.lpOutBuffer = malloc(ioctl_args.nOutBufferSize, M_DEVBUF, M_WAITOK | M_ZERO);
 			if (!ioctl_args.lpOutBuffer)
 				goto invalid;
 		}
 
 		hpt_do_ioctl(&ioctl_args);
 
 		if (ioctl_args.result==HPT_IOCTL_RESULT_OK) {
 			if (piop->nOutBufferSize) {
 				if (copyout(ioctl_args.lpOutBuffer,
 					(void*)piop->lpOutBuffer, piop->nOutBufferSize))
 					goto invalid;
 			}
 			if (piop->lpBytesReturned) {
 				if (copyout(&bytesReturned,
 					(void*)piop->lpBytesReturned, sizeof(HPT_U32)))
 					goto invalid;
 			}
 			if (ioctl_args.lpInBuffer) free(ioctl_args.lpInBuffer, M_DEVBUF);
 			if (ioctl_args.lpOutBuffer) free(ioctl_args.lpOutBuffer, M_DEVBUF);
 			return 0;
 		}
 invalid:
 		if (ioctl_args.lpInBuffer) free(ioctl_args.lpInBuffer, M_DEVBUF);
 		if (ioctl_args.lpOutBuffer) free(ioctl_args.lpOutBuffer, M_DEVBUF);
 		return EFAULT;
 	}
 	return EFAULT;
 	}
 
 	case HPT_SCAN_BUS:
 	{
 		return hpt_rescan_bus();
 	}
 	default:
 		KdPrint(("invalid command!"));
 		return EFAULT;
 	}	
 
 }
 
 static int	hpt_rescan_bus(void)
 {
 	union ccb			*ccb;
 	PVBUS 				vbus;
 	PVBUS_EXT			vbus_ext;
 
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		if ((ccb = xpt_alloc_ccb()) == NULL)
 		{
 			return(ENOMEM);
 		}
 		if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(vbus_ext->sim),
 			CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP)	
 		{
 			xpt_free_ccb(ccb);
 			return(EIO);
 		}
 		xpt_rescan(ccb);
 	}
 	return(0);	
 }
 
diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c
index 4a014ce17f4e..5c4718bf582f 100644
--- a/sys/dev/hptmv/entry.c
+++ b/sys/dev/hptmv/entry.c
@@ -1,2975 +1,2975 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2004-2005 HighPoint Technologies, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/malloc.h>
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <sys/callout.h>
 #include <sys/signalvar.h>
 #include <sys/eventhandler.h>
 #include <sys/proc.h>
 #include <sys/kthread.h>
 
 #include <sys/mutex.h>
 #include <sys/module.h>
 #include <sys/sx.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
 #ifndef __KERNEL__
 #define __KERNEL__
 #endif
 
 #include <dev/hptmv/global.h>
 #include <dev/hptmv/hptintf.h>
 #include <dev/hptmv/osbsd.h>
 #include <dev/hptmv/access601.h>
 
 
 #ifdef DEBUG
 #ifdef DEBUG_LEVEL
 int hpt_dbg_level = DEBUG_LEVEL;
 #else 
 int hpt_dbg_level = 0;
 #endif
 #endif
 
 #define MV_ERROR printf
 
 /*
  * CAM SIM entry points
  */
 static int 	hpt_probe (device_t dev);
 static void launch_worker_thread(void);
 static int 	hpt_attach(device_t dev);
 static int 	hpt_detach(device_t dev);
 static int 	hpt_shutdown(device_t dev);
 static void hpt_poll(struct cam_sim *sim);
 static void hpt_intr(void *arg);
 static void hpt_async(void *callback_arg, u_int32_t code, struct cam_path *path, void *arg);
 static void hpt_action(struct cam_sim *sim, union ccb *ccb);
 
 static device_method_t driver_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		hpt_probe),
 	DEVMETHOD(device_attach,	hpt_attach),
 	DEVMETHOD(device_detach,	hpt_detach),
 
 	DEVMETHOD(device_shutdown,	hpt_shutdown),
 	DEVMETHOD_END
 };
 
 static driver_t hpt_pci_driver = {
 	__str(PROC_DIR_NAME),
 	driver_methods,
 	sizeof(IAL_ADAPTER_T)
 };
 
 #define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5)
 __DRIVER_MODULE(PROC_DIR_NAME, pci, hpt_pci_driver, 0, 0);
 MODULE_DEPEND(PROC_DIR_NAME, cam, 1, 1, 1);
 
 #define ccb_ccb_ptr spriv_ptr0
 #define ccb_adapter ccb_h.spriv_ptr1
 
 static void SetInquiryData(PINQUIRYDATA inquiryData, PVDevice pVDev);
 static void HPTLIBAPI OsSendCommand (_VBUS_ARG union ccb * ccb);
 static void HPTLIBAPI fOsCommandDone(_VBUS_ARG PCommand pCmd);
 static void ccb_done(union ccb *ccb);
 static void hpt_queue_ccb(union ccb **ccb_Q, union ccb *ccb);
 static void hpt_free_ccb(union ccb **ccb_Q, union ccb *ccb);
 static void hpt_intr_locked(IAL_ADAPTER_T *pAdapter);
 static void	hptmv_free_edma_queues(IAL_ADAPTER_T *pAdapter);
 static void	hptmv_free_channel(IAL_ADAPTER_T *pAdapter, MV_U8 channelNum);
 static void	handleEdmaError(_VBUS_ARG PCommand pCmd);
 static int	hptmv_init_channel(IAL_ADAPTER_T *pAdapter, MV_U8 channelNum);
 static int	fResetActiveCommands(PVBus _vbus_p);
 static void	fRegisterVdevice(IAL_ADAPTER_T *pAdapter);
 static int	hptmv_allocate_edma_queues(IAL_ADAPTER_T *pAdapter);
 static void	hptmv_handle_event_disconnect(void *data);
 static void	hptmv_handle_event_connect(void *data);
 static int	start_channel(IAL_ADAPTER_T *pAdapter, MV_U8 channelNum);
 static void	init_vdev_params(IAL_ADAPTER_T *pAdapter, MV_U8 channel);
 static int	hptmv_parse_identify_results(MV_SATA_CHANNEL *pMvSataChannel);
 static int HPTLIBAPI fOsBuildSgl(_VBUS_ARG PCommand pCmd, FPSCAT_GATH pSg,
     int logical);
 static MV_BOOLEAN CommandCompletionCB(MV_SATA_ADAPTER *pMvSataAdapter,
     MV_U8 channelNum, MV_COMPLETION_TYPE comp_type, MV_VOID_PTR commandId,
     MV_U16 responseFlags, MV_U32 timeStamp,
     MV_STORAGE_DEVICE_REGISTERS *registerStruct);
 static MV_BOOLEAN hptmv_event_notify(MV_SATA_ADAPTER *pMvSataAdapter,
     MV_EVENT_TYPE eventType, MV_U32 param1, MV_U32 param2);
 
 #define ccb_ccb_ptr spriv_ptr0
 #define ccb_adapter ccb_h.spriv_ptr1
 
 static struct sx hptmv_list_lock;
 SX_SYSINIT(hptmv_list_lock, &hptmv_list_lock, "hptmv list");
 IAL_ADAPTER_T *gIal_Adapter = NULL;
 IAL_ADAPTER_T *pCurAdapter = NULL;
 static MV_SATA_CHANNEL gMvSataChannels[MAX_VBUS][MV_SATA_CHANNELS_NUM];
 
 typedef struct st_HPT_DPC {
 	IAL_ADAPTER_T *pAdapter;
 	void (*dpc)(IAL_ADAPTER_T *, void *, UCHAR);
 	void *arg;
 	UCHAR flags;
 } ST_HPT_DPC;
 
 #define MAX_DPC 16
 UCHAR DPC_Request_Nums = 0; 
 static ST_HPT_DPC DpcQueue[MAX_DPC];
 static int DpcQueue_First=0;
 static int DpcQueue_Last = 0;
 static struct mtx DpcQueue_Lock;
 MTX_SYSINIT(hpmtv_dpc_lock, &DpcQueue_Lock, "hptmv dpc", MTX_DEF);
 
 char DRIVER_VERSION[] = "v1.16";
 
 /*******************************************************************************
  *	Name:	hptmv_free_channel
  *
  *	Description:	free allocated queues for the given channel
  *
  *	Parameters:    	pMvSataAdapter - pointer to the RR18xx controller this 
  * 					channel connected to. 
  *			channelNum - channel number. 
  *     
  ******************************************************************************/
 static void
 hptmv_free_channel(IAL_ADAPTER_T *pAdapter, MV_U8 channelNum)
 {
 	HPT_ASSERT(channelNum < MV_SATA_CHANNELS_NUM);
 	pAdapter->mvSataAdapter.sataChannel[channelNum] = NULL;
 }
 
 static void failDevice(PVDevice pVDev)
 {
 	PVBus _vbus_p = pVDev->pVBus;
 	IAL_ADAPTER_T *pAdapter = (IAL_ADAPTER_T *)_vbus_p->OsExt;
 	
 	pVDev->u.disk.df_on_line = 0;
 	pVDev->vf_online = 0;
 	if (pVDev->pfnDeviceFailed) 
 		CallWhenIdle(_VBUS_P (DPC_PROC)pVDev->pfnDeviceFailed, pVDev);
 
 	fNotifyGUI(ET_DEVICE_REMOVED, pVDev);
 
 #ifndef FOR_DEMO
 	if (pAdapter->ver_601==2 && !pAdapter->beeping) {
 		pAdapter->beeping = 1;
 		BeepOn(pAdapter->mvSataAdapter.adapterIoBaseAddress);
 		set_fail_led(&pAdapter->mvSataAdapter, pVDev->u.disk.mv->channelNumber, 1);
 	}
 #endif
 }
 
 int MvSataResetChannel(MV_SATA_ADAPTER *pMvSataAdapter, MV_U8 channel);
 
 static void
 handleEdmaError(_VBUS_ARG PCommand pCmd)
 {
 	PDevice pDevice = &pCmd->pVDevice->u.disk;
 	MV_SATA_ADAPTER * pSataAdapter = pDevice->mv->mvSataAdapter;
 
 	if (!pDevice->df_on_line) {
 		KdPrint(("Device is offline"));
 		pCmd->Result = RETURN_BAD_DEVICE;
 		CallAfterReturn(_VBUS_P (DPC_PROC)pCmd->pfnCompletion, pCmd);	
 		return;
 	}
 
 	if (pCmd->RetryCount++>5) {
 		hpt_printk(("too many retries on channel(%d)\n", pDevice->mv->channelNumber));
 failed:
 		failDevice(pCmd->pVDevice);
 		pCmd->Result = RETURN_IDE_ERROR;
 		CallAfterReturn(_VBUS_P (DPC_PROC)pCmd->pfnCompletion, pCmd);	
 		return;
 	}
 
 	/* reset the channel and retry the command */
 	if (MvSataResetChannel(pSataAdapter, pDevice->mv->channelNumber))
 		goto failed;
 
 	fNotifyGUI(ET_DEVICE_ERROR, Map2pVDevice(pDevice));
 
 	hpt_printk(("Retry on channel(%d)\n", pDevice->mv->channelNumber));
 	fDeviceSendCommand(_VBUS_P pCmd);
 }
 
 /****************************************************************
  *	Name:	hptmv_init_channel
  *
  *	Description:	allocate request and response queues for the EDMA of the 
  *					given channel and sets other fields.
  *
  *	Parameters:    	
  *		pAdapter - pointer to the emulated adapter data structure
  *		channelNum - channel number. 
  *	Return:	0 on success, otherwise on failure
  ****************************************************************/
 static int
 hptmv_init_channel(IAL_ADAPTER_T *pAdapter, MV_U8 channelNum)
 {
 	MV_SATA_CHANNEL *pMvSataChannel;
 	dma_addr_t    req_dma_addr;
 	dma_addr_t    rsp_dma_addr;
 
 	if (channelNum >= MV_SATA_CHANNELS_NUM)
 	{
 		MV_ERROR("RR18xx[%d]: Bad channelNum=%d",
 				 pAdapter->mvSataAdapter.adapterId, channelNum);
 		return -1;
 	}
 
 	pMvSataChannel = &gMvSataChannels[pAdapter->mvSataAdapter.adapterId][channelNum];
 	pAdapter->mvSataAdapter.sataChannel[channelNum] = pMvSataChannel;
 	pMvSataChannel->channelNumber = channelNum;
 	pMvSataChannel->lba48Address = MV_FALSE;
 	pMvSataChannel->maxReadTransfer = MV_FALSE;
 
 	pMvSataChannel->requestQueue = (struct mvDmaRequestQueueEntry *)
 								   (pAdapter->requestsArrayBaseAlignedAddr + (channelNum * MV_EDMA_REQUEST_QUEUE_SIZE));
 	req_dma_addr = pAdapter->requestsArrayBaseDmaAlignedAddr + (channelNum * MV_EDMA_REQUEST_QUEUE_SIZE);
 
 
 	KdPrint(("requestQueue addr is 0x%llX", (HPT_U64)(ULONG_PTR)req_dma_addr));
 
 	/* check the 1K alignment of the request queue*/
 	if (req_dma_addr & 0x3ff)
 	{
 		MV_ERROR("RR18xx[%d]: request queue allocated isn't 1 K aligned,"
 				 " dma_addr=%llx channel=%d\n", pAdapter->mvSataAdapter.adapterId,
 				 (HPT_U64)(ULONG_PTR)req_dma_addr, channelNum);
 		return -1;
 	}
 	pMvSataChannel->requestQueuePciLowAddress = req_dma_addr;
 	pMvSataChannel->requestQueuePciHiAddress = 0;
 	KdPrint(("RR18xx[%d,%d]: request queue allocated: 0x%p",
 			  pAdapter->mvSataAdapter.adapterId, channelNum,
 			  pMvSataChannel->requestQueue));
 	pMvSataChannel->responseQueue = (struct mvDmaResponseQueueEntry *)
 									(pAdapter->responsesArrayBaseAlignedAddr + (channelNum * MV_EDMA_RESPONSE_QUEUE_SIZE));
 	rsp_dma_addr = pAdapter->responsesArrayBaseDmaAlignedAddr + (channelNum * MV_EDMA_RESPONSE_QUEUE_SIZE);
 
 	/* check the 256 alignment of the response queue*/
 	if (rsp_dma_addr & 0xff)
 	{
 		MV_ERROR("RR18xx[%d,%d]: response queue allocated isn't 256 byte "
 				 "aligned, dma_addr=%llx\n",
 				 pAdapter->mvSataAdapter.adapterId, channelNum, (HPT_U64)(ULONG_PTR)rsp_dma_addr);
 		return -1;
 	}
 	pMvSataChannel->responseQueuePciLowAddress = rsp_dma_addr;
 	pMvSataChannel->responseQueuePciHiAddress = 0;
 	KdPrint(("RR18xx[%d,%d]: response queue allocated: 0x%p",
 			  pAdapter->mvSataAdapter.adapterId, channelNum,
 			  pMvSataChannel->responseQueue));
 
 	pAdapter->mvChannel[channelNum].online = MV_TRUE;
 	return 0;
 }
 
 /******************************************************************************
  *	Name: hptmv_parse_identify_results
  *
  *	Description:	this functions parses the identify command results, checks
  *					that the connected deives can be accesed by RR18xx EDMA,
  *					and updates the channel structure accordingly.
  *
  *	Parameters:     pMvSataChannel, pointer to the channel data structure.
  *
  *	Returns:       	=0 ->success, < 0 ->failure.
  *
  ******************************************************************************/
 static int
 hptmv_parse_identify_results(MV_SATA_CHANNEL *pMvSataChannel)
 {
 	MV_U16  *iden = pMvSataChannel->identifyDevice;
 
 	/*LBA addressing*/
 	if (! (iden[IDEN_CAPACITY_1_OFFSET] & 0x200))
 	{
 		KdPrint(("IAL Error in IDENTIFY info: LBA not supported\n"));
 		return -1;
 	}
 	else
 	{
 		KdPrint(("%25s - %s\n", "Capabilities", "LBA supported"));
 	}
 	/*DMA support*/
 	if (! (iden[IDEN_CAPACITY_1_OFFSET] & 0x100))
 	{
 		KdPrint(("IAL Error in IDENTIFY info: DMA not supported\n"));
 		return -1;
 	}
 	else
 	{
 		KdPrint(("%25s - %s\n", "Capabilities", "DMA supported"));
 	}
 	/* PIO */
 	if ((iden[IDEN_VALID] & 2) == 0)
 	{
 		KdPrint(("IAL Error in IDENTIFY info: not able to find PIO mode\n"));
 		return -1;
 	}
 	KdPrint(("%25s - 0x%02x\n", "PIO modes supported",
 			  iden[IDEN_PIO_MODE_SPPORTED] & 0xff));
 
 	/*UDMA*/
 	if ((iden[IDEN_VALID] & 4) == 0)
 	{
 		KdPrint(("IAL Error in IDENTIFY info: not able to find UDMA mode\n"));
 		return -1;
 	}
 
 	/* 48 bit address */
 	if ((iden[IDEN_SUPPORTED_COMMANDS2] & 0x400))
 	{
 		KdPrint(("%25s - %s\n", "LBA48 addressing", "supported"));
 		pMvSataChannel->lba48Address = MV_TRUE;
 	}
 	else
 	{
 		KdPrint(("%25s - %s\n", "LBA48 addressing", "Not supported"));
 		pMvSataChannel->lba48Address = MV_FALSE;
 	}
 	return 0;
 }
 
 static void
 init_vdev_params(IAL_ADAPTER_T *pAdapter, MV_U8 channel)
 {
 	PVDevice pVDev = &pAdapter->VDevices[channel];
 	MV_SATA_CHANNEL *pMvSataChannel = pAdapter->mvSataAdapter.sataChannel[channel];
 	MV_U16_PTR IdentifyData = pMvSataChannel->identifyDevice;
 
 	pMvSataChannel->outstandingCommands = 0;
 
 	pVDev->u.disk.mv         = pMvSataChannel;
 	pVDev->u.disk.df_on_line = 1;
 	pVDev->u.disk.pVBus      = &pAdapter->VBus;
 	pVDev->pVBus             = &pAdapter->VBus;
 
 #ifdef SUPPORT_48BIT_LBA
 	if (pMvSataChannel->lba48Address == MV_TRUE)
 		pVDev->u.disk.dDeRealCapacity = ((IdentifyData[101]<<16) | IdentifyData[100]) - 1;
 	else
 #endif
 	if(IdentifyData[53] & 1) {
 	pVDev->u.disk.dDeRealCapacity = 
 	  (((IdentifyData[58]<<16 | IdentifyData[57]) < (IdentifyData[61]<<16 | IdentifyData[60])) ? 
 		  (IdentifyData[61]<<16 | IdentifyData[60]) :
 				(IdentifyData[58]<<16 | IdentifyData[57])) - 1;
 	} else
 		pVDev->u.disk.dDeRealCapacity = 
 				 (IdentifyData[61]<<16 | IdentifyData[60]) - 1;
 
 	pVDev->u.disk.bDeUsable_Mode = pVDev->u.disk.bDeModeSetting = 
 		pAdapter->mvChannel[channel].maxPioModeSupported - MV_ATA_TRANSFER_PIO_0;
 
 	if (pAdapter->mvChannel[channel].maxUltraDmaModeSupported!=0xFF) {
 		pVDev->u.disk.bDeUsable_Mode = pVDev->u.disk.bDeModeSetting = 
 			pAdapter->mvChannel[channel].maxUltraDmaModeSupported - MV_ATA_TRANSFER_UDMA_0 + 8;
 	}
 }
 
 static void device_change(IAL_ADAPTER_T *pAdapter , MV_U8 channelIndex, int plugged)
 {
 	PVDevice pVDev;
 	MV_SATA_ADAPTER  *pMvSataAdapter = &pAdapter->mvSataAdapter;
 	MV_SATA_CHANNEL  *pMvSataChannel = pMvSataAdapter->sataChannel[channelIndex];
 	
 	if (!pMvSataChannel) return;
 
 	if (plugged)
 	{
 		pVDev = &(pAdapter->VDevices[channelIndex]);
 		init_vdev_params(pAdapter, channelIndex);
 
 		pVDev->VDeviceType = pVDev->u.disk.df_atapi? VD_ATAPI : 
 			pVDev->u.disk.df_removable_drive? VD_REMOVABLE : VD_SINGLE_DISK;
 
 		pVDev->VDeviceCapacity = pVDev->u.disk.dDeRealCapacity-SAVE_FOR_RAID_INFO;
 		pVDev->pfnSendCommand = pfnSendCommand[pVDev->VDeviceType];
 		pVDev->pfnDeviceFailed = pfnDeviceFailed[pVDev->VDeviceType];
 		pVDev->vf_online = 1;
 
 #ifdef SUPPORT_ARRAY
 		if(pVDev->pParent) 
 		{
 			int iMember;
 			for(iMember = 0; iMember < 	pVDev->pParent->u.array.bArnMember; iMember++)
 				if((PVDevice)pVDev->pParent->u.array.pMember[iMember] == pVDev)
 					pVDev->pParent->u.array.pMember[iMember] = NULL;
 			pVDev->pParent = NULL;
 		}
 #endif
 		fNotifyGUI(ET_DEVICE_PLUGGED,pVDev);
 		fCheckBootable(pVDev);
 		RegisterVDevice(pVDev);
 
 #ifndef FOR_DEMO
 		if (pAdapter->beeping) {
 			pAdapter->beeping = 0;
 			BeepOff(pAdapter->mvSataAdapter.adapterIoBaseAddress);
 		}
 #endif
 
 	}
 	else
 	{
 		pVDev  = &(pAdapter->VDevices[channelIndex]);
 		failDevice(pVDev);
 	}
 }
 
 static int
 start_channel(IAL_ADAPTER_T *pAdapter, MV_U8 channelNum)
 {
 	MV_SATA_ADAPTER *pMvSataAdapter = &pAdapter->mvSataAdapter;
 	MV_SATA_CHANNEL *pMvSataChannel = pMvSataAdapter->sataChannel[channelNum];
 	MV_CHANNEL		*pChannelInfo = &(pAdapter->mvChannel[channelNum]);
 	MV_U32          udmaMode,pioMode;
 
 	KdPrint(("RR18xx [%d]: start channel (%d)", pMvSataAdapter->adapterId, 
 			 channelNum));
 
 
 	/* Software reset channel */
 	if (mvStorageDevATASoftResetDevice(pMvSataAdapter, channelNum) == MV_FALSE)
 	{
 		MV_ERROR("RR18xx [%d,%d]: failed to perform Software reset\n",
 				 pMvSataAdapter->adapterId, channelNum);
 		return -1;
 	}
 
 	/* Hardware reset channel */
 	if (mvSataChannelHardReset(pMvSataAdapter, channelNum) == MV_FALSE)
 	{
 		/* If failed, try again - this is when trying to hardreset a channel */
 		/* when drive is just spinning up */
 		StallExec(5000000); /* wait 5 sec before trying again */
 		if (mvSataChannelHardReset(pMvSataAdapter, channelNum) == MV_FALSE)
 		{
 			MV_ERROR("RR18xx [%d,%d]: failed to perform Hard reset\n",
 					 pMvSataAdapter->adapterId, channelNum);
 			return -1;
 		}
 	}
 
 	/* identify device*/
 	if (mvStorageDevATAIdentifyDevice(pMvSataAdapter, channelNum) == MV_FALSE)
 	{
 		MV_ERROR("RR18xx [%d,%d]: failed to perform ATA Identify command\n"
 				 , pMvSataAdapter->adapterId, channelNum);
 		return -1;
 	}
 	if (hptmv_parse_identify_results(pMvSataChannel))
 	{
 		MV_ERROR("RR18xx [%d,%d]: Error in parsing ATA Identify message\n"
 				 , pMvSataAdapter->adapterId, channelNum);
 		return -1;
 	}
 
 	/* mvStorageDevATASetFeatures */
 	/* Disable 8 bit PIO in case CFA enabled */
 	if (pMvSataChannel->identifyDevice[86] & 4)
 	{
 		KdPrint(("RR18xx [%d]: Disable 8 bit PIO (CFA enabled) \n",
 				  pMvSataAdapter->adapterId));
 		if (mvStorageDevATASetFeatures(pMvSataAdapter, channelNum,
 									   MV_ATA_SET_FEATURES_DISABLE_8_BIT_PIO, 0,
 									   0, 0, 0) == MV_FALSE)
 		{
 			MV_ERROR("RR18xx [%d]: channel %d: mvStorageDevATASetFeatures"
 					 " failed\n", pMvSataAdapter->adapterId, channelNum); 
 			return -1;
 		}
 	}
 	/* Write cache */
 #ifdef ENABLE_WRITE_CACHE
 	if (pMvSataChannel->identifyDevice[82] & 0x20)
 	{
 		if (!(pMvSataChannel->identifyDevice[85] & 0x20)) /* if not enabled by default */
 		{
 			if (mvStorageDevATASetFeatures(pMvSataAdapter, channelNum,
 										   MV_ATA_SET_FEATURES_ENABLE_WCACHE, 0,
 										   0, 0, 0) == MV_FALSE)
 			{
 				MV_ERROR("RR18xx [%d]: channel %d: mvStorageDevATASetFeatures failed\n",
 						 pMvSataAdapter->adapterId, channelNum); 
 				return -1;
 			}
 		}
 		KdPrint(("RR18xx [%d]: channel %d, write cache enabled\n",
 				  pMvSataAdapter->adapterId, channelNum));
 	}
 	else
 	{
 		KdPrint(("RR18xx [%d]: channel %d, write cache not supported\n",
 				  pMvSataAdapter->adapterId, channelNum));
 	}
 #else /* disable write cache */
 	{
 		if (pMvSataChannel->identifyDevice[85] & 0x20)
 		{
 			KdPrint(("RR18xx [%d]: channel =%d, disable write cache\n",
 					  pMvSataAdapter->adapterId, channelNum));
 			if (mvStorageDevATASetFeatures(pMvSataAdapter, channelNum,
 										   MV_ATA_SET_FEATURES_DISABLE_WCACHE, 0,
 										   0, 0, 0) == MV_FALSE)
 			{
 				MV_ERROR("RR18xx [%d]: channel %d: mvStorageDevATASetFeatures failed\n",
 						 pMvSataAdapter->adapterId, channelNum); 
 				return -1;
 			}
 		}
 		KdPrint(("RR18xx [%d]: channel=%d, write cache disabled\n",
 				  pMvSataAdapter->adapterId, channelNum));
 	}
 #endif
 
 	/* Set transfer mode */
 	KdPrint(("RR18xx [%d] Set transfer mode XFER_PIO_SLOW\n",
 			  pMvSataAdapter->adapterId));
 	if (mvStorageDevATASetFeatures(pMvSataAdapter, channelNum,
 								   MV_ATA_SET_FEATURES_TRANSFER,
 								   MV_ATA_TRANSFER_PIO_SLOW, 0, 0, 0) == 
 		MV_FALSE)
 	{
 		MV_ERROR("RR18xx [%d] channel %d: Set Features failed\n",
 				 pMvSataAdapter->adapterId, channelNum); 
 		return -1;
 	}
 
 	if (pMvSataChannel->identifyDevice[IDEN_PIO_MODE_SPPORTED] & 1)
 	{
 		pioMode = MV_ATA_TRANSFER_PIO_4;
 	}
 	else if (pMvSataChannel->identifyDevice[IDEN_PIO_MODE_SPPORTED] & 2)
 	{
 		pioMode = MV_ATA_TRANSFER_PIO_3;
 	}
 	else
 	{
 		MV_ERROR("IAL Error in IDENTIFY info: PIO modes 3 and 4 not supported\n");
 		pioMode = MV_ATA_TRANSFER_PIO_SLOW;
 	}
 
 	KdPrint(("RR18xx [%d] Set transfer mode XFER_PIO_4\n",
 			  pMvSataAdapter->adapterId));
 	pAdapter->mvChannel[channelNum].maxPioModeSupported = pioMode;
 	if (mvStorageDevATASetFeatures(pMvSataAdapter, channelNum,
 								   MV_ATA_SET_FEATURES_TRANSFER,
 								   pioMode, 0, 0, 0) == MV_FALSE)
 	{
 		MV_ERROR("RR18xx [%d] channel %d: Set Features failed\n",
 				 pMvSataAdapter->adapterId, channelNum); 
 		return -1;
 	}
 
 	udmaMode = MV_ATA_TRANSFER_UDMA_0;
 	if (pMvSataChannel->identifyDevice[IDEN_UDMA_MODE] & 0x40)
 	{
 		udmaMode =  MV_ATA_TRANSFER_UDMA_6;
 	}
 	else if (pMvSataChannel->identifyDevice[IDEN_UDMA_MODE] & 0x20)
 	{
 		udmaMode =  MV_ATA_TRANSFER_UDMA_5;
 	}
 	else if (pMvSataChannel->identifyDevice[IDEN_UDMA_MODE] & 0x10)
 	{
 		udmaMode =  MV_ATA_TRANSFER_UDMA_4;
 	}
 	else if (pMvSataChannel->identifyDevice[IDEN_UDMA_MODE] & 8)
 	{
 		udmaMode =  MV_ATA_TRANSFER_UDMA_3;
 	}
 	else if (pMvSataChannel->identifyDevice[IDEN_UDMA_MODE] & 4)
 	{
 		udmaMode =  MV_ATA_TRANSFER_UDMA_2;
 	}
 
 	KdPrint(("RR18xx [%d] Set transfer mode XFER_UDMA_%d\n",
 			  pMvSataAdapter->adapterId, udmaMode & 0xf));
 	pChannelInfo->maxUltraDmaModeSupported = udmaMode;
 
 	/*if (mvStorageDevATASetFeatures(pMvSataAdapter, channelNum,
 								   MV_ATA_SET_FEATURES_TRANSFER, udmaMode,
 								   0, 0, 0) == MV_FALSE)
 	{
 		MV_ERROR("RR18xx [%d] channel %d: Set Features failed\n",
 				 pMvSataAdapter->adapterId, channelNum); 
 		return -1;
 	}*/
 	if (pChannelInfo->maxUltraDmaModeSupported == 0xFF) 
 		return TRUE;
 	else 
 		do
 		{
 			if (mvStorageDevATASetFeatures(pMvSataAdapter, channelNum,
 								   MV_ATA_SET_FEATURES_TRANSFER, 
 								   pChannelInfo->maxUltraDmaModeSupported,
 								   0, 0, 0) == MV_FALSE)
 			{
 				if (pChannelInfo->maxUltraDmaModeSupported > MV_ATA_TRANSFER_UDMA_0)
 				{
 					if (mvStorageDevATASoftResetDevice(pMvSataAdapter, channelNum) == MV_FALSE)
 					{
 						MV_REG_WRITE_BYTE(pMvSataAdapter->adapterIoBaseAddress,
 										  pMvSataChannel->eDmaRegsOffset +
 										  0x11c, /* command reg */
 										  MV_ATA_COMMAND_IDLE_IMMEDIATE); 
 						mvMicroSecondsDelay(10000);
 						mvSataChannelHardReset(pMvSataAdapter, channelNum);
 						if (mvStorageDevATASoftResetDevice(pMvSataAdapter, channelNum) == MV_FALSE)
 							return FALSE;
 					}
 					if (mvSataChannelHardReset(pMvSataAdapter, channelNum) == MV_FALSE)
 						return FALSE;
 					pChannelInfo->maxUltraDmaModeSupported--;
 					continue;
 				}
 				else   return FALSE;
 			}
 			break;
 		}while (1);
 
 	/* Read look ahead */
 #ifdef ENABLE_READ_AHEAD
 	if (pMvSataChannel->identifyDevice[82] & 0x40)
 	{
 		if (!(pMvSataChannel->identifyDevice[85] & 0x40)) /* if not enabled by default */
 		{
 			if (mvStorageDevATASetFeatures(pMvSataAdapter, channelNum,
 										   MV_ATA_SET_FEATURES_ENABLE_RLA, 0, 0,
 										   0, 0) == MV_FALSE)
 			{
 				MV_ERROR("RR18xx [%d] channel %d: Set Features failed\n",
 						 pMvSataAdapter->adapterId, channelNum); 
 				return -1;
 			}
 		}
 		KdPrint(("RR18xx [%d]: channel=%d, read look ahead enabled\n", 
 				  pMvSataAdapter->adapterId, channelNum));
 	}
 	else
 	{
 		KdPrint(("RR18xx [%d]: channel %d, Read Look Ahead not supported\n",
 				  pMvSataAdapter->adapterId, channelNum));
 	}
 #else 
 	{
 		if (pMvSataChannel->identifyDevice[86] & 0x20)
 		{
 			KdPrint(("RR18xx [%d]:channel %d, disable read look ahead\n",
 					  pMvSataAdapter->adapterId, channelNum));
 			if (mvStorageDevATASetFeatures(pMvSataAdapter, channelNum,
 										   MV_ATA_SET_FEATURES_DISABLE_RLA, 0, 0,
 										   0, 0) == MV_FALSE)
 			{
 				MV_ERROR("RR18xx [%d]:channel %d:  ATA Set Features failed\n",
 						 pMvSataAdapter->adapterId, channelNum); 
 				return -1;
 			}
 		}
 		KdPrint(("RR18xx [%d]:channel %d, read look ahead disabled\n",
 				  pMvSataAdapter->adapterId, channelNum));
 	}    
 #endif
 
 
 	{
 		KdPrint(("RR18xx [%d]: channel %d config EDMA, Non Queued Mode\n",
 				  pMvSataAdapter->adapterId, 
 				  channelNum));
 		if (mvSataConfigEdmaMode(pMvSataAdapter, channelNum,
 								 MV_EDMA_MODE_NOT_QUEUED, 0) == MV_FALSE)
 		{
 			MV_ERROR("RR18xx [%d] channel %d Error: mvSataConfigEdmaMode failed\n",
 					 pMvSataAdapter->adapterId, channelNum);
 			return -1;
 		}
 	}
 	/* Enable EDMA */
 	if (mvSataEnableChannelDma(pMvSataAdapter, channelNum) == MV_FALSE)
 	{
 		MV_ERROR("RR18xx [%d] Failed to enable DMA, channel=%d\n",
 				 pMvSataAdapter->adapterId, channelNum);
 		return -1;
 	}
 	MV_ERROR("RR18xx [%d,%d]: channel started successfully\n",
 			 pMvSataAdapter->adapterId, channelNum);
 
 #ifndef FOR_DEMO
 	set_fail_led(pMvSataAdapter, channelNum, 0);
 #endif
 	return 0;
 }
 
 static void
 hptmv_handle_event(void * data, int flag)
 {
 	IAL_ADAPTER_T   *pAdapter = (IAL_ADAPTER_T *)data;
 	MV_SATA_ADAPTER *pMvSataAdapter = &pAdapter->mvSataAdapter;
 	MV_U8           channelIndex;
 
 	mtx_assert(&pAdapter->lock, MA_OWNED);
 /*	mvOsSemTake(&pMvSataAdapter->semaphore); */
 	for (channelIndex = 0; channelIndex < MV_SATA_CHANNELS_NUM; channelIndex++)
 	{
 		switch(pAdapter->sataEvents[channelIndex])
 		{
 			case SATA_EVENT_CHANNEL_CONNECTED:
 				/* Handle only connects */
 				if (flag == 1)
 					break;
 				KdPrint(("RR18xx [%d,%d]: new device connected\n",
 						 pMvSataAdapter->adapterId, channelIndex));
 				hptmv_init_channel(pAdapter, channelIndex);
 				if (mvSataConfigureChannel( pMvSataAdapter, channelIndex) == MV_FALSE)
 				{
 					MV_ERROR("RR18xx [%d,%d] Failed to configure\n",
 							 pMvSataAdapter->adapterId, channelIndex);
 					hptmv_free_channel(pAdapter, channelIndex);
 				}
 				else
 				{
 					/*mvSataChannelHardReset(pMvSataAdapter, channel);*/
 					if (start_channel( pAdapter, channelIndex))
 					{
 						MV_ERROR("RR18xx [%d,%d]Failed to start channel\n",
 								 pMvSataAdapter->adapterId, channelIndex);
 						hptmv_free_channel(pAdapter, channelIndex);
 					}
 					else 
 					{
 						device_change(pAdapter, channelIndex, TRUE);
 					}
 				}
 				pAdapter->sataEvents[channelIndex] = SATA_EVENT_NO_CHANGE;
 			   break;
 
 			case SATA_EVENT_CHANNEL_DISCONNECTED:
 				/* Handle only disconnects */
 				if (flag == 0)
 					break;
 				KdPrint(("RR18xx [%d,%d]: device disconnected\n",
 						 pMvSataAdapter->adapterId, channelIndex));
 					/* Flush pending commands */
 				if(pMvSataAdapter->sataChannel[channelIndex])
 				{
 					_VBUS_INST(&pAdapter->VBus)
 					mvSataFlushDmaQueue (pMvSataAdapter, channelIndex,
 										 MV_FLUSH_TYPE_CALLBACK);
 					CheckPendingCall(_VBUS_P0);
 					mvSataRemoveChannel(pMvSataAdapter,channelIndex);
 					hptmv_free_channel(pAdapter, channelIndex);
 					pMvSataAdapter->sataChannel[channelIndex] = NULL;
 					KdPrint(("RR18xx [%d,%d]: channel removed\n",
 						 pMvSataAdapter->adapterId, channelIndex));
 					if (pAdapter->outstandingCommands==0 && DPC_Request_Nums==0)
 						Check_Idle_Call(pAdapter);
 				}
 				else
 				{
 					KdPrint(("RR18xx [%d,%d]: channel already removed!!\n",
 							 pMvSataAdapter->adapterId, channelIndex));
 				}
 				pAdapter->sataEvents[channelIndex] = SATA_EVENT_NO_CHANGE;
 				break;
 				
 			case SATA_EVENT_NO_CHANGE:
 				break;
 
 			default:
 				break;
 		}
 	}
 /*	mvOsSemRelease(&pMvSataAdapter->semaphore); */
 }
 
 #define EVENT_CONNECT					1
 #define EVENT_DISCONNECT				0
 
 static void
 hptmv_handle_event_connect(void *data)
 {
   hptmv_handle_event (data, 0);
 }
 
 static void
 hptmv_handle_event_disconnect(void *data)
 {
   hptmv_handle_event (data, 1);
 }
 
 static MV_BOOLEAN
 hptmv_event_notify(MV_SATA_ADAPTER *pMvSataAdapter, MV_EVENT_TYPE eventType,
 								   MV_U32 param1, MV_U32 param2)
 {
 	IAL_ADAPTER_T   *pAdapter = pMvSataAdapter->IALData;
 
 	switch (eventType)
 	{
 		case MV_EVENT_TYPE_SATA_CABLE:
 			{
 				MV_U8   channel = param2;
 
 				if (param1 == EVENT_CONNECT)
 				{
 					pAdapter->sataEvents[channel] = SATA_EVENT_CHANNEL_CONNECTED;
 					KdPrint(("RR18xx [%d,%d]: device connected event received\n",
 							 pMvSataAdapter->adapterId, channel));
 					/* Delete previous timers (if multiple drives connected in the same time */
 					callout_reset(&pAdapter->event_timer_connect, 10 * hz, hptmv_handle_event_connect, pAdapter);
 				}
 				else if (param1 == EVENT_DISCONNECT)
 				{
 					pAdapter->sataEvents[channel] = SATA_EVENT_CHANNEL_DISCONNECTED;
 					KdPrint(("RR18xx [%d,%d]: device disconnected event received \n",
 							 pMvSataAdapter->adapterId, channel));
 					device_change(pAdapter, channel, FALSE);
 					/* Delete previous timers (if multiple drives disconnected in the same time */
 					/*callout_reset(&pAdapter->event_timer_disconnect, 10 * hz, hptmv_handle_event_disconnect, pAdapter); */
 					/*It is not necessary to wait, handle it directly*/
 					hptmv_handle_event_disconnect(pAdapter);
 				}
 				else
 				{
 
 					MV_ERROR("RR18xx: illegal value for param1(%d) at "
 							 "connect/disconnect event, host=%d\n", param1,
 							 pMvSataAdapter->adapterId );
 
 				}
 			}
 			break;
 		case MV_EVENT_TYPE_ADAPTER_ERROR:
 			KdPrint(("RR18xx: DEVICE error event received, pci cause "
 					  "reg=%x,  don't how to handle this\n", param1));
 			return MV_TRUE;
 		default:
 			MV_ERROR("RR18xx[%d]: unknown event type (%d)\n",
 					 pMvSataAdapter->adapterId, eventType);
 			return MV_FALSE;
 	}
 	return MV_TRUE;
 }
 
 static int 
 hptmv_allocate_edma_queues(IAL_ADAPTER_T *pAdapter)
 {
 	pAdapter->requestsArrayBaseAddr = (MV_U8 *)contigmalloc(REQUESTS_ARRAY_SIZE, 
 			M_DEVBUF, M_NOWAIT, 0, 0xffffffff, PAGE_SIZE, 0ul);
 	if (pAdapter->requestsArrayBaseAddr == NULL)
 	{
 		MV_ERROR("RR18xx[%d]: Failed to allocate memory for EDMA request"
 				 " queues\n", pAdapter->mvSataAdapter.adapterId);
 		return -1;
 	}
 	pAdapter->requestsArrayBaseDmaAddr = fOsPhysicalAddress(pAdapter->requestsArrayBaseAddr);
 	pAdapter->requestsArrayBaseAlignedAddr = pAdapter->requestsArrayBaseAddr;
 	pAdapter->requestsArrayBaseAlignedAddr += MV_EDMA_REQUEST_QUEUE_SIZE;
 	pAdapter->requestsArrayBaseAlignedAddr  = (MV_U8 *)
 		(((ULONG_PTR)pAdapter->requestsArrayBaseAlignedAddr) & ~(ULONG_PTR)(MV_EDMA_REQUEST_QUEUE_SIZE - 1));
 	pAdapter->requestsArrayBaseDmaAlignedAddr = pAdapter->requestsArrayBaseDmaAddr; 
 	pAdapter->requestsArrayBaseDmaAlignedAddr += MV_EDMA_REQUEST_QUEUE_SIZE;
 	pAdapter->requestsArrayBaseDmaAlignedAddr &= ~(ULONG_PTR)(MV_EDMA_REQUEST_QUEUE_SIZE - 1);
 
 	if ((pAdapter->requestsArrayBaseDmaAlignedAddr - pAdapter->requestsArrayBaseDmaAddr) != 
 		(pAdapter->requestsArrayBaseAlignedAddr - pAdapter->requestsArrayBaseAddr))
 	{
 		MV_ERROR("RR18xx[%d]: Error in Request Quueues Alignment\n",
 				 pAdapter->mvSataAdapter.adapterId);
-		contigfree(pAdapter->requestsArrayBaseAddr, REQUESTS_ARRAY_SIZE, M_DEVBUF);
+		free(pAdapter->requestsArrayBaseAddr, M_DEVBUF);
 		return -1;
 	}
 	/* response queues */
 	pAdapter->responsesArrayBaseAddr = (MV_U8 *)contigmalloc(RESPONSES_ARRAY_SIZE, 
 			M_DEVBUF, M_NOWAIT, 0, 0xffffffff, PAGE_SIZE, 0ul);
 	if (pAdapter->responsesArrayBaseAddr == NULL)
 	{
 		MV_ERROR("RR18xx[%d]: Failed to allocate memory for EDMA response"
 				 " queues\n", pAdapter->mvSataAdapter.adapterId);
-		contigfree(pAdapter->requestsArrayBaseAddr, RESPONSES_ARRAY_SIZE, M_DEVBUF);
+		free(pAdapter->requestsArrayBaseAddr, M_DEVBUF);
 		return -1;
 	}
 	pAdapter->responsesArrayBaseDmaAddr = fOsPhysicalAddress(pAdapter->responsesArrayBaseAddr);
 	pAdapter->responsesArrayBaseAlignedAddr = pAdapter->responsesArrayBaseAddr;
 	pAdapter->responsesArrayBaseAlignedAddr += MV_EDMA_RESPONSE_QUEUE_SIZE;
 	pAdapter->responsesArrayBaseAlignedAddr  = (MV_U8 *)
 		(((ULONG_PTR)pAdapter->responsesArrayBaseAlignedAddr) & ~(ULONG_PTR)(MV_EDMA_RESPONSE_QUEUE_SIZE - 1));
 	pAdapter->responsesArrayBaseDmaAlignedAddr = pAdapter->responsesArrayBaseDmaAddr; 
 	pAdapter->responsesArrayBaseDmaAlignedAddr += MV_EDMA_RESPONSE_QUEUE_SIZE;
 	pAdapter->responsesArrayBaseDmaAlignedAddr &= ~(ULONG_PTR)(MV_EDMA_RESPONSE_QUEUE_SIZE - 1);
 
 	if ((pAdapter->responsesArrayBaseDmaAlignedAddr - pAdapter->responsesArrayBaseDmaAddr) != 
 		(pAdapter->responsesArrayBaseAlignedAddr - pAdapter->responsesArrayBaseAddr))
 	{
 		MV_ERROR("RR18xx[%d]: Error in Response Queues Alignment\n",
 				 pAdapter->mvSataAdapter.adapterId);
-		contigfree(pAdapter->requestsArrayBaseAddr, REQUESTS_ARRAY_SIZE, M_DEVBUF);
-		contigfree(pAdapter->responsesArrayBaseAddr, RESPONSES_ARRAY_SIZE, M_DEVBUF);
+		free(pAdapter->requestsArrayBaseAddr, M_DEVBUF);
+		free(pAdapter->responsesArrayBaseAddr, M_DEVBUF);
 		return -1;
 	}
 	return 0;
 }
 
 static void
 hptmv_free_edma_queues(IAL_ADAPTER_T *pAdapter)
 {
-	contigfree(pAdapter->requestsArrayBaseAddr, REQUESTS_ARRAY_SIZE, M_DEVBUF);
-	contigfree(pAdapter->responsesArrayBaseAddr, RESPONSES_ARRAY_SIZE, M_DEVBUF);
+	free(pAdapter->requestsArrayBaseAddr, M_DEVBUF);
+	free(pAdapter->responsesArrayBaseAddr, M_DEVBUF);
 }
 
 static PVOID
 AllocatePRDTable(IAL_ADAPTER_T *pAdapter)
 {
 	PVOID ret;
 	if (pAdapter->pFreePRDLink) {
 		KdPrint(("pAdapter->pFreePRDLink:%p\n",pAdapter->pFreePRDLink));
 		ret = pAdapter->pFreePRDLink;
 		pAdapter->pFreePRDLink = *(void**)ret;
 		return ret;
 	}
 	return NULL;
 }
 
 static void
 FreePRDTable(IAL_ADAPTER_T *pAdapter, PVOID PRDTable)
 {
 	*(void**)PRDTable = pAdapter->pFreePRDLink;
 	pAdapter->pFreePRDLink = PRDTable;
 }
 
 extern PVDevice fGetFirstChild(PVDevice pLogical);
 extern void fResetBootMark(PVDevice pLogical);
 static void
 fRegisterVdevice(IAL_ADAPTER_T *pAdapter)
 {
 	PVDevice pPhysical, pLogical;
 	PVBus  pVBus;
 	int i,j;
 
 	for(i=0;i<MV_SATA_CHANNELS_NUM;i++) {
 		pPhysical = &(pAdapter->VDevices[i]);
 		pLogical = pPhysical;
 		while (pLogical->pParent) pLogical = pLogical->pParent;
 		if (pLogical->vf_online==0) {
 			pPhysical->vf_bootmark = pLogical->vf_bootmark = 0;
 			continue;
 		}
 		if (pLogical->VDeviceType==VD_SPARE || pPhysical!=fGetFirstChild(pLogical)) 
 			continue;
 
 		pVBus = &pAdapter->VBus;
 		if(pVBus)
 		{
 			j=0;
 			while(j<MAX_VDEVICE_PER_VBUS && pVBus->pVDevice[j]) j++;
 			if(j<MAX_VDEVICE_PER_VBUS){
 				pVBus->pVDevice[j] = pLogical; 
 				pLogical->pVBus = pVBus;
 
 				if (j>0 && pLogical->vf_bootmark) {
 					if (pVBus->pVDevice[0]->vf_bootmark) {
 						fResetBootMark(pLogical);
 					}
 					else {
 						do { pVBus->pVDevice[j] = pVBus->pVDevice[j-1]; } while (--j);
 						pVBus->pVDevice[0] = pLogical;
 					}
 				}
 			}
 		}
 	}
 }
 
 PVDevice
 GetSpareDisk(_VBUS_ARG PVDevice pArray)
 {
 	IAL_ADAPTER_T *pAdapter = (IAL_ADAPTER_T *)pArray->pVBus->OsExt;
 	LBA_T capacity = LongDiv(pArray->VDeviceCapacity, pArray->u.array.bArnMember-1);
 	LBA_T thiscap, maxcap = MAX_LBA_T;
 	PVDevice pVDevice, pFind = NULL;
 	int i;
 
 	for(i=0;i<MV_SATA_CHANNELS_NUM;i++)
 	{
 		pVDevice = &pAdapter->VDevices[i];
 		if(!pVDevice) 
 			continue;
 		thiscap = pArray->vf_format_v2? pVDevice->u.disk.dDeRealCapacity : pVDevice->VDeviceCapacity;
 		/* find the smallest usable spare disk */
 		if (pVDevice->VDeviceType==VD_SPARE &&
 			pVDevice->u.disk.df_on_line &&
 			thiscap < maxcap &&
 			thiscap >= capacity)
 		{						
 				maxcap = pVDevice->VDeviceCapacity;
 				pFind = pVDevice;			
 		}
 	}
 	return pFind;
 }
 
 /******************************************************************
  * IO ATA Command
  *******************************************************************/
 int HPTLIBAPI
 fDeReadWrite(PDevice pDev, ULONG Lba, UCHAR Cmd, void *tmpBuffer)
 {
 	return mvReadWrite(pDev->mv, Lba, Cmd, tmpBuffer);
 }
 
 void HPTLIBAPI fDeSelectMode(PDevice pDev, UCHAR NewMode)
 {
 	MV_SATA_CHANNEL *pSataChannel = pDev->mv;
 	MV_SATA_ADAPTER *pSataAdapter = pSataChannel->mvSataAdapter;	
 	MV_U8 channelIndex = pSataChannel->channelNumber;
 	UCHAR mvMode;
 	/* 508x don't use MW-DMA? */
 	if (NewMode>4 && NewMode<8) NewMode = 4;
 	pDev->bDeModeSetting = NewMode;
 	if (NewMode<=4)
 		mvMode = MV_ATA_TRANSFER_PIO_0 + NewMode;
 	else
 		mvMode = MV_ATA_TRANSFER_UDMA_0 + (NewMode-8);
 
 	/*To fix 88i8030 bug*/
 	if (mvMode > MV_ATA_TRANSFER_UDMA_0 && mvMode < MV_ATA_TRANSFER_UDMA_4)
 		mvMode = MV_ATA_TRANSFER_UDMA_0;
 
 	mvSataDisableChannelDma(pSataAdapter, channelIndex);
 	/* Flush pending commands */
 	mvSataFlushDmaQueue (pSataAdapter, channelIndex, MV_FLUSH_TYPE_NONE);
 
 	if (mvStorageDevATASetFeatures(pSataAdapter, channelIndex,
 								   MV_ATA_SET_FEATURES_TRANSFER,
 								   mvMode, 0, 0, 0) == MV_FALSE)
 	{
 		KdPrint(("channel %d: Set Features failed\n", channelIndex)); 
 	}
 	/* Enable EDMA */
 	if (mvSataEnableChannelDma(pSataAdapter, channelIndex) == MV_FALSE)
 		KdPrint(("Failed to enable DMA, channel=%d", channelIndex));
 }
 
 int HPTLIBAPI fDeSetTCQ(PDevice pDev, int enable, int depth)
 {
 	MV_SATA_CHANNEL *pSataChannel = pDev->mv;
 	MV_SATA_ADAPTER *pSataAdapter = pSataChannel->mvSataAdapter;
 	MV_U8 channelIndex = pSataChannel->channelNumber;
 	IAL_ADAPTER_T *pAdapter = pSataAdapter->IALData;
 	MV_CHANNEL		*channelInfo = &(pAdapter->mvChannel[channelIndex]);
 	int dmaActive = pSataChannel->queueCommandsEnabled;
 	int ret = 0;
 
 	if (dmaActive) {
 		mvSataDisableChannelDma(pSataAdapter, channelIndex);
 		mvSataFlushDmaQueue(pSataAdapter,channelIndex,MV_FLUSH_TYPE_CALLBACK);
 	}
 
 	if (enable) {
 		if (pSataChannel->queuedDMA == MV_EDMA_MODE_NOT_QUEUED &&
 			(pSataChannel->identifyDevice[IDEN_SUPPORTED_COMMANDS2] & (0x2))) {
 			UCHAR depth = ((pSataChannel->identifyDevice[IDEN_QUEUE_DEPTH]) & 0x1f) + 1;
 			channelInfo->queueDepth = (depth==32)? 31 : depth;
 			mvSataConfigEdmaMode(pSataAdapter, channelIndex, MV_EDMA_MODE_QUEUED, depth);
 			ret = 1;
 		}
 	}
 	else
 	{
 		if (pSataChannel->queuedDMA != MV_EDMA_MODE_NOT_QUEUED) {
 			channelInfo->queueDepth = 2;
 			mvSataConfigEdmaMode(pSataAdapter, channelIndex, MV_EDMA_MODE_NOT_QUEUED, 0);
 			ret = 1;
 		}
 	}
 
 	if (dmaActive)
 		mvSataEnableChannelDma(pSataAdapter,channelIndex);
 	return ret;
 }
 
 int HPTLIBAPI fDeSetNCQ(PDevice pDev, int enable, int depth)
 {
 	return 0;
 }
 
 int HPTLIBAPI fDeSetWriteCache(PDevice pDev, int enable)
 {
 	MV_SATA_CHANNEL *pSataChannel = pDev->mv;
 	MV_SATA_ADAPTER *pSataAdapter = pSataChannel->mvSataAdapter;
 	MV_U8 channelIndex = pSataChannel->channelNumber;
 	IAL_ADAPTER_T *pAdapter = pSataAdapter->IALData;
 	MV_CHANNEL		*channelInfo = &(pAdapter->mvChannel[channelIndex]);
 	int dmaActive = pSataChannel->queueCommandsEnabled;
 	int ret = 0;
 
 	if (dmaActive) {
 		mvSataDisableChannelDma(pSataAdapter, channelIndex);
 		mvSataFlushDmaQueue(pSataAdapter,channelIndex,MV_FLUSH_TYPE_CALLBACK);
 	}
 
 	if ((pSataChannel->identifyDevice[82] & (0x20))) {
 		if (enable) {
 			if (mvStorageDevATASetFeatures(pSataAdapter, channelIndex,
 				MV_ATA_SET_FEATURES_ENABLE_WCACHE, 0, 0, 0, 0))
 			{
 				channelInfo->writeCacheEnabled = MV_TRUE;
 				ret = 1;
 			}
 		}
 		else {
 			if (mvStorageDevATASetFeatures(pSataAdapter, channelIndex,
 				MV_ATA_SET_FEATURES_DISABLE_WCACHE, 0, 0, 0, 0))
 			{
 				channelInfo->writeCacheEnabled = MV_FALSE;
 				ret = 1;
 			}
 		}
 	}
 
 	if (dmaActive)
 		mvSataEnableChannelDma(pSataAdapter,channelIndex);
 	return ret;
 }
 
 int HPTLIBAPI fDeSetReadAhead(PDevice pDev, int enable)
 {
 	MV_SATA_CHANNEL *pSataChannel = pDev->mv;
 	MV_SATA_ADAPTER *pSataAdapter = pSataChannel->mvSataAdapter;
 	MV_U8 channelIndex = pSataChannel->channelNumber;
 	IAL_ADAPTER_T *pAdapter = pSataAdapter->IALData;
 	MV_CHANNEL		*channelInfo = &(pAdapter->mvChannel[channelIndex]);
 	int dmaActive = pSataChannel->queueCommandsEnabled;
 	int ret = 0;
 
 	if (dmaActive) {
 		mvSataDisableChannelDma(pSataAdapter, channelIndex);
 		mvSataFlushDmaQueue(pSataAdapter,channelIndex,MV_FLUSH_TYPE_CALLBACK);
 	}
 
 	if ((pSataChannel->identifyDevice[82] & (0x40))) {
 		if (enable) {
 			if (mvStorageDevATASetFeatures(pSataAdapter, channelIndex,
 				MV_ATA_SET_FEATURES_ENABLE_RLA, 0, 0, 0, 0))
 			{
 				channelInfo->readAheadEnabled = MV_TRUE;
 				ret = 1;
 			}
 		}
 		else {
 			if (mvStorageDevATASetFeatures(pSataAdapter, channelIndex,
 				MV_ATA_SET_FEATURES_DISABLE_RLA, 0, 0, 0, 0))
 			{
 				channelInfo->readAheadEnabled = MV_FALSE;
 				ret = 1;
 			}
 		}
 	}
 
 	if (dmaActive)
 		mvSataEnableChannelDma(pSataAdapter,channelIndex);
 	return ret;
 }
 
 #ifdef SUPPORT_ARRAY
 #define IdeRegisterVDevice  fCheckArray
 #else 
 void
 IdeRegisterVDevice(PDevice pDev)
 {
 	PVDevice pVDev = Map2pVDevice(pDev);
 
 	pVDev->VDeviceType = pDev->df_atapi? VD_ATAPI : 
 						 pDev->df_removable_drive? VD_REMOVABLE : VD_SINGLE_DISK;
 	pVDev->vf_online = 1;
 	pVDev->VDeviceCapacity = pDev->dDeRealCapacity;
 	pVDev->pfnSendCommand = pfnSendCommand[pVDev->VDeviceType];
 	pVDev->pfnDeviceFailed = pfnDeviceFailed[pVDev->VDeviceType];
 }
 #endif
 
 static __inline PBUS_DMAMAP
 dmamap_get(struct IALAdapter * pAdapter)
 {
 	PBUS_DMAMAP	p = pAdapter->pbus_dmamap_list;
 	if (p)
 		pAdapter->pbus_dmamap_list = p-> next;
 	return p;
 }
 
 static __inline void
 dmamap_put(PBUS_DMAMAP p)
 {
 	p->next = p->pAdapter->pbus_dmamap_list;
 	p->pAdapter->pbus_dmamap_list = p;
 }
 
 static int num_adapters = 0;
 static int
 init_adapter(IAL_ADAPTER_T *pAdapter)
 {
 	PVBus _vbus_p = &pAdapter->VBus;
 	MV_SATA_ADAPTER *pMvSataAdapter;
 	int i, channel, rid;
 
 	PVDevice pVDev;
 
 	mtx_init(&pAdapter->lock, "hptsleeplock", NULL, MTX_DEF);
 	callout_init_mtx(&pAdapter->event_timer_connect, &pAdapter->lock, 0);
 	callout_init_mtx(&pAdapter->event_timer_disconnect, &pAdapter->lock, 0);
 
 	sx_xlock(&hptmv_list_lock);
 	pAdapter->next = 0;
 
 	if(gIal_Adapter == NULL){
 		gIal_Adapter = pAdapter;
 		pCurAdapter = gIal_Adapter;
 	}
 	else {
 		pCurAdapter->next = pAdapter;
 		pCurAdapter = pAdapter;
 	}
 	sx_xunlock(&hptmv_list_lock);
 
 	pAdapter->outstandingCommands = 0;
 
 	pMvSataAdapter = &(pAdapter->mvSataAdapter);
 	_vbus_p->OsExt = (void *)pAdapter; 
 	pMvSataAdapter->IALData = pAdapter;
 
 	if (bus_dma_tag_create(bus_get_dma_tag(pAdapter->hpt_dev),/* parent */
 			4,	/* alignment */
 			BUS_SPACE_MAXADDR_32BIT+1, /* boundary */
 			BUS_SPACE_MAXADDR,	/* lowaddr */
 			BUS_SPACE_MAXADDR,	/* highaddr */
 			NULL, NULL, 		/* filter, filterarg */
 			PAGE_SIZE * (MAX_SG_DESCRIPTORS-1), /* maxsize */
 			MAX_SG_DESCRIPTORS, /* nsegments */
 			0x10000,	/* maxsegsize */
 			BUS_DMA_WAITOK, 	/* flags */
 			busdma_lock_mutex,	/* lockfunc */
 			&pAdapter->lock,	/* lockfuncarg */
 			&pAdapter->io_dma_parent /* tag */))
 		{
 			return ENXIO;
 	}
 
 
 	if (hptmv_allocate_edma_queues(pAdapter))
 	{
 		MV_ERROR("RR18xx: Failed to allocate memory for EDMA queues\n");
 		return ENOMEM;
 	}
 
 	/* also map EPROM address */
 	rid = 0x10;
 	if (!(pAdapter->mem_res = bus_alloc_resource_any(pAdapter->hpt_dev,
 			SYS_RES_MEMORY, &rid, RF_ACTIVE))
 		||
 		!(pMvSataAdapter->adapterIoBaseAddress = rman_get_virtual(pAdapter->mem_res)))
 	{
 		MV_ERROR("RR18xx: Failed to remap memory space\n");
 		hptmv_free_edma_queues(pAdapter);
 		return ENXIO;
 	}
 	else
 	{
 		KdPrint(("RR18xx: io base address 0x%p\n", pMvSataAdapter->adapterIoBaseAddress));
 	}
 
 	pMvSataAdapter->adapterId = num_adapters++;
 	/* get the revision ID */
 	pMvSataAdapter->pciConfigRevisionId = pci_read_config(pAdapter->hpt_dev, PCIR_REVID, 1);
 	pMvSataAdapter->pciConfigDeviceId = pci_get_device(pAdapter->hpt_dev);
 	
 	/* init RR18xx */
 	pMvSataAdapter->intCoalThre[0]= 1;
 	pMvSataAdapter->intCoalThre[1]= 1;
 	pMvSataAdapter->intTimeThre[0] = 1;
 	pMvSataAdapter->intTimeThre[1] = 1;
 	pMvSataAdapter->pciCommand = 0x0107E371;
 	pMvSataAdapter->pciSerrMask = 0xd77fe6ul;
 	pMvSataAdapter->pciInterruptMask = 0xd77fe6ul;
 	pMvSataAdapter->mvSataEventNotify = hptmv_event_notify;
 
 	if (mvSataInitAdapter(pMvSataAdapter) == MV_FALSE)
 	{
 		MV_ERROR("RR18xx[%d]: core failed to initialize the adapter\n",
 				 pMvSataAdapter->adapterId);
 unregister:
 		bus_release_resource(pAdapter->hpt_dev, SYS_RES_MEMORY, rid, pAdapter->mem_res);
 		hptmv_free_edma_queues(pAdapter);
 		return ENXIO;
 	}
 	pAdapter->ver_601 = pMvSataAdapter->pcbVersion;
 
 #ifndef FOR_DEMO
 	set_fail_leds(pMvSataAdapter, 0);
 #endif
 	
 	/* setup command blocks */
 	KdPrint(("Allocate command blocks\n"));
 	_vbus_(pFreeCommands) = 0;
 	pAdapter->pCommandBlocks = 
 		malloc(sizeof(struct _Command) * MAX_COMMAND_BLOCKS_FOR_EACH_VBUS, M_DEVBUF, M_NOWAIT);
 	KdPrint(("pCommandBlocks:%p\n",pAdapter->pCommandBlocks));
 	if (!pAdapter->pCommandBlocks) {
 		MV_ERROR("insufficient memory\n");
 		goto unregister;
 	}
 
 	for (i=0; i<MAX_COMMAND_BLOCKS_FOR_EACH_VBUS; i++) {
 		FreeCommand(_VBUS_P &(pAdapter->pCommandBlocks[i]));
 	}
 
 	/*Set up the bus_dmamap*/
 	pAdapter->pbus_dmamap = (PBUS_DMAMAP)malloc (sizeof(struct _BUS_DMAMAP) * MAX_QUEUE_COMM, M_DEVBUF, M_NOWAIT);
 	if(!pAdapter->pbus_dmamap) {
 		MV_ERROR("insufficient memory\n");
 		free(pAdapter->pCommandBlocks, M_DEVBUF);
 		goto unregister;
 	}
 
 	memset((void *)pAdapter->pbus_dmamap, 0, sizeof(struct _BUS_DMAMAP) * MAX_QUEUE_COMM);
 	pAdapter->pbus_dmamap_list = 0;
 	for (i=0; i < MAX_QUEUE_COMM; i++) {
 		PBUS_DMAMAP  pmap = &(pAdapter->pbus_dmamap[i]);
 		pmap->pAdapter = pAdapter;
 		dmamap_put(pmap);
 
 		if(bus_dmamap_create(pAdapter->io_dma_parent, 0, &pmap->dma_map)) {
 			MV_ERROR("Can not allocate dma map\n");
 			free(pAdapter->pCommandBlocks, M_DEVBUF);
 			free(pAdapter->pbus_dmamap, M_DEVBUF);
 			goto unregister;
 		}
 		callout_init_mtx(&pmap->timeout, &pAdapter->lock, 0);
 	}
 	/* setup PRD Tables */
 	KdPrint(("Allocate PRD Tables\n"));
 	pAdapter->pFreePRDLink = 0;
 	
 	pAdapter->prdTableAddr = (PUCHAR)contigmalloc(
 		(PRD_ENTRIES_SIZE*PRD_TABLES_FOR_VBUS + 32), M_DEVBUF, M_NOWAIT, 0, 0xffffffff, PAGE_SIZE, 0ul);
 		
 	KdPrint(("prdTableAddr:%p\n",pAdapter->prdTableAddr));
 	if (!pAdapter->prdTableAddr) {
 		MV_ERROR("insufficient PRD Tables\n");
 		goto unregister;
 	}
 	pAdapter->prdTableAlignedAddr = (PUCHAR)(((ULONG_PTR)pAdapter->prdTableAddr + 0x1f) & ~(ULONG_PTR)0x1fL);
 	{
 		PUCHAR PRDTable = pAdapter->prdTableAlignedAddr;
 		for (i=0; i<PRD_TABLES_FOR_VBUS; i++)
 		{
 /*			KdPrint(("i=%d,pAdapter->pFreePRDLink=%p\n",i,pAdapter->pFreePRDLink)); */
 			FreePRDTable(pAdapter, PRDTable);
 			PRDTable += PRD_ENTRIES_SIZE;
 		}
 	}
 
 	/* enable the adapter interrupts */
 
 	/* configure and start the connected channels*/
 	for (channel = 0; channel < MV_SATA_CHANNELS_NUM; channel++)
 	{
 		pAdapter->mvChannel[channel].online = MV_FALSE;
 		if (mvSataIsStorageDeviceConnected(pMvSataAdapter, channel)
 			== MV_TRUE)
 		{
 			KdPrint(("RR18xx[%d]: channel %d is connected\n",
 					  pMvSataAdapter->adapterId, channel));
 
 			if (hptmv_init_channel(pAdapter, channel) == 0)
 			{
 				if (mvSataConfigureChannel(pMvSataAdapter, channel) == MV_FALSE)
 				{
 					MV_ERROR("RR18xx[%d]: Failed to configure channel"
 							 " %d\n",pMvSataAdapter->adapterId, channel);
 					hptmv_free_channel(pAdapter, channel);
 				}
 				else
 				{
 					if (start_channel(pAdapter, channel))
 					{
 						MV_ERROR("RR18xx[%d]: Failed to start channel,"
 								 " channel=%d\n",pMvSataAdapter->adapterId,
 								 channel);
 						hptmv_free_channel(pAdapter, channel);
 					}
 					pAdapter->mvChannel[channel].online = MV_TRUE; 
 					/*  mvSataChannelSetEdmaLoopBackMode(pMvSataAdapter,
 													   channel,
 													   MV_TRUE);*/
 				}
 			}
 		}
 		KdPrint(("pAdapter->mvChannel[channel].online:%x, channel:%d\n",
 			pAdapter->mvChannel[channel].online, channel));
 	}
 
 #ifdef SUPPORT_ARRAY
 	for(i = MAX_ARRAY_DEVICE - 1; i >= 0; i--) {
 		pVDev = ArrayTables(i);
 		mArFreeArrayTable(pVDev);
 	}
 #endif
 
 	KdPrint(("Initialize Devices\n"));
 	for (channel = 0; channel < MV_SATA_CHANNELS_NUM; channel++) {
 		MV_SATA_CHANNEL *pMvSataChannel = pMvSataAdapter->sataChannel[channel];
 		if (pMvSataChannel) {
 			init_vdev_params(pAdapter, channel);
 			IdeRegisterVDevice(&pAdapter->VDevices[channel].u.disk);
 		}
 	}
 #ifdef SUPPORT_ARRAY
 	CheckArrayCritical(_VBUS_P0);
 #endif
 	_vbus_p->nInstances = 1;
 	fRegisterVdevice(pAdapter);
 
 	for (channel=0;channel<MV_SATA_CHANNELS_NUM;channel++) {
 		pVDev = _vbus_p->pVDevice[channel];
 		if (pVDev && pVDev->vf_online)
 			fCheckBootable(pVDev);
 	}
 
 #if defined(SUPPORT_ARRAY) && defined(_RAID5N_)
 	init_raid5_memory(_VBUS_P0);
 	_vbus_(r5).enable_write_back = 1;
 	printf("RR18xx: RAID5 write-back %s\n", _vbus_(r5).enable_write_back? "enabled" : "disabled");
 #endif
 
 	mvSataUnmaskAdapterInterrupt(pMvSataAdapter);
 	return 0;
 }
 
 int
 MvSataResetChannel(MV_SATA_ADAPTER *pMvSataAdapter, MV_U8 channel)
 {
 	IAL_ADAPTER_T   *pAdapter = (IAL_ADAPTER_T *)pMvSataAdapter->IALData;
 
 	mvSataDisableChannelDma(pMvSataAdapter, channel);
 	/* Flush pending commands */
 	mvSataFlushDmaQueue (pMvSataAdapter, channel, MV_FLUSH_TYPE_CALLBACK);
 
 	/* Software reset channel */
 	if (mvStorageDevATASoftResetDevice(pMvSataAdapter, channel) == MV_FALSE)
 	{
 		MV_ERROR("RR18xx [%d,%d]: failed to perform Software reset\n",
 				 pMvSataAdapter->adapterId, channel);
 		hptmv_free_channel(pAdapter, channel);
 		return -1;
 	}
 	
 	/* Hardware reset channel */
 	if (mvSataChannelHardReset(pMvSataAdapter, channel)== MV_FALSE)
 	{
 		MV_ERROR("RR18xx [%d,%d] Failed to Hard reser the SATA channel\n",
 				 pMvSataAdapter->adapterId, channel);
 		hptmv_free_channel(pAdapter, channel);
 		return -1;
 	}
 
 	if (mvSataIsStorageDeviceConnected(pMvSataAdapter, channel) == MV_FALSE)
 	{
 		 MV_ERROR("RR18xx [%d,%d] Failed to Connect Device\n",
 				 pMvSataAdapter->adapterId, channel);
 		hptmv_free_channel(pAdapter, channel);
 		return -1;
 	}else
 	{
 		MV_ERROR("channel %d: perform recalibrate command", channel);
 		if (!mvStorageDevATAExecuteNonUDMACommand(pMvSataAdapter, channel,
 								MV_NON_UDMA_PROTOCOL_NON_DATA,
 								MV_FALSE,
 								NULL,	 /* pBuffer*/
 								0,		 /* count  */
 								0,		/*features*/
 										/* sectorCount */
 								0,
 								0,	/* lbaLow */
 								0,	/* lbaMid */
 									/* lbaHigh */
 								0,
 								0,		/* device */
 										/* command */
 								0x10))
 			MV_ERROR("channel %d: recalibrate failed", channel);
 		
 		/* Set transfer mode */
 		if((mvStorageDevATASetFeatures(pMvSataAdapter, channel,
 						MV_ATA_SET_FEATURES_TRANSFER,
 						MV_ATA_TRANSFER_PIO_SLOW, 0, 0, 0) == MV_FALSE) || 
 			(mvStorageDevATASetFeatures(pMvSataAdapter, channel,
 						MV_ATA_SET_FEATURES_TRANSFER,
 						pAdapter->mvChannel[channel].maxPioModeSupported, 0, 0, 0) == MV_FALSE) ||
 			(mvStorageDevATASetFeatures(pMvSataAdapter, channel,
 						MV_ATA_SET_FEATURES_TRANSFER,
 						pAdapter->mvChannel[channel].maxUltraDmaModeSupported, 0, 0, 0) == MV_FALSE) )
 		{
 			MV_ERROR("channel %d: Set Features failed", channel);
 			hptmv_free_channel(pAdapter, channel);
 			return -1;
 		}
 		/* Enable EDMA */
 		if (mvSataEnableChannelDma(pMvSataAdapter, channel) == MV_FALSE)
 		{
 			MV_ERROR("Failed to enable DMA, channel=%d", channel);
 			hptmv_free_channel(pAdapter, channel);
 			return -1;
 		}
 	}
 	return 0;
 }
 
 static int
 fResetActiveCommands(PVBus _vbus_p)
 {
 	MV_SATA_ADAPTER *pMvSataAdapter = &((IAL_ADAPTER_T *)_vbus_p->OsExt)->mvSataAdapter;
 	MV_U8 channel;
 	for (channel=0;channel< MV_SATA_CHANNELS_NUM;channel++) {
 		if (pMvSataAdapter->sataChannel[channel] && pMvSataAdapter->sataChannel[channel]->outstandingCommands) 
 			MvSataResetChannel(pMvSataAdapter,channel);
 	}
 	return 0;
 }
 
 void fCompleteAllCommandsSynchronously(PVBus _vbus_p)
 {
 	UINT cont;
 	ULONG ticks = 0;
 	MV_U8 channel;
 	MV_SATA_ADAPTER *pMvSataAdapter = &((IAL_ADAPTER_T *)_vbus_p->OsExt)->mvSataAdapter;
 	MV_SATA_CHANNEL *pMvSataChannel;
 
 	do {
 check_cmds:
 		cont = 0;
 		CheckPendingCall(_VBUS_P0);
 #ifdef _RAID5N_
 		dataxfer_poll();
 		xor_poll();
 #endif
 		for (channel=0;channel< MV_SATA_CHANNELS_NUM;channel++) {
 			pMvSataChannel = pMvSataAdapter->sataChannel[channel];
 			if (pMvSataChannel && pMvSataChannel->outstandingCommands) 
 			{
 				while (pMvSataChannel->outstandingCommands) {
 					if (!mvSataInterruptServiceRoutine(pMvSataAdapter)) {
 						StallExec(1000);
 						if (ticks++ > 3000) {
 							MvSataResetChannel(pMvSataAdapter,channel);
 							goto check_cmds;
 						}
 					}
 					else 
 						ticks = 0;
 				}
 				cont = 1;
 			}
 		}
 	} while (cont);
 }
 
 void
 fResetVBus(_VBUS_ARG0)
 {
 	KdPrint(("fMvResetBus(%p)", _vbus_p));
 
 	/* some commands may already finished. */
 	CheckPendingCall(_VBUS_P0);
 
 	fResetActiveCommands(_vbus_p);
 	/* 
 	 * the other pending commands may still be finished successfully.
 	 */
 	fCompleteAllCommandsSynchronously(_vbus_p);
 
 	/* Now there should be no pending commands. No more action needed. */
 	CheckIdleCall(_VBUS_P0);
 
 	KdPrint(("fMvResetBus() done"));
 }
 
 /*No rescan function*/
 void
 fRescanAllDevice(_VBUS_ARG0)
 {
 }
 
 static MV_BOOLEAN 
 CommandCompletionCB(MV_SATA_ADAPTER *pMvSataAdapter,
 					MV_U8 channelNum,
 					MV_COMPLETION_TYPE comp_type,
 					MV_VOID_PTR commandId,
 					MV_U16 responseFlags,
 					MV_U32 timeStamp,
 					MV_STORAGE_DEVICE_REGISTERS *registerStruct)
 {
 	PCommand pCmd = (PCommand) commandId;
 	_VBUS_INST(pCmd->pVDevice->pVBus)
 
 	if (pCmd->uScratch.sata_param.prdAddr) 
 		FreePRDTable(pMvSataAdapter->IALData,pCmd->uScratch.sata_param.prdAddr);
 
 	switch (comp_type)
 	{
 	case MV_COMPLETION_TYPE_NORMAL:
 		pCmd->Result = RETURN_SUCCESS;
 		break;
 	case MV_COMPLETION_TYPE_ABORT:
 		pCmd->Result = RETURN_BUS_RESET;
 		break;
 	case MV_COMPLETION_TYPE_ERROR:
 		 MV_ERROR("IAL: COMPLETION ERROR, adapter %d, channel %d, flags=%x\n",
 				 pMvSataAdapter->adapterId, channelNum, responseFlags);
 
 		if (responseFlags & 4) {
 			MV_ERROR("ATA regs: error %x, sector count %x, LBA low %x, LBA mid %x,"
 				" LBA high %x, device %x, status %x\n",
 				registerStruct->errorRegister,
 				registerStruct->sectorCountRegister,
 				registerStruct->lbaLowRegister,
 				registerStruct->lbaMidRegister,
 				registerStruct->lbaHighRegister,
 				registerStruct->deviceRegister,
 				registerStruct->statusRegister);
 		}
 		/*We can't do handleEdmaError directly here, because CommandCompletionCB is called by 
 		 * mv's ISR, if we retry the command, than the internel data structure may be destroyed*/
 		pCmd->uScratch.sata_param.responseFlags = responseFlags;
 		pCmd->uScratch.sata_param.bIdeStatus = registerStruct->statusRegister;
 		pCmd->uScratch.sata_param.errorRegister = registerStruct->errorRegister;
 		pCmd->pVDevice->u.disk.QueueLength--;
 		CallAfterReturn(_VBUS_P (DPC_PROC)handleEdmaError,pCmd);
 		return TRUE;
 		
 	default:
 		MV_ERROR(" Unknown completion type (%d)\n", comp_type);
 		return MV_FALSE;
 	}
 	
 	if (pCmd->uCmd.Ide.Command == IDE_COMMAND_VERIFY && pCmd->uScratch.sata_param.cmd_priv > 1) {
 		pCmd->uScratch.sata_param.cmd_priv --;
 		return TRUE;
 	}
 	pCmd->pVDevice->u.disk.QueueLength--;
 	CallAfterReturn(_VBUS_P (DPC_PROC)pCmd->pfnCompletion, pCmd);
 	return TRUE;
 }
 
 void
 fDeviceSendCommand(_VBUS_ARG PCommand pCmd)
 {
 	MV_SATA_EDMA_PRD_ENTRY  *pPRDTable = 0;
 	MV_SATA_ADAPTER *pMvSataAdapter;
 	MV_SATA_CHANNEL *pMvSataChannel;
 	PVDevice pVDevice = pCmd->pVDevice;
 	PDevice  pDevice = &pVDevice->u.disk;
 	LBA_T    Lba = pCmd->uCmd.Ide.Lba;
 	USHORT   nSector = pCmd->uCmd.Ide.nSectors;
 
 	MV_QUEUE_COMMAND_RESULT result;
 	MV_QUEUE_COMMAND_INFO commandInfo;	
 	MV_UDMA_COMMAND_PARAMS  *pUdmaParams = &commandInfo.commandParams.udmaCommand;
 	MV_NONE_UDMA_COMMAND_PARAMS *pNoUdmaParams = &commandInfo.commandParams.NoneUdmaCommand;
 
 	MV_BOOLEAN is48bit;
 	MV_U8      channel;
 	int        i=0;
 	
 	DECLARE_BUFFER(FPSCAT_GATH, tmpSg);
 
 	if (!pDevice->df_on_line) {
 		MV_ERROR("Device is offline");
 		pCmd->Result = RETURN_BAD_DEVICE;
 		CallAfterReturn(_VBUS_P (DPC_PROC)pCmd->pfnCompletion, pCmd);
 		return;
 	}
 
 	pDevice->HeadPosition = pCmd->uCmd.Ide.Lba + pCmd->uCmd.Ide.nSectors;
 	pMvSataChannel = pDevice->mv;
 	pMvSataAdapter = pMvSataChannel->mvSataAdapter;
 	channel = pMvSataChannel->channelNumber;
 	
 	/* old RAID0 has hidden lba. Remember to clear dDeHiddenLba when delete array! */
 	Lba += pDevice->dDeHiddenLba;
 	/* check LBA */
 	if (Lba+nSector-1 > pDevice->dDeRealCapacity) {
 		pCmd->Result = RETURN_INVALID_REQUEST;
 		CallAfterReturn(_VBUS_P (DPC_PROC)pCmd->pfnCompletion, pCmd);
 		return;
 	}
 	
 	/*
 	 * always use 48bit LBA if drive supports it.
 	 * Some Seagate drives report error if you use a 28-bit command
 	 * to access sector 0xfffffff.
 	 */
 	is48bit = pMvSataChannel->lba48Address;
 
 	switch (pCmd->uCmd.Ide.Command)
 	{
 	case IDE_COMMAND_READ:
 	case IDE_COMMAND_WRITE:
 		if (pDevice->bDeModeSetting<8) goto pio;
 		
 		commandInfo.type = MV_QUEUED_COMMAND_TYPE_UDMA;
 		pUdmaParams->isEXT = is48bit;
 		pUdmaParams->numOfSectors = nSector;
 		pUdmaParams->lowLBAAddress = Lba;
 		pUdmaParams->highLBAAddress = 0;
 		pUdmaParams->prdHighAddr = 0;
 		pUdmaParams->callBack = CommandCompletionCB;
 		pUdmaParams->commandId = (MV_VOID_PTR )pCmd;
 		if(pCmd->uCmd.Ide.Command == IDE_COMMAND_READ)
 			pUdmaParams->readWrite = MV_UDMA_TYPE_READ;
 		else 
 			pUdmaParams->readWrite = MV_UDMA_TYPE_WRITE;
 		
 		if (pCmd->pSgTable && pCmd->cf_physical_sg) {
 			FPSCAT_GATH sg1=tmpSg, sg2=pCmd->pSgTable;
 			do { *sg1++=*sg2; } while ((sg2++->wSgFlag & SG_FLAG_EOT)==0);
 		}
 		else {
 			if (!pCmd->pfnBuildSgl || !pCmd->pfnBuildSgl(_VBUS_P pCmd, tmpSg, 0)) {
 pio:				
 				mvSataDisableChannelDma(pMvSataAdapter, channel);
 				mvSataFlushDmaQueue(pMvSataAdapter, channel, MV_FLUSH_TYPE_CALLBACK);
 	
 				if (pCmd->pSgTable && pCmd->cf_physical_sg==0) {
 					FPSCAT_GATH sg1=tmpSg, sg2=pCmd->pSgTable;
 					do { *sg1++=*sg2; } while ((sg2++->wSgFlag & SG_FLAG_EOT)==0);
 				}
 				else {
 					if (!pCmd->pfnBuildSgl || !pCmd->pfnBuildSgl(_VBUS_P pCmd, tmpSg, 1)) {
 						pCmd->Result = RETURN_NEED_LOGICAL_SG;
 						goto finish_cmd;
 					}
 				}
 										
 				do {
 					ULONG size = tmpSg->wSgSize? tmpSg->wSgSize : 0x10000;
 					ULONG_PTR addr = tmpSg->dSgAddress;
 					if (size & 0x1ff) {
 						pCmd->Result = RETURN_INVALID_REQUEST;
 						goto finish_cmd;
 					}
 					if (mvStorageDevATAExecuteNonUDMACommand(pMvSataAdapter, channel,
 						(pCmd->cf_data_out)?MV_NON_UDMA_PROTOCOL_PIO_DATA_OUT:MV_NON_UDMA_PROTOCOL_PIO_DATA_IN,
 						is48bit,
 						(MV_U16_PTR)addr, 
 						size >> 1,	/* count       */
 						0,		/* features  N/A  */
 						(MV_U16)(size>>9),	/*sector count*/
 						(MV_U16)(  (is48bit? (MV_U16)((Lba >> 16) & 0xFF00) : 0 )  | (UCHAR)(Lba & 0xFF) ), /*lbalow*/
 						(MV_U16)((Lba >> 8) & 0xFF), /* lbaMid      */
 						(MV_U16)((Lba >> 16) & 0xFF),/* lbaHigh     */
 						(MV_U8)(0x40 | (is48bit ? 0 : (UCHAR)(Lba >> 24) & 0xFF )),/* device      */
 						(MV_U8)(is48bit ? (pCmd->cf_data_in?IDE_COMMAND_READ_EXT:IDE_COMMAND_WRITE_EXT):pCmd->uCmd.Ide.Command)
 					)==MV_FALSE)
 					{
 						pCmd->Result = RETURN_IDE_ERROR;
 						goto finish_cmd;
 					}
 					Lba += size>>9;
 					if(Lba & 0xF0000000) is48bit = MV_TRUE;
 				}
 				while ((tmpSg++->wSgFlag & SG_FLAG_EOT)==0);
 				pCmd->Result = RETURN_SUCCESS;
 finish_cmd:
 				mvSataEnableChannelDma(pMvSataAdapter,channel);
 				CallAfterReturn(_VBUS_P (DPC_PROC)pCmd->pfnCompletion, pCmd);
 				return;
 			}
 		}
 		
 		pPRDTable = (MV_SATA_EDMA_PRD_ENTRY *) AllocatePRDTable(pMvSataAdapter->IALData);
 		KdPrint(("pPRDTable:%p\n",pPRDTable));
 		if (!pPRDTable) {
 			pCmd->Result = RETURN_DEVICE_BUSY;
 			CallAfterReturn(_VBUS_P (DPC_PROC)pCmd->pfnCompletion, pCmd);
 			HPT_ASSERT(0);
 			return;
 		}
 
 		do{
 			pPRDTable[i].highBaseAddr = (sizeof(tmpSg->dSgAddress)>4 ? (MV_U32)(tmpSg->dSgAddress>>32) : 0);
 			pPRDTable[i].flags = (MV_U16)tmpSg->wSgFlag;
 			pPRDTable[i].byteCount = (MV_U16)tmpSg->wSgSize;
 			pPRDTable[i].lowBaseAddr = (MV_U32)tmpSg->dSgAddress;
 			pPRDTable[i].reserved = 0;
 			i++;
 		}while((tmpSg++->wSgFlag & SG_FLAG_EOT)==0);
 		
 		pUdmaParams->prdLowAddr = (ULONG)fOsPhysicalAddress(pPRDTable);
 		if ((pUdmaParams->numOfSectors == 256) && (pMvSataChannel->lba48Address == MV_FALSE)) {
 			pUdmaParams->numOfSectors = 0;
 		}
 		
 		pCmd->uScratch.sata_param.prdAddr = (PVOID)pPRDTable;
 
 		result = mvSataQueueCommand(pMvSataAdapter, channel, &commandInfo);
 
 		if (result != MV_QUEUE_COMMAND_RESULT_OK)
 		{
 queue_failed:
 			switch (result)
 			{
 			case MV_QUEUE_COMMAND_RESULT_BAD_LBA_ADDRESS:
 				MV_ERROR("IAL Error: Edma Queue command failed. Bad LBA "
 						 "LBA[31:0](0x%08x)\n", pUdmaParams->lowLBAAddress);
 				pCmd->Result = RETURN_IDE_ERROR;
 				break;
 			case MV_QUEUE_COMMAND_RESULT_QUEUED_MODE_DISABLED:
 				MV_ERROR("IAL Error: Edma Queue command failed. EDMA"
 						 " disabled adapter %d channel %d\n",
 						 pMvSataAdapter->adapterId, channel);
 				mvSataEnableChannelDma(pMvSataAdapter,channel);
 				pCmd->Result = RETURN_IDE_ERROR;
 				break;
 			case MV_QUEUE_COMMAND_RESULT_FULL:
 				MV_ERROR("IAL Error: Edma Queue command failed. Queue is"
 						 " Full adapter %d channel %d\n",
 						 pMvSataAdapter->adapterId, channel);
 				pCmd->Result = RETURN_DEVICE_BUSY;
 				break;
 			case MV_QUEUE_COMMAND_RESULT_BAD_PARAMS:
 				MV_ERROR("IAL Error: Edma Queue command failed. (Bad "
 						 "Params), pMvSataAdapter: %p,  pSataChannel: %p.\n",
 						 pMvSataAdapter, pMvSataAdapter->sataChannel[channel]);
 				pCmd->Result = RETURN_IDE_ERROR;
 				break;
 			default:
 				MV_ERROR("IAL Error: Bad result value (%d) from queue"
 						 " command\n", result);
 				pCmd->Result = RETURN_IDE_ERROR;
 			}
 			if(pPRDTable) 
 				FreePRDTable(pMvSataAdapter->IALData,pPRDTable);
 			CallAfterReturn(_VBUS_P (DPC_PROC)pCmd->pfnCompletion, pCmd);
 		}
 		pDevice->QueueLength++;
 		return;
 		
 	case IDE_COMMAND_VERIFY:
 		commandInfo.type = MV_QUEUED_COMMAND_TYPE_NONE_UDMA;
 		pNoUdmaParams->bufPtr = NULL;
 		pNoUdmaParams->callBack = CommandCompletionCB;
 		pNoUdmaParams->commandId = (MV_VOID_PTR)pCmd;
 		pNoUdmaParams->count = 0;
 		pNoUdmaParams->features = 0;
 		pNoUdmaParams->protocolType = MV_NON_UDMA_PROTOCOL_NON_DATA;
 		
 		pCmd->uScratch.sata_param.cmd_priv = 1;
 		if (pMvSataChannel->lba48Address == MV_TRUE){
 			pNoUdmaParams->command = MV_ATA_COMMAND_READ_VERIFY_SECTORS_EXT;
 			pNoUdmaParams->isEXT = MV_TRUE;
 			pNoUdmaParams->lbaHigh = (MV_U16)((Lba & 0xff0000) >> 16);
 			pNoUdmaParams->lbaMid = (MV_U16)((Lba & 0xff00) >> 8);   
 			pNoUdmaParams->lbaLow = 
 				(MV_U16)(((Lba & 0xff000000) >> 16)| (Lba & 0xff));
 			pNoUdmaParams->sectorCount = nSector;
 			pNoUdmaParams->device = 0x40;
 			result = mvSataQueueCommand(pMvSataAdapter, channel, &commandInfo);
 			if (result != MV_QUEUE_COMMAND_RESULT_OK){
 				goto queue_failed;
 			}
 			return;
 		}
 		else{
 			pNoUdmaParams->command = MV_ATA_COMMAND_READ_VERIFY_SECTORS;
 			pNoUdmaParams->isEXT = MV_FALSE;
 			pNoUdmaParams->lbaHigh = (MV_U16)((Lba & 0xff0000) >> 16);
 			pNoUdmaParams->lbaMid = (MV_U16)((Lba & 0xff00) >> 8);   
 			pNoUdmaParams->lbaLow = (MV_U16)(Lba & 0xff);
 			pNoUdmaParams->sectorCount = 0xff & nSector;
 			pNoUdmaParams->device = (MV_U8)(0x40 |
 				((Lba & 0xf000000) >> 24));
 			pNoUdmaParams->callBack = CommandCompletionCB;
 			result = mvSataQueueCommand(pMvSataAdapter, channel, &commandInfo);
 			/*FIXME: how about the commands already queued? but marvel also forgets to consider this*/
 			if (result != MV_QUEUE_COMMAND_RESULT_OK){
 				goto queue_failed;
 			}
 		}
 		break;
 	default:
 		pCmd->Result = RETURN_INVALID_REQUEST;
 		CallAfterReturn(_VBUS_P (DPC_PROC)pCmd->pfnCompletion, pCmd);
 		break;
 	}
 }
 
 /**********************************************************
  *
  *	Probe the hostadapter.
  *
  **********************************************************/
 static int
 hpt_probe(device_t dev)
 {
 	if ((pci_get_vendor(dev) == MV_SATA_VENDOR_ID) &&
 		(pci_get_device(dev) == MV_SATA_DEVICE_ID_5081
 #ifdef FOR_DEMO
 		|| pci_get_device(dev) == MV_SATA_DEVICE_ID_5080
 #endif
 		))
 	{
 		KdPrintI((CONTROLLER_NAME " found\n"));
 		device_set_desc(dev, CONTROLLER_NAME);
 		return (BUS_PROBE_DEFAULT);
 	}
 	else
 		return(ENXIO);
 }
 
 /***********************************************************
  *
  *      Auto configuration:  attach and init a host adapter.
  *
  ***********************************************************/
 static int
 hpt_attach(device_t dev)
 {
 	IAL_ADAPTER_T * pAdapter = device_get_softc(dev);
 	int rid;
 	union ccb *ccb;
 	struct cam_devq *devq;
 	struct cam_sim *hpt_vsim;
 
 	device_printf(dev, "%s Version %s \n", DRIVER_NAME, DRIVER_VERSION);
 
 	pAdapter->hpt_dev = dev;
 	
 	rid = init_adapter(pAdapter);
 	if (rid)
 		return rid;
 
 	rid = 0;
 	if ((pAdapter->hpt_irq = bus_alloc_resource_any(pAdapter->hpt_dev, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL)
 	{
 		hpt_printk(("can't allocate interrupt\n"));
 		return(ENXIO);
 	}
 
 	if (bus_setup_intr(pAdapter->hpt_dev, pAdapter->hpt_irq,
 				INTR_TYPE_CAM | INTR_MPSAFE,
 				NULL, hpt_intr, pAdapter, &pAdapter->hpt_intr))
 	{
 		hpt_printk(("can't set up interrupt\n"));
 		free(pAdapter, M_DEVBUF);
 		return(ENXIO);
 	}
 
 
 	ccb = xpt_alloc_ccb();
 	ccb->ccb_h.pinfo.priority = 1;
 	ccb->ccb_h.pinfo.index = CAM_UNQUEUED_INDEX;
 
 	/*
 	 * Create the device queue for our SIM(s).
 	 */
 	if((devq = cam_simq_alloc(8/*MAX_QUEUE_COMM*/)) == NULL)
 	{
 		KdPrint(("ENXIO\n"));
 		return ENOMEM;
 	}
 
 	/*
 	 * Construct our SIM entry
 	 */
 	hpt_vsim = cam_sim_alloc(hpt_action, hpt_poll, __str(PROC_DIR_NAME),
 			pAdapter, device_get_unit(pAdapter->hpt_dev),
 			&pAdapter->lock, 1, 8, devq);
 	if (hpt_vsim == NULL) {
 		cam_simq_free(devq);
 		return ENOMEM;
 	}
 
 	mtx_lock(&pAdapter->lock);
 	if (xpt_bus_register(hpt_vsim, dev, 0) != CAM_SUCCESS)
 	{
 		cam_sim_free(hpt_vsim, /*free devq*/ TRUE);
 		mtx_unlock(&pAdapter->lock);
 		hpt_vsim = NULL;
 		return ENXIO;
 	}
 
 	if(xpt_create_path(&pAdapter->path, /*periph */ NULL,
 			cam_sim_path(hpt_vsim), CAM_TARGET_WILDCARD,
 			CAM_LUN_WILDCARD) != CAM_REQ_CMP)
 	{
 		xpt_bus_deregister(cam_sim_path(hpt_vsim));
 		cam_sim_free(hpt_vsim, /*free_devq*/TRUE);
 		mtx_unlock(&pAdapter->lock);
 		hpt_vsim = NULL;
 		return ENXIO;
 	}
 	mtx_unlock(&pAdapter->lock);
 
 	xpt_setup_ccb(&(ccb->ccb_h), pAdapter->path, /*priority*/5);
 	ccb->ccb_h.func_code = XPT_SASYNC_CB;
 	ccb->csa.event_enable = AC_LOST_DEVICE;
 	ccb->csa.callback = hpt_async;
 	ccb->csa.callback_arg = hpt_vsim;
 	xpt_action((union ccb *)ccb);
 	xpt_free_ccb(ccb);
 
 	if (device_get_unit(dev) == 0) {
 		/* Start the work thread.  XXX */
 		launch_worker_thread();
 	}
 
 	return 0;
 }
 
 static int
 hpt_detach(device_t dev)
 {	
 	return (EBUSY);
 }
 
 
 /***************************************************************
  * The poll function is used to simulate the interrupt when
  * the interrupt subsystem is not functioning.
  *
  ***************************************************************/
 static void
 hpt_poll(struct cam_sim *sim)
 {
 
 	hpt_intr_locked((void *)cam_sim_softc(sim));
 }
 
 /****************************************************************
  *	Name:	hpt_intr
  *	Description:	Interrupt handler.
  ****************************************************************/
 static void
 hpt_intr(void *arg)
 {
 	IAL_ADAPTER_T *pAdapter;
 
 	pAdapter = arg;
 	mtx_lock(&pAdapter->lock);
 	hpt_intr_locked(pAdapter);
 	mtx_unlock(&pAdapter->lock);
 }
 
 static void
 hpt_intr_locked(IAL_ADAPTER_T *pAdapter)
 {
 
 	mtx_assert(&pAdapter->lock, MA_OWNED);
 	/* KdPrintI(("----- Entering Isr() -----\n")); */
 	if (mvSataInterruptServiceRoutine(&pAdapter->mvSataAdapter) == MV_TRUE)
 	{
 		_VBUS_INST(&pAdapter->VBus)
 		CheckPendingCall(_VBUS_P0);
 	}
 
 	/* KdPrintI(("----- Leaving Isr() -----\n")); */
 }
 
 /**********************************************************
  * 			Asynchronous Events
  *********************************************************/
 #if (!defined(UNREFERENCED_PARAMETER))
 #define UNREFERENCED_PARAMETER(x) (void)(x)
 #endif
 
 static void
 hpt_async(void * callback_arg, u_int32_t code, struct cam_path * path,
     void * arg)
 {
 	/* debug XXXX */
 	panic("Here");
 	UNREFERENCED_PARAMETER(callback_arg);
 	UNREFERENCED_PARAMETER(code);
 	UNREFERENCED_PARAMETER(path);
 	UNREFERENCED_PARAMETER(arg);
 
 }
 
 static void
 FlushAdapter(IAL_ADAPTER_T *pAdapter)
 {
 	int i;
 
 	hpt_printk(("flush all devices\n"));
 	
 	/* flush all devices */
 	for (i=0; i<MAX_VDEVICE_PER_VBUS; i++) {
 		PVDevice pVDev = pAdapter->VBus.pVDevice[i];
 		if(pVDev) fFlushVDev(pVDev);
 	}
 }
 
 static int
 hpt_shutdown(device_t dev)
 {
 		IAL_ADAPTER_T *pAdapter;
 	
 		pAdapter = device_get_softc(dev);
 
 		mtx_lock(&pAdapter->lock);
 		FlushAdapter(pAdapter);
 		mtx_unlock(&pAdapter->lock);
 		  /* give the flush some time to happen, 
 		    *otherwise "shutdown -p now" will make file system corrupted */
 		DELAY(1000 * 1000 * 5);
 		return 0;
 }
 
 void
 Check_Idle_Call(IAL_ADAPTER_T *pAdapter)
 {
 	_VBUS_INST(&pAdapter->VBus)
 
 	if (mWaitingForIdle(_VBUS_P0)) {
 		CheckIdleCall(_VBUS_P0);
 #ifdef SUPPORT_ARRAY
 		{
 			int i;
 			PVDevice pArray;
 			for(i = 0; i < MAX_ARRAY_PER_VBUS; i++){
 				if ((pArray=ArrayTables(i))->u.array.dArStamp==0) 
 					continue; 
 				else if (pArray->u.array.rf_auto_rebuild) {
 						KdPrint(("auto rebuild.\n"));
 						pArray->u.array.rf_auto_rebuild = 0;
 						hpt_queue_dpc((HPT_DPC)hpt_rebuild_data_block, pAdapter, pArray, DUPLICATE);
 				}
 			}
 		}
 #endif
 	}
 	/* launch the awaiting commands blocked by mWaitingForIdle */
 	while(pAdapter->pending_Q!= NULL)
 	{
 		_VBUS_INST(&pAdapter->VBus)
 		union ccb *ccb = (union ccb *)pAdapter->pending_Q->ccb_h.ccb_ccb_ptr;
 		hpt_free_ccb(&pAdapter->pending_Q, ccb);
 		CallAfterReturn(_VBUS_P (DPC_PROC)OsSendCommand, ccb);
 	}
 }
 
 static void
 ccb_done(union ccb *ccb)
 {
 	PBUS_DMAMAP pmap = (PBUS_DMAMAP)ccb->ccb_adapter;
 	IAL_ADAPTER_T * pAdapter = pmap->pAdapter;
 	KdPrintI(("ccb_done: ccb %p status %x\n", ccb, ccb->ccb_h.status));
 
 	dmamap_put(pmap);
 	xpt_done(ccb);
 
 	pAdapter->outstandingCommands--;
 
 	if (pAdapter->outstandingCommands == 0)
 	{
 		if(DPC_Request_Nums == 0)
 			Check_Idle_Call(pAdapter);
 		wakeup(pAdapter);
 	}
 }
 
 /****************************************************************
  *	Name:	hpt_action
  *	Description:	Process a queued command from the CAM layer.
  *	Parameters:		sim - Pointer to SIM object
  *					ccb - Pointer to SCSI command structure.
  ****************************************************************/
 
 void
 hpt_action(struct cam_sim *sim, union ccb *ccb)
 {
 	IAL_ADAPTER_T * pAdapter = (IAL_ADAPTER_T *) cam_sim_softc(sim);
 	PBUS_DMAMAP  pmap;
 	_VBUS_INST(&pAdapter->VBus)
 
 	mtx_assert(&pAdapter->lock, MA_OWNED);
 	CAM_DEBUG(ccb->ccb_h.path, CAM_DEBUG_TRACE, ("hpt_action\n"));
 	KdPrint(("hpt_action(%lx,%lx{%x})\n", (u_long)sim, (u_long)ccb, ccb->ccb_h.func_code));
 
 	switch (ccb->ccb_h.func_code)
 	{
 		case XPT_SCSI_IO:	/* Execute the requested I/O operation */
 		{
 			/* ccb->ccb_h.path_id is not our bus id - don't check it */
 
 			if (ccb->ccb_h.target_lun)	{
 				ccb->ccb_h.status = CAM_LUN_INVALID;
 				xpt_done(ccb);
 				return;
 			}
 			if (ccb->ccb_h.target_id >= MAX_VDEVICE_PER_VBUS ||
 				pAdapter->VBus.pVDevice[ccb->ccb_h.target_id]==0) {
 				ccb->ccb_h.status = CAM_TID_INVALID;
 				xpt_done(ccb);
 				return;
 			}
 
 			if (pAdapter->outstandingCommands==0 && DPC_Request_Nums==0)
 				Check_Idle_Call(pAdapter);
 
 			pmap = dmamap_get(pAdapter);
 			HPT_ASSERT(pmap);
 			ccb->ccb_adapter = pmap;
 			memset((void *)pmap->psg, 0,  sizeof(pmap->psg));
 
 			if (mWaitingForIdle(_VBUS_P0))
 				hpt_queue_ccb(&pAdapter->pending_Q, ccb);
 			else
 				OsSendCommand(_VBUS_P ccb);
 
 			/* KdPrint(("leave scsiio\n")); */
 			break;
 		}
 
 		case XPT_RESET_BUS:
 			KdPrint(("reset bus\n"));
 			fResetVBus(_VBUS_P0);
 			xpt_done(ccb);
 			break;
 
 		case XPT_RESET_DEV:	/* Bus Device Reset the specified SCSI device */
 		case XPT_ABORT:			/* Abort the specified CCB */
 		case XPT_TERM_IO:		/* Terminate the I/O process */
 			/* XXX Implement */
 			ccb->ccb_h.status = CAM_REQ_INVALID;
 			xpt_done(ccb);
 			break;
 
 		case XPT_GET_TRAN_SETTINGS:
 		case XPT_SET_TRAN_SETTINGS:
 			/* XXX Implement */
 			ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
 			xpt_done(ccb);
 			break;
 
 		case XPT_CALC_GEOMETRY:
 			cam_calc_geometry(&ccb->ccg, 1);
 			xpt_done(ccb);
 			break;
 
 		case XPT_PATH_INQ:		/* Path routing inquiry */
 		{
 			struct ccb_pathinq *cpi = &ccb->cpi;
 
 			cpi->version_num = 1; /* XXX??? */
 			cpi->hba_inquiry = PI_SDTR_ABLE;
 			cpi->target_sprt = 0;
 			/* Not necessary to reset bus */
 			cpi->hba_misc = PIM_NOBUSRESET;
 			cpi->hba_eng_cnt = 0;
 
 			cpi->max_target = MAX_VDEVICE_PER_VBUS;
 			cpi->max_lun = 0;
 			cpi->initiator_id = MAX_VDEVICE_PER_VBUS;
 
 			cpi->bus_id = cam_sim_bus(sim);
 			cpi->base_transfer_speed = 3300;
 			strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
 			strlcpy(cpi->hba_vid, "HPT   ", HBA_IDLEN);
 			strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
 			cpi->unit_number = cam_sim_unit(sim);
 			cpi->transport = XPORT_SPI;
 			cpi->transport_version = 2;
 			cpi->protocol = PROTO_SCSI;
 			cpi->protocol_version = SCSI_REV_2;
 			cpi->ccb_h.status = CAM_REQ_CMP;
 			xpt_done(ccb);
 			break;
 		}
 
 		default:
 			KdPrint(("invalid cmd\n"));
 			ccb->ccb_h.status = CAM_REQ_INVALID;
 			xpt_done(ccb);
 			break;
 	}
 	/* KdPrint(("leave hpt_action..............\n")); */
 }
 
 /* shall be called at lock_driver() */
 static void
 hpt_queue_ccb(union ccb **ccb_Q, union ccb *ccb)
 {
 	if(*ccb_Q == NULL)
 		ccb->ccb_h.ccb_ccb_ptr = ccb;
 	else {
 		ccb->ccb_h.ccb_ccb_ptr = (*ccb_Q)->ccb_h.ccb_ccb_ptr;
 		(*ccb_Q)->ccb_h.ccb_ccb_ptr = (char *)ccb;
 	}
 
 	*ccb_Q = ccb;
 }
 
 /* shall be called at lock_driver() */
 static void
 hpt_free_ccb(union ccb **ccb_Q, union ccb *ccb)
 {
 	union ccb *TempCCB;
 
 	TempCCB = *ccb_Q;
 
 	if(ccb->ccb_h.ccb_ccb_ptr == ccb) /*it means SCpnt is the last one in CURRCMDs*/
 		*ccb_Q = NULL;
 	else {
 		while(TempCCB->ccb_h.ccb_ccb_ptr != (char *)ccb)
 			TempCCB = (union ccb *)TempCCB->ccb_h.ccb_ccb_ptr;
 
 		TempCCB->ccb_h.ccb_ccb_ptr = ccb->ccb_h.ccb_ccb_ptr;
 
 		if(*ccb_Q == ccb)
 			*ccb_Q = TempCCB;
 	}
 }
 
 #ifdef SUPPORT_ARRAY
 /***************************************************************************
  * Function:     hpt_worker_thread
  * Description:  Do background rebuilding. Execute in kernel thread context.
  * Returns:      None
  ***************************************************************************/
 static void hpt_worker_thread(void)
 {
 
 	for(;;)	{
 		mtx_lock(&DpcQueue_Lock);
 		while (DpcQueue_First!=DpcQueue_Last) {
 			ST_HPT_DPC p;
 			p = DpcQueue[DpcQueue_First];
 			DpcQueue_First++;
 			DpcQueue_First %= MAX_DPC;
 			DPC_Request_Nums++;
 			mtx_unlock(&DpcQueue_Lock);
 			p.dpc(p.pAdapter, p.arg, p.flags);
 
 			mtx_lock(&p.pAdapter->lock);
 			mtx_lock(&DpcQueue_Lock);
 			DPC_Request_Nums--;
 			/* since we may have prevented Check_Idle_Call, do it here */
 			if (DPC_Request_Nums==0) {
 				if (p.pAdapter->outstandingCommands == 0) {
 					_VBUS_INST(&p.pAdapter->VBus);
 					Check_Idle_Call(p.pAdapter);
 					CheckPendingCall(_VBUS_P0);
 				}
 			}
 			mtx_unlock(&p.pAdapter->lock);
 			mtx_unlock(&DpcQueue_Lock);
 
 			/*Schedule out*/
 			if (SIGISMEMBER(curproc->p_siglist, SIGSTOP)) {
 				/* abort rebuilding process. */
 				IAL_ADAPTER_T *pAdapter;
 				PVDevice      pArray;
 				PVBus         _vbus_p;
 				int i;
 
 				sx_slock(&hptmv_list_lock);
 				pAdapter = gIal_Adapter;
 
 				while(pAdapter != NULL){
 					mtx_lock(&pAdapter->lock);
 					_vbus_p = &pAdapter->VBus;
 
 					for (i=0;i<MAX_ARRAY_PER_VBUS;i++) 
 					{
 						if ((pArray=ArrayTables(i))->u.array.dArStamp==0) 
 							continue; 
 						else if (pArray->u.array.rf_rebuilding ||
 								pArray->u.array.rf_verifying ||
 								pArray->u.array.rf_initializing)
 							{
 								pArray->u.array.rf_abort_rebuild = 1;
 							}
 					}
 					mtx_unlock(&pAdapter->lock);
 					pAdapter = pAdapter->next;
 				}
 				sx_sunlock(&hptmv_list_lock);
 			}
 			mtx_lock(&DpcQueue_Lock);
 		}
 		mtx_unlock(&DpcQueue_Lock);
 
 /*Remove this debug option*/
 /*
 #ifdef DEBUG
 		if (SIGISMEMBER(curproc->p_siglist, SIGSTOP))
 			pause("hptrdy", 2*hz);
 #endif
 */
 		kproc_suspend_check(curproc);
 		pause("-", 2*hz);  /* wait for something to do */
 	}
 }
 
 static struct proc *hptdaemonproc;
 static struct kproc_desc hpt_kp = {
 	"hpt_wt",
 	hpt_worker_thread,
 	&hptdaemonproc
 };
 
 /*Start this thread in the hpt_attach, to prevent kernel from loading it without our controller.*/
 static void
 launch_worker_thread(void)
 {
 	IAL_ADAPTER_T *pAdapTemp;
 	
 	kproc_start(&hpt_kp);
 
 	sx_slock(&hptmv_list_lock);
 	for (pAdapTemp = gIal_Adapter; pAdapTemp; pAdapTemp = pAdapTemp->next) {
 
 		_VBUS_INST(&pAdapTemp->VBus)
 		int i;
 		PVDevice pVDev;
 
 		for(i = 0; i < MAX_ARRAY_PER_VBUS; i++) 
 			if ((pVDev=ArrayTables(i))->u.array.dArStamp==0) 
 				continue; 
 			else{
 				if (pVDev->u.array.rf_need_rebuild && !pVDev->u.array.rf_rebuilding)
 					hpt_queue_dpc((HPT_DPC)hpt_rebuild_data_block, pAdapTemp, pVDev,
 					(UCHAR)((pVDev->u.array.CriticalMembers || pVDev->VDeviceType == VD_RAID_1)? DUPLICATE : REBUILD_PARITY));
 			}
 	}
 	sx_sunlock(&hptmv_list_lock);
 
 	/*
 	 * hpt_worker_thread needs to be suspended after shutdown sync, when fs sync finished.
 	 */
 	EVENTHANDLER_REGISTER(shutdown_post_sync, kproc_shutdown, hptdaemonproc,
 	    SHUTDOWN_PRI_LAST);
 }
 /*
  *SYSINIT(hptwt, SI_SUB_KTHREAD_IDLE, SI_ORDER_FIRST, launch_worker_thread, NULL);
 */
 
 #endif
 
 /********************************************************************************/
 
 int HPTLIBAPI fOsBuildSgl(_VBUS_ARG PCommand pCmd, FPSCAT_GATH pSg, int logical)
 {
 	union ccb *ccb = (union ccb *)pCmd->pOrgCommand;
  
 	if (logical) {
 		pSg->dSgAddress = (ULONG_PTR)(UCHAR *)ccb->csio.data_ptr;
 		pSg->wSgSize = ccb->csio.dxfer_len;
 		pSg->wSgFlag = SG_FLAG_EOT;
 		return TRUE;
 	}
 	/* since we have provided physical sg, nobody will ask us to build physical sg */
 	HPT_ASSERT(0);
 	return FALSE;
 }
 
 /*******************************************************************************/
 ULONG HPTLIBAPI
 GetStamp(void)
 {
 	/* 
 	 * the system variable, ticks, can't be used since it hasn't yet been active 
 	 * when our driver starts (ticks==0, it's a invalid stamp value)
 	 */
 	ULONG stamp;
 	do { stamp = random(); } while (stamp==0);
 	return stamp;
 }
 
 
 static void
 SetInquiryData(PINQUIRYDATA inquiryData, PVDevice pVDev)
 {
 	int i;
 	IDENTIFY_DATA2 *pIdentify = (IDENTIFY_DATA2*)pVDev->u.disk.mv->identifyDevice;
 
 	inquiryData->DeviceType = T_DIRECT; /*DIRECT_ACCESS_DEVICE*/
 	inquiryData->AdditionalLength = (UCHAR)(sizeof(INQUIRYDATA) - 5);
 #ifndef SERIAL_CMDS
 	inquiryData->CommandQueue = 1;
 #endif
 
 	switch(pVDev->VDeviceType) {
 	case VD_SINGLE_DISK:
 	case VD_ATAPI:
 	case VD_REMOVABLE:
 		/* Set the removable bit, if applicable. */
 		if ((pVDev->u.disk.df_removable_drive) || (pIdentify->GeneralConfiguration & 0x80))
 			inquiryData->RemovableMedia = 1;
 
 		/* Fill in vendor identification fields. */
 		for (i = 0; i < 20; i += 2) {				
 			inquiryData->VendorId[i] 	= ((PUCHAR)pIdentify->ModelNumber)[i + 1];
 			inquiryData->VendorId[i+1] 	= ((PUCHAR)pIdentify->ModelNumber)[i];
 
 		}
 
 		/* Initialize unused portion of product id. */
 		for (i = 0; i < 4; i++) inquiryData->ProductId[12+i] = ' ';
 
 		/* firmware revision */
 		for (i = 0; i < 4; i += 2)
 		{				
 			inquiryData->ProductRevisionLevel[i] 	= ((PUCHAR)pIdentify->FirmwareRevision)[i+1];
 			inquiryData->ProductRevisionLevel[i+1] 	= ((PUCHAR)pIdentify->FirmwareRevision)[i];
 		}
 		break;
 	default:
 		memcpy(&inquiryData->VendorId, "RR18xx  ", 8);
 #ifdef SUPPORT_ARRAY
 		switch(pVDev->VDeviceType){
 		case VD_RAID_0:
 			if ((pVDev->u.array.pMember[0] && mIsArray(pVDev->u.array.pMember[0])) ||
 				(pVDev->u.array.pMember[1] && mIsArray(pVDev->u.array.pMember[1])))
 				memcpy(&inquiryData->ProductId, "RAID 1/0 Array  ", 16);
 			else
 				memcpy(&inquiryData->ProductId, "RAID 0 Array    ", 16);
 			break;
 		case VD_RAID_1:
 			if ((pVDev->u.array.pMember[0] && mIsArray(pVDev->u.array.pMember[0])) ||
 				(pVDev->u.array.pMember[1] && mIsArray(pVDev->u.array.pMember[1])))
 				memcpy(&inquiryData->ProductId, "RAID 0/1 Array  ", 16);
 			else
 				memcpy(&inquiryData->ProductId, "RAID 1 Array    ", 16);
 			break;
 		case VD_RAID_5:
 			memcpy(&inquiryData->ProductId, "RAID 5 Array    ", 16);
 			break;
 		case VD_JBOD:
 			memcpy(&inquiryData->ProductId, "JBOD Array      ", 16);
 			break;
 		}
 #endif
 		memcpy(&inquiryData->ProductRevisionLevel, "3.00", 4);
 		break;
 	}
 }
 
 static void
 hpt_timeout(void *arg)
 {
 	PBUS_DMAMAP pmap = (PBUS_DMAMAP)((union ccb *)arg)->ccb_adapter;
 	IAL_ADAPTER_T *pAdapter = pmap->pAdapter;
 	_VBUS_INST(&pAdapter->VBus)
 
 	mtx_assert(&pAdapter->lock, MA_OWNED);
 	fResetVBus(_VBUS_P0);
 }
 
 static void 
 hpt_io_dmamap_callback(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
 {
 	PCommand pCmd = (PCommand)arg;
 	union ccb *ccb = pCmd->pOrgCommand;
 	struct ccb_hdr *ccb_h = &ccb->ccb_h;
 	PBUS_DMAMAP pmap = (PBUS_DMAMAP) ccb->ccb_adapter;
 	IAL_ADAPTER_T *pAdapter = pmap->pAdapter;
 	PVDevice	pVDev = pAdapter->VBus.pVDevice[ccb_h->target_id];
 	FPSCAT_GATH psg = pCmd->pSgTable;
 	int idx;
 	_VBUS_INST(pVDev->pVBus)
 
 	HPT_ASSERT(pCmd->cf_physical_sg);
 		
 	if (error)
 		panic("busdma error");
 		
 	HPT_ASSERT(nsegs<= MAX_SG_DESCRIPTORS);
 
 	if (nsegs != 0) {
 		for (idx = 0; idx < nsegs; idx++, psg++) {
 			psg->dSgAddress = (ULONG_PTR)(UCHAR *)segs[idx].ds_addr;
 			psg->wSgSize = segs[idx].ds_len;
 			psg->wSgFlag = (idx == nsegs-1)? SG_FLAG_EOT: 0;
 	/*		KdPrint(("psg[%d]:add=%p,size=%x,flag=%x\n", idx, psg->dSgAddress,psg->wSgSize,psg->wSgFlag)); */
 		}
 		/*	psg[-1].wSgFlag = SG_FLAG_EOT; */
 		
 		if (pCmd->cf_data_in) {
 			bus_dmamap_sync(pAdapter->io_dma_parent, pmap->dma_map,
 			    BUS_DMASYNC_PREREAD);
 		}
 		else if (pCmd->cf_data_out) {
 			bus_dmamap_sync(pAdapter->io_dma_parent, pmap->dma_map,
 			    BUS_DMASYNC_PREWRITE);
 		}
 	}
 
 	callout_reset(&pmap->timeout, 20 * hz, hpt_timeout, ccb);
 	pVDev->pfnSendCommand(_VBUS_P pCmd);
 	CheckPendingCall(_VBUS_P0);
 }
 
 
 
 static void HPTLIBAPI
 OsSendCommand(_VBUS_ARG union ccb *ccb)
 {
 	PBUS_DMAMAP pmap = (PBUS_DMAMAP)ccb->ccb_adapter;
 	IAL_ADAPTER_T *pAdapter = pmap->pAdapter;
 	struct ccb_hdr *ccb_h = &ccb->ccb_h;
 	struct ccb_scsiio *csio = &ccb->csio;
 	PVDevice	pVDev = pAdapter->VBus.pVDevice[ccb_h->target_id];
 
 	KdPrintI(("OsSendCommand: ccb %p  cdb %x-%x-%x\n",
 		ccb,
 		*(ULONG *)&ccb->csio.cdb_io.cdb_bytes[0],
 		*(ULONG *)&ccb->csio.cdb_io.cdb_bytes[4],
 		*(ULONG *)&ccb->csio.cdb_io.cdb_bytes[8]
 	));
 
 	pAdapter->outstandingCommands++;
 
 	if (pVDev == NULL || pVDev->vf_online == 0) {
 		ccb->ccb_h.status = CAM_REQ_INVALID;
 		ccb_done(ccb);
 		goto Command_Complished;
 	}
 
 	switch(ccb->csio.cdb_io.cdb_bytes[0])
 	{
 		case TEST_UNIT_READY:
 		case START_STOP_UNIT:
 		case SYNCHRONIZE_CACHE:
 			/* FALLTHROUGH */
 			ccb->ccb_h.status = CAM_REQ_CMP;
 			break;
 
 		case INQUIRY:
 			ZeroMemory(ccb->csio.data_ptr, ccb->csio.dxfer_len);
 			SetInquiryData((PINQUIRYDATA)ccb->csio.data_ptr, pVDev);
 			ccb_h->status = CAM_REQ_CMP;
 			break;
 
 		case READ_CAPACITY:
 		{		
 			UCHAR *rbuf=csio->data_ptr;
 			unsigned int cap;
 
 			if (pVDev->VDeviceCapacity > 0xfffffffful) {
 				cap = 0xfffffffful;
 			} else {
 				cap = pVDev->VDeviceCapacity - 1;
 			}
 
 			rbuf[0] = (UCHAR)(cap>>24);
 			rbuf[1] = (UCHAR)(cap>>16);
 			rbuf[2] = (UCHAR)(cap>>8);
 			rbuf[3] = (UCHAR)cap;
 			/* Claim 512 byte blocks (big-endian). */
 			rbuf[4] = 0;
 			rbuf[5] = 0;
 			rbuf[6] = 2;
 			rbuf[7] = 0;
 			
 			ccb_h->status = CAM_REQ_CMP;
 			break;
 		}
 
 		case 0x9e: /*SERVICE_ACTION_IN*/ 
 		{
 			UCHAR *rbuf = csio->data_ptr;
 			LBA_T cap = pVDev->VDeviceCapacity - 1;
 			
 			rbuf[0] = (UCHAR)(cap>>56);
 			rbuf[1] = (UCHAR)(cap>>48);
 			rbuf[2] = (UCHAR)(cap>>40);
 			rbuf[3] = (UCHAR)(cap>>32);
 			rbuf[4] = (UCHAR)(cap>>24);
 			rbuf[5] = (UCHAR)(cap>>16);
 			rbuf[6] = (UCHAR)(cap>>8);
 			rbuf[7] = (UCHAR)cap;
 			rbuf[8] = 0;
 			rbuf[9] = 0;
 			rbuf[10] = 2;
 			rbuf[11] = 0;
 			
 			ccb_h->status = CAM_REQ_CMP;
 			break;	
 		}
 
 		case READ_6:
 		case WRITE_6:
 		case READ_10:
 		case WRITE_10:
 		case 0x88: /* READ_16 */
 		case 0x8a: /* WRITE_16 */
 		case 0x13:
 		case 0x2f:
 		{
 			UCHAR Cdb[16];
 			UCHAR CdbLength;
 			_VBUS_INST(pVDev->pVBus)
 			PCommand pCmd = AllocateCommand(_VBUS_P0);
 			int error;
 			HPT_ASSERT(pCmd);
 
 			CdbLength = csio->cdb_len;
 			if ((ccb->ccb_h.flags & CAM_CDB_POINTER) != 0)
 			{
 				if ((ccb->ccb_h.flags & CAM_CDB_PHYS) == 0)
 				{
 					bcopy(csio->cdb_io.cdb_ptr, Cdb, CdbLength);
 				}
 				else
 				{
 					KdPrintE(("ERROR!!!\n"));
 					ccb->ccb_h.status = CAM_REQ_INVALID;
 					break;
 				}
 			}
 			else
 			{
 				bcopy(csio->cdb_io.cdb_bytes, Cdb, CdbLength);
 			}
 
 			pCmd->pOrgCommand = ccb;
 			pCmd->pVDevice = pVDev;
 			pCmd->pfnCompletion = fOsCommandDone;
 			pCmd->pfnBuildSgl = fOsBuildSgl;
 			pCmd->pSgTable = pmap->psg;
 
 			switch (Cdb[0])
 			{
 				case READ_6:
 				case WRITE_6:
 				case 0x13:
 					pCmd->uCmd.Ide.Lba =  ((ULONG)Cdb[1] << 16) | ((ULONG)Cdb[2] << 8) | (ULONG)Cdb[3];
 					pCmd->uCmd.Ide.nSectors = (USHORT) Cdb[4];
 					break;
 
 				case 0x88: /* READ_16 */
 				case 0x8a: /* WRITE_16 */
 					pCmd->uCmd.Ide.Lba = 
 						(HPT_U64)Cdb[2] << 56 |
 						(HPT_U64)Cdb[3] << 48 |
 						(HPT_U64)Cdb[4] << 40 |
 						(HPT_U64)Cdb[5] << 32 |
 						(HPT_U64)Cdb[6] << 24 |
 						(HPT_U64)Cdb[7] << 16 |
 						(HPT_U64)Cdb[8] << 8 |
 						(HPT_U64)Cdb[9];
 					pCmd->uCmd.Ide.nSectors = (USHORT)Cdb[12] << 8 | (USHORT)Cdb[13];
 					break;
 					
 				default:
 					pCmd->uCmd.Ide.Lba = (ULONG)Cdb[5] | ((ULONG)Cdb[4] << 8) | ((ULONG)Cdb[3] << 16) | ((ULONG)Cdb[2] << 24);
 					pCmd->uCmd.Ide.nSectors = (USHORT) Cdb[8] | ((USHORT)Cdb[7]<<8);
 					break;
 			}
 
 			switch (Cdb[0])
 			{
 				case READ_6:
 				case READ_10:
 				case 0x88: /* READ_16 */
 					pCmd->uCmd.Ide.Command = IDE_COMMAND_READ;
 					pCmd->cf_data_in = 1;
 					break;
 
 				case WRITE_6:
 				case WRITE_10:
 				case 0x8a: /* WRITE_16 */
 					pCmd->uCmd.Ide.Command = IDE_COMMAND_WRITE;
 					pCmd->cf_data_out = 1;
 					break;
 				case 0x13:
 				case 0x2f:
 					pCmd->uCmd.Ide.Command = IDE_COMMAND_VERIFY;
 					break;
 			}
 /*///////////////////////// */
 			pCmd->cf_physical_sg = 1;
 			error = bus_dmamap_load_ccb(pAdapter->io_dma_parent, 
 						    pmap->dma_map, 
 						    ccb,
 						    hpt_io_dmamap_callback,
 						    pCmd, BUS_DMA_WAITOK
 						    );
 			KdPrint(("bus_dmamap_load return %d\n", error));
 			if (error && error!=EINPROGRESS) {
 				hpt_printk(("bus_dmamap_load error %d\n", error));
 				FreeCommand(_VBUS_P pCmd);
 				ccb->ccb_h.status = CAM_REQ_CMP_ERR;
 				dmamap_put(pmap);
 				pAdapter->outstandingCommands--;
 				if (pAdapter->outstandingCommands == 0)
 					wakeup(pAdapter);
 				xpt_done(ccb);
 			}
 			goto Command_Complished;
 		}
 
 		default:
 			ccb->ccb_h.status = CAM_REQ_INVALID;
 			break;
 	}
 	ccb_done(ccb);
 Command_Complished:
 	CheckPendingCall(_VBUS_P0);
 	return;
 }
 
 static void HPTLIBAPI 
 fOsCommandDone(_VBUS_ARG PCommand pCmd)
 {
 	union ccb *ccb = pCmd->pOrgCommand;
 	PBUS_DMAMAP pmap = (PBUS_DMAMAP)ccb->ccb_adapter; 
 	IAL_ADAPTER_T *pAdapter = pmap->pAdapter;
 
 	KdPrint(("fOsCommandDone(pcmd=%p, result=%d)\n", pCmd, pCmd->Result));
 
 	callout_stop(&pmap->timeout);
 	
 	switch(pCmd->Result) {
 	case RETURN_SUCCESS:
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 	case RETURN_BAD_DEVICE:
 		ccb->ccb_h.status = CAM_DEV_NOT_THERE;
 		break;
 	case RETURN_DEVICE_BUSY:
 		ccb->ccb_h.status = CAM_BUSY;
 		break;
 	case RETURN_INVALID_REQUEST:
 		ccb->ccb_h.status = CAM_REQ_INVALID;
 		break;
 	case RETURN_SELECTION_TIMEOUT:
 		ccb->ccb_h.status = CAM_SEL_TIMEOUT;
 		break;
 	case RETURN_RETRY:
 		ccb->ccb_h.status = CAM_BUSY;
 		break;
 	default:
 		ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR;
 		break;
 	}
 
 	if (pCmd->cf_data_in) {
 		bus_dmamap_sync(pAdapter->io_dma_parent, pmap->dma_map, BUS_DMASYNC_POSTREAD);
 	}
 	else if (pCmd->cf_data_out) {
 		bus_dmamap_sync(pAdapter->io_dma_parent, pmap->dma_map, BUS_DMASYNC_POSTWRITE);
 	}
 	
 	bus_dmamap_unload(pAdapter->io_dma_parent, pmap->dma_map);
 
 	FreeCommand(_VBUS_P pCmd);
 	ccb_done(ccb);
 }
 
 int
 hpt_queue_dpc(HPT_DPC dpc, IAL_ADAPTER_T * pAdapter, void *arg, UCHAR flags)
 {
 	int p;
 
 	mtx_lock(&DpcQueue_Lock);
 	p = (DpcQueue_Last + 1) % MAX_DPC;
 	if (p==DpcQueue_First) {
 		KdPrint(("DPC Queue full!\n"));
 		mtx_unlock(&DpcQueue_Lock);
 		return -1;
 	}
 
 	DpcQueue[DpcQueue_Last].dpc = dpc;
 	DpcQueue[DpcQueue_Last].pAdapter = pAdapter;
 	DpcQueue[DpcQueue_Last].arg = arg;
 	DpcQueue[DpcQueue_Last].flags = flags;
 	DpcQueue_Last = p;
 	mtx_unlock(&DpcQueue_Lock);
 
 	return 0;
 }
 
 #ifdef _RAID5N_
 /* 
  * Allocate memory above 16M, otherwise we may eat all low memory for ISA devices.
  * How about the memory for 5081 request/response array and PRD table?
  */
 void
 *os_alloc_page(_VBUS_ARG0)
 { 
 	return (void *)contigmalloc(0x1000, M_DEVBUF, M_NOWAIT, 0x1000000, 0xffffffff, PAGE_SIZE, 0ul);
 }
 
 void
 *os_alloc_dma_page(_VBUS_ARG0)
 {
 	return (void *)contigmalloc(0x1000, M_DEVBUF, M_NOWAIT, 0x1000000, 0xffffffff, PAGE_SIZE, 0ul);
 }
 
 void
 os_free_page(_VBUS_ARG void *p) 
 { 
-	contigfree(p, 0x1000, M_DEVBUF); 
+	free(p, M_DEVBUF); 
 }
 
 void
 os_free_dma_page(_VBUS_ARG void *p) 
 { 
-	contigfree(p, 0x1000, M_DEVBUF); 
+	free(p, M_DEVBUF); 
 }
 
 void
 DoXor1(ULONG *p0, ULONG *p1, ULONG *p2, UINT nBytes)
 {
 	UINT i;
 	for (i = 0; i < nBytes / 4; i++) *p0++ = *p1++ ^ *p2++;
 }
 
 void
 DoXor2(ULONG *p0, ULONG *p2, UINT nBytes)
 {
 	UINT i;
 	for (i = 0; i < nBytes / 4; i++) *p0++ ^= *p2++;
 }
 #endif
diff --git a/sys/dev/hptnr/hptnr_osm_bsd.c b/sys/dev/hptnr/hptnr_osm_bsd.c
index 00774bf9be4a..a8ac77c5ad5a 100644
--- a/sys/dev/hptnr/hptnr_osm_bsd.c
+++ b/sys/dev/hptnr/hptnr_osm_bsd.c
@@ -1,1682 +1,1682 @@
 /* $Id: osm_bsd.c,v 1.36 2010/05/11 03:12:11 lcn Exp $ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * HighPoint RAID Driver for FreeBSD
  * Copyright (C) 2005-2011 HighPoint Technologies, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <dev/hptnr/hptnr_config.h>
 #include <dev/hptnr/os_bsd.h>
 #include <dev/hptnr/hptintf.h>
 int msi = 0;
 int debug_flag = 0;
 static HIM *hpt_match(device_t dev, int scan)
 {
 	PCI_ID pci_id;
 	HIM *him;
 	int i;
 
 	for (him = him_list; him; him = him->next) {
 		for (i=0; him->get_supported_device_id(i, &pci_id); i++) {
 			if (scan && him->get_controller_count)
 				him->get_controller_count(&pci_id,0,0);
 			if ((pci_get_vendor(dev) == pci_id.vid) &&
 				(pci_get_device(dev) == pci_id.did)){
 				return (him);
 			}
 		}
 	}
 
 	return (NULL);
 }
 
 static int hpt_probe(device_t dev)
 {
 	HIM *him;
 
 	him = hpt_match(dev, 0);
 	if (him != NULL) {
 		KdPrint(("hpt_probe: adapter at PCI %d:%d:%d, IRQ %d",
 			pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev), pci_get_irq(dev)
 			));
 		device_set_desc(dev, him->name);
 		return (BUS_PROBE_DEFAULT);
 	}
 
 	return (ENXIO);
 }
 
 static int hpt_attach(device_t dev)
 {
 	PHBA hba = (PHBA)device_get_softc(dev);
 	HIM *him;
 	PCI_ID pci_id;
 	HPT_UINT size;
 	PVBUS vbus;
 	PVBUS_EXT vbus_ext;
 	
 	if (pci_get_domain(dev) != 0) {
 		device_printf(dev, "does not support PCI domains\n");
 		return (ENXIO);
 	}
 
 	KdPrint(("hpt_attach(%d/%d/%d)", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev)));
 
 	him = hpt_match(dev, 1);
 	hba->ext_type = EXT_TYPE_HBA;
 	hba->ldm_adapter.him = him;
 
 	pci_enable_busmaster(dev);
 
 	pci_id.vid = pci_get_vendor(dev);
 	pci_id.did = pci_get_device(dev);
 	pci_id.rev = pci_get_revid(dev);
 	pci_id.subsys = (HPT_U32)(pci_get_subdevice(dev)) << 16 | pci_get_subvendor(dev);
 
 	size = him->get_adapter_size(&pci_id);
 	hba->ldm_adapter.him_handle = malloc(size, M_DEVBUF, M_WAITOK);
 
 	hba->pcidev = dev;
 	hba->pciaddr.tree = 0;
 	hba->pciaddr.bus = pci_get_bus(dev);
 	hba->pciaddr.device = pci_get_slot(dev);
 	hba->pciaddr.function = pci_get_function(dev);
 
 	if (!him->create_adapter(&pci_id, hba->pciaddr, hba->ldm_adapter.him_handle, hba)) {
 		free(hba->ldm_adapter.him_handle, M_DEVBUF);
 		return ENXIO;
 	}
 
 	os_printk("adapter at PCI %d:%d:%d, IRQ %d",
 		hba->pciaddr.bus, hba->pciaddr.device, hba->pciaddr.function, pci_get_irq(dev));
 
 	if (!ldm_register_adapter(&hba->ldm_adapter)) {
 		size = ldm_get_vbus_size();
 		vbus_ext = malloc(sizeof(VBUS_EXT) + size, M_DEVBUF, M_WAITOK |
 			M_ZERO);
 		vbus_ext->ext_type = EXT_TYPE_VBUS;
 		ldm_create_vbus((PVBUS)vbus_ext->vbus, vbus_ext);
 		ldm_register_adapter(&hba->ldm_adapter);
 	}
 
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		if (hba->ldm_adapter.vbus==vbus) {
 			hba->vbus_ext = vbus_ext;
 			hba->next = vbus_ext->hba_list;
 			vbus_ext->hba_list = hba;
 			break;
 		}
 	}	
 	return 0;
 }
 
 /*
  * Maybe we'd better to use the bus_dmamem_alloc to alloc DMA memory,
  * but there are some problems currently (alignment, etc).
  */
 static __inline void *__get_free_pages(int order)
 {
 	/* don't use low memory - other devices may get starved */
 	return contigmalloc(PAGE_SIZE<<order, 
 			M_DEVBUF, M_WAITOK, BUS_SPACE_MAXADDR_24BIT, BUS_SPACE_MAXADDR, PAGE_SIZE, 0);
 }
 
-static __inline void free_pages(void *p, int order)
+static __inline void free_pages(void *p)
 {
-	contigfree(p, PAGE_SIZE<<order, M_DEVBUF);
+	free(p, M_DEVBUF);
 }
 
 static int hpt_alloc_mem(PVBUS_EXT vbus_ext)
 {
 	PHBA hba;
 	struct freelist *f;
 	HPT_UINT i;
 	void **p;
 
 	for (hba = vbus_ext->hba_list; hba; hba = hba->next)
 		hba->ldm_adapter.him->get_meminfo(hba->ldm_adapter.him_handle);
 
 	ldm_get_mem_info((PVBUS)vbus_ext->vbus, 0);
 
 	for (f=vbus_ext->freelist_head; f; f=f->next) {
 		KdPrint(("%s: %d*%d=%d bytes",
 			f->tag, f->count, f->size, f->count*f->size));
 		for (i=0; i<f->count; i++) {
 			p = (void **)malloc(f->size, M_DEVBUF, M_WAITOK);
 			if (!p)	return (ENXIO);
 			*p = f->head;
 			f->head = p;
 		}
 	}
 
 	for (f=vbus_ext->freelist_dma_head; f; f=f->next) {
 		int order, size, j;
 
 		HPT_ASSERT((f->size & (f->alignment-1))==0);
 
 		for (order=0, size=PAGE_SIZE; size<f->size; order++, size<<=1)
 			;
 
 		KdPrint(("%s: %d*%d=%d bytes, order %d",
 			f->tag, f->count, f->size, f->count*f->size, order));
 		HPT_ASSERT(f->alignment<=PAGE_SIZE);
 
 		for (i=0; i<f->count;) {
 			p = (void **)__get_free_pages(order);
 			if (!p) return -1;
 			for (j = size/f->size; j && i<f->count; i++,j--) {
 				*p = f->head;
 				*(BUS_ADDRESS *)(p+1) = (BUS_ADDRESS)vtophys(p);
 				f->head = p;
 				p = (void **)((unsigned long)p + f->size);
 			}
 		}
 	}
 	
 	HPT_ASSERT(PAGE_SIZE==DMAPOOL_PAGE_SIZE);
 
 	for (i=0; i<os_max_cache_pages; i++) {
 		p = (void **)__get_free_pages(0);
 		if (!p) return -1;
 		HPT_ASSERT(((HPT_UPTR)p & (DMAPOOL_PAGE_SIZE-1))==0);
 		dmapool_put_page((PVBUS)vbus_ext->vbus, p, (BUS_ADDRESS)vtophys(p));
 	}
 
 	return 0;
 }
 
 static void hpt_free_mem(PVBUS_EXT vbus_ext)
 {
 	struct freelist *f;
 	void *p;
 	int i;
 	BUS_ADDRESS bus;
 
 	for (f=vbus_ext->freelist_head; f; f=f->next) {
 #if DBG
 		if (f->count!=f->reserved_count) {
 			KdPrint(("memory leak for freelist %s (%d/%d)", f->tag, f->count, f->reserved_count));
 		}
 #endif
 		while ((p=freelist_get(f)))
 			free(p, M_DEVBUF);
 	}
 
 	for (i=0; i<os_max_cache_pages; i++) {
 		p = dmapool_get_page((PVBUS)vbus_ext->vbus, &bus);
 		HPT_ASSERT(p);
-		free_pages(p, 0);
+		free_pages(p);
 	}
 
 	for (f=vbus_ext->freelist_dma_head; f; f=f->next) {
 		int order, size;
 #if DBG
 		if (f->count!=f->reserved_count) {
 			KdPrint(("memory leak for dma freelist %s (%d/%d)", f->tag, f->count, f->reserved_count));
 		}
 #endif
 		for (order=0, size=PAGE_SIZE; size<f->size; order++, size<<=1) ;
 
 		while ((p=freelist_get_dma(f, &bus))) {
 			if (order)
-				free_pages(p, order);
+				free_pages(p);
 			else {
 			/* can't free immediately since other blocks in this page may still be in the list */
 				if (((HPT_UPTR)p & (PAGE_SIZE-1))==0)
 					dmapool_put_page((PVBUS)vbus_ext->vbus, p, bus);
 			}
 		}
 	}
 	
 	while ((p = dmapool_get_page((PVBUS)vbus_ext->vbus, &bus)))
-		free_pages(p, 0);
+		free_pages(p);
 }
 
 static int hpt_init_vbus(PVBUS_EXT vbus_ext)
 {
 	PHBA hba;
 
 	for (hba = vbus_ext->hba_list; hba; hba = hba->next)
 		if (!hba->ldm_adapter.him->initialize(hba->ldm_adapter.him_handle)) {
 			KdPrint(("fail to initialize %p", hba));
 			return -1;
 		}
 
 	ldm_initialize_vbus((PVBUS)vbus_ext->vbus, &vbus_ext->hba_list->ldm_adapter);
 	return 0;
 }
 
 static void hpt_flush_done(PCOMMAND pCmd)
 {
 	PVDEV vd = pCmd->target;
 
 	if (mIsArray(vd->type) && vd->u.array.transform && vd!=vd->u.array.transform->target) {
 		vd = vd->u.array.transform->target;
 		HPT_ASSERT(vd);
 		pCmd->target = vd;
 		pCmd->Result = RETURN_PENDING;
 		vdev_queue_cmd(pCmd);
 		return;
 	}
 
 	*(int *)pCmd->priv = 1;
 	wakeup(pCmd);
 }
 
 /*
  * flush a vdev (without retry).
  */
 static int hpt_flush_vdev(PVBUS_EXT vbus_ext, PVDEV vd)
 {
 	PCOMMAND pCmd;
 	int result = 0, done;
 	HPT_UINT count;
 
 	KdPrint(("flusing dev %p", vd));
 
 	hpt_assert_vbus_locked(vbus_ext);
 
 	if (mIsArray(vd->type) && vd->u.array.transform)
 		count = max(vd->u.array.transform->source->cmds_per_request,
 					vd->u.array.transform->target->cmds_per_request);
 	else
 		count = vd->cmds_per_request;
 
 	pCmd = ldm_alloc_cmds(vd->vbus, count);
 
 	if (!pCmd) {
 		return -1;
 	}
 
 	pCmd->type = CMD_TYPE_FLUSH;
 	pCmd->flags.hard_flush = 1;
 	pCmd->target = vd;
 	pCmd->done = hpt_flush_done;
 	done = 0;
 	pCmd->priv = &done;
 
 	ldm_queue_cmd(pCmd);
 	
 	if (!done) {
 		while (hpt_sleep(vbus_ext, pCmd, PPAUSE, "hptfls", HPT_OSM_TIMEOUT)) {
 			ldm_reset_vbus(vd->vbus);
 		}
 	}
 
 	KdPrint(("flush result %d", pCmd->Result));
 
 	if (pCmd->Result!=RETURN_SUCCESS)
 		result = -1;
 
 	ldm_free_cmds(pCmd);
 
 	return result;
 }
 
 static void hpt_stop_tasks(PVBUS_EXT vbus_ext);
 static void hpt_shutdown_vbus(PVBUS_EXT vbus_ext, int howto)
 {
 	PVBUS     vbus = (PVBUS)vbus_ext->vbus;
 	PHBA hba;
 	int i;
 	
 	KdPrint(("hpt_shutdown_vbus"));
 
 	/* stop all ctl tasks and disable the worker taskqueue */
 	hpt_stop_tasks(vbus_ext);
 	hpt_lock_vbus(vbus_ext);
 	vbus_ext->worker.ta_context = 0;
 
 	/* flush devices */
 	for (i=0; i<osm_max_targets; i++) {
 		PVDEV vd = ldm_find_target(vbus, i);
 		if (vd) {
 			/* retry once */
 			if (hpt_flush_vdev(vbus_ext, vd))
 				hpt_flush_vdev(vbus_ext, vd);
 		}
 	}
 
 	ldm_shutdown(vbus);
 	hpt_unlock_vbus(vbus_ext);
 
 	ldm_release_vbus(vbus);
 
 	for (hba=vbus_ext->hba_list; hba; hba=hba->next)
 		bus_teardown_intr(hba->pcidev, hba->irq_res, hba->irq_handle);
 
 	hpt_free_mem(vbus_ext);
 
 	while ((hba=vbus_ext->hba_list)) {
 		vbus_ext->hba_list = hba->next;
 		free(hba->ldm_adapter.him_handle, M_DEVBUF);
 	}
 
 	callout_drain(&vbus_ext->timer);
 	mtx_destroy(&vbus_ext->lock);
 	free(vbus_ext, M_DEVBUF);
 	KdPrint(("hpt_shutdown_vbus done"));
 }
 
 static void __hpt_do_tasks(PVBUS_EXT vbus_ext)
 {
 	OSM_TASK *tasks;
 
 	tasks = vbus_ext->tasks;
 	vbus_ext->tasks = 0;
 
 	while (tasks) {
 		OSM_TASK *t = tasks;
 		tasks = t->next;
 		t->next = 0;
 		t->func(vbus_ext->vbus, t->data);
 	}
 }
 
 static void hpt_do_tasks(PVBUS_EXT vbus_ext, int pending)
 {
 	if(vbus_ext){
 		hpt_lock_vbus(vbus_ext);
 		__hpt_do_tasks(vbus_ext);
 		hpt_unlock_vbus(vbus_ext);
 	}
 }
 
 static void hpt_action(struct cam_sim *sim, union ccb *ccb);
 static void hpt_poll(struct cam_sim *sim);
 static void hpt_async(void * callback_arg, u_int32_t code, struct cam_path * path, void * arg);
 static void hpt_pci_intr(void *arg);
 
 static __inline POS_CMDEXT cmdext_get(PVBUS_EXT vbus_ext)
 {
 	POS_CMDEXT p = vbus_ext->cmdext_list;
 	if (p)
 		vbus_ext->cmdext_list = p->next;
 	return p;
 }
 
 static __inline void cmdext_put(POS_CMDEXT p)
 {
 	p->next = p->vbus_ext->cmdext_list;
 	p->vbus_ext->cmdext_list = p;
 }
 
 static void hpt_timeout(void *arg)
 {
 	PCOMMAND pCmd = (PCOMMAND)arg;
 	POS_CMDEXT ext = (POS_CMDEXT)pCmd->priv;
 	
 	KdPrint(("pCmd %p timeout", pCmd));
 	
 	ldm_reset_vbus((PVBUS)ext->vbus_ext->vbus);
 }
 
 static void os_cmddone(PCOMMAND pCmd)
 {
 	POS_CMDEXT ext = (POS_CMDEXT)pCmd->priv;
 	union ccb *ccb = ext->ccb;
 	HPT_U8 *cdb;
 		
 	if (ccb->ccb_h.flags & CAM_CDB_POINTER)
 		cdb = ccb->csio.cdb_io.cdb_ptr;
 	else
 		cdb = ccb->csio.cdb_io.cdb_bytes;
 
 	KdPrint(("os_cmddone(%p, %d)", pCmd, pCmd->Result));
 
 	callout_stop(&ext->timeout);
 	switch(cdb[0]) {
 		case 0x85: /*ATA_16*/
 		case 0xA1: /*ATA_12*/
 		{
 			PassthroughCmd *passthru = &pCmd->uCmd.Passthrough;
 			HPT_U8 *sense_buffer = (HPT_U8 *)&ccb->csio.sense_data;
 			memset(&ccb->csio.sense_data, 0,sizeof(ccb->csio.sense_data));
 
 			sense_buffer[0] = 0x72; /* Response Code */
 			sense_buffer[7] = 14; /* Additional Sense Length */
 	
 			sense_buffer[8] = 0x9; /* ATA Return Descriptor */
 			sense_buffer[9] = 0xc; /* Additional Descriptor Length */
 			sense_buffer[11] = (HPT_U8)passthru->bFeaturesReg; /* Error */
 			sense_buffer[13] = (HPT_U8)passthru->bSectorCountReg;  /* Sector Count (7:0) */
 			sense_buffer[15] = (HPT_U8)passthru->bLbaLowReg; /* LBA Low (7:0) */
 			sense_buffer[17] = (HPT_U8)passthru->bLbaMidReg; /* LBA Mid (7:0) */
 			sense_buffer[19] = (HPT_U8)passthru->bLbaHighReg; /* LBA High (7:0) */
 	
 			if ((cdb[0] == 0x85) && (cdb[1] & 0x1))
 			{
 				sense_buffer[10] = 1;
 				sense_buffer[12] = (HPT_U8)(passthru->bSectorCountReg >> 8); /* Sector Count (15:8) */
 				sense_buffer[14] = (HPT_U8)(passthru->bLbaLowReg >> 8);	/* LBA Low (15:8) */
 				sense_buffer[16] = (HPT_U8)(passthru->bLbaMidReg >> 8); /* LBA Mid (15:8) */
 				sense_buffer[18] = (HPT_U8)(passthru->bLbaHighReg >> 8); /* LBA High (15:8) */
 			}
 	
 			sense_buffer[20] = (HPT_U8)passthru->bDriveHeadReg; /* Device */
 			sense_buffer[21] = (HPT_U8)passthru->bCommandReg; /* Status */
 			KdPrint(("sts 0x%x err 0x%x low 0x%x mid 0x%x hig 0x%x dh 0x%x sc 0x%x",
 					 passthru->bCommandReg,
 					 passthru->bFeaturesReg,
 					 passthru->bLbaLowReg,
 					 passthru->bLbaMidReg,
 					 passthru->bLbaHighReg,
 					 passthru->bDriveHeadReg,
 					 passthru->bSectorCountReg));
 			KdPrint(("result:0x%x,bFeaturesReg:0x%04x,bSectorCountReg:0x%04x,LBA:0x%04x%04x%04x ",
 				pCmd->Result,passthru->bFeaturesReg,passthru->bSectorCountReg,
 				passthru->bLbaHighReg,passthru->bLbaMidReg,passthru->bLbaLowReg));
 		}
 		default:
 			break;
 	}
 
 	switch(pCmd->Result) {
 	case RETURN_SUCCESS:
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 	case RETURN_BAD_DEVICE:
 		ccb->ccb_h.status = CAM_DEV_NOT_THERE;
 		break;
 	case RETURN_DEVICE_BUSY:
 		ccb->ccb_h.status = CAM_BUSY;
 		break;
 	case RETURN_INVALID_REQUEST:
 		ccb->ccb_h.status = CAM_REQ_INVALID;
 		break;
 	case RETURN_SELECTION_TIMEOUT:
 		ccb->ccb_h.status = CAM_SEL_TIMEOUT;
 		break;
 	case RETURN_RETRY:
 		ccb->ccb_h.status = CAM_BUSY;
 		break;
 	default:
 		ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR;
 		break;
 	}
 
 	if (pCmd->flags.data_in) {
 		bus_dmamap_sync(ext->vbus_ext->io_dmat, ext->dma_map, BUS_DMASYNC_POSTREAD);
 	}
 	else if (pCmd->flags.data_out) {
 		bus_dmamap_sync(ext->vbus_ext->io_dmat, ext->dma_map, BUS_DMASYNC_POSTWRITE);
 	}
 	
 	bus_dmamap_unload(ext->vbus_ext->io_dmat, ext->dma_map);
 
 	cmdext_put(ext);
 	ldm_free_cmds(pCmd);
 	xpt_done(ccb);
 }
 
 static int os_buildsgl(PCOMMAND pCmd, PSG pSg, int logical)
 {
 	/* since we have provided physical sg, nobody will ask us to build physical sg */
 	HPT_ASSERT(0);
 	return FALSE;
 }
 
 static void hpt_io_dmamap_callback(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
 {
 	PCOMMAND pCmd = (PCOMMAND)arg;
 	POS_CMDEXT ext = (POS_CMDEXT)pCmd->priv;
 	PSG psg = pCmd->psg;
 	int idx;
 	
 	HPT_ASSERT(pCmd->flags.physical_sg);
 	
 	if (error)
 		panic("busdma error");
 		
 	HPT_ASSERT(nsegs<=os_max_sg_descriptors);
 
 	if (nsegs != 0) {
 		for (idx = 0; idx < nsegs; idx++, psg++) {
 			psg->addr.bus = segs[idx].ds_addr;
 			psg->size = segs[idx].ds_len;
 			psg->eot = 0;
 		}
 		psg[-1].eot = 1;
 	
 		if (pCmd->flags.data_in) {
 			bus_dmamap_sync(ext->vbus_ext->io_dmat, ext->dma_map,
 			    BUS_DMASYNC_PREREAD);
 		}
 		else if (pCmd->flags.data_out) {
 			bus_dmamap_sync(ext->vbus_ext->io_dmat, ext->dma_map,
 			    BUS_DMASYNC_PREWRITE);
 		}
 	}
 
 	callout_reset(&ext->timeout, HPT_OSM_TIMEOUT, hpt_timeout, pCmd);
 	ldm_queue_cmd(pCmd);
 }
 
 static void hpt_scsi_io(PVBUS_EXT vbus_ext, union ccb *ccb)
 {
 	PVBUS vbus = (PVBUS)vbus_ext->vbus;
 	PVDEV vd;
 	PCOMMAND pCmd;
 	POS_CMDEXT ext;
 	HPT_U8 *cdb;
 
 	if (ccb->ccb_h.flags & CAM_CDB_POINTER)
 		cdb = ccb->csio.cdb_io.cdb_ptr;
 	else
 		cdb = ccb->csio.cdb_io.cdb_bytes;
 	
 	KdPrint(("hpt_scsi_io: ccb %x id %d lun %d cdb %x-%x-%x",
 		ccb,
 		ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
 		*(HPT_U32 *)&cdb[0], *(HPT_U32 *)&cdb[4], *(HPT_U32 *)&cdb[8]
 	));
 
 	/* ccb->ccb_h.path_id is not our bus id - don't check it */
 	if (ccb->ccb_h.target_lun != 0 ||
 		ccb->ccb_h.target_id >= osm_max_targets ||
 		(ccb->ccb_h.flags & CAM_CDB_PHYS))
 	{
 		ccb->ccb_h.status = CAM_TID_INVALID;
 		xpt_done(ccb);
 		return;
 	}
 
 	vd = ldm_find_target(vbus, ccb->ccb_h.target_id);
 
 	if (!vd) {
 		ccb->ccb_h.status = CAM_SEL_TIMEOUT;
 		xpt_done(ccb);
 		return;
 	}
    
 	switch (cdb[0]) {
 	case TEST_UNIT_READY:
 	case START_STOP_UNIT:
 	case SYNCHRONIZE_CACHE:
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 
 	case 0x85: /*ATA_16*/
 	case 0xA1: /*ATA_12*/
 	{
 		int error;
 		HPT_U8 prot;
 		PassthroughCmd *passthru;	
 		
 		if (mIsArray(vd->type)) {
 			ccb->ccb_h.status = CAM_REQ_INVALID;
 			break;
 		}
 		
 		HPT_ASSERT(vd->type == VD_RAW && vd->u.raw.legacy_disk);
 		
 		prot = (cdb[1] & 0x1e) >> 1;
 		
 		
 		if (prot < 3 || prot > 5) 
 		{
 			ccb->ccb_h.status = CAM_REQ_INVALID;
 			break;
 		}
 		
 		pCmd = ldm_alloc_cmds(vbus, vd->cmds_per_request);
 		if (!pCmd) {
 			HPT_ASSERT(0);
 			ccb->ccb_h.status = CAM_BUSY;
 			break;
 		}
 		
 		passthru = &pCmd->uCmd.Passthrough;
 		if (cdb[0] == 0x85/*ATA_16*/) {
 			if (cdb[1] & 0x1) {
 				passthru->bFeaturesReg =
 					((HPT_U16)cdb[3] << 8)
 						| cdb[4];
 				passthru->bSectorCountReg =
 					((HPT_U16)cdb[5] << 8) |
 						cdb[6];
 				passthru->bLbaLowReg =
 					((HPT_U16)cdb[7] << 8) |
 						cdb[8];
 				passthru->bLbaMidReg =
 					((HPT_U16)cdb[9] << 8) |
 						cdb[10];
 				passthru->bLbaHighReg =
 					((HPT_U16)cdb[11] << 8) |
 						cdb[12];
 			} else {
 				passthru->bFeaturesReg = cdb[4];
 				passthru->bSectorCountReg = cdb[6];
 				passthru->bLbaLowReg = cdb[8];
 				passthru->bLbaMidReg = cdb[10];
 				passthru->bLbaHighReg = cdb[12];
 			}
 			passthru->bDriveHeadReg = cdb[13];
 			passthru->bCommandReg = cdb[14];
 		
 		} else { /*ATA_12*/
 		
 			passthru->bFeaturesReg = cdb[3];
 			passthru->bSectorCountReg = cdb[4];
 			passthru->bLbaLowReg = cdb[5];
 			passthru->bLbaMidReg = cdb[6];
 			passthru->bLbaHighReg = cdb[7];
 			passthru->bDriveHeadReg = cdb[8];
 			passthru->bCommandReg = cdb[9];
 		}
 		
 		if (cdb[1] & 0xe0) {
 			
 		
 			if (!(passthru->bCommandReg == ATA_CMD_READ_MULTI ||
 				passthru->bCommandReg == ATA_CMD_READ_MULTI_EXT ||
 				passthru->bCommandReg == ATA_CMD_WRITE_MULTI ||
 				passthru->bCommandReg == ATA_CMD_WRITE_MULTI_EXT ||
 				passthru->bCommandReg == ATA_CMD_WRITE_MULTI_FUA_EXT)
 				) {
 				goto error;
 			}
 		}
 		
 		
 		if (passthru->bFeaturesReg == ATA_SET_FEATURES_XFER &&
 			passthru->bCommandReg == ATA_CMD_SET_FEATURES) {
 			goto error;
 		}
 
 		
 		passthru->nSectors = ccb->csio.dxfer_len/ATA_SECTOR_SIZE;
 		switch (prot) {
 			default: /*None data*/
 				break;
 			case 4: /*PIO data in, T_DIR=1 match check*/
 				if ((cdb[2] & 3) && 
 					(cdb[2] & 0x8) == 0)
 				{
 					OsPrint(("PIO data in, T_DIR=1 match check"));
 					goto error;
 				}
 				pCmd->flags.data_in = 1;
 						break;
 			case 5: /*PIO data out, T_DIR=0 match check*/
 				if ((cdb[2] & 3) && 
 					(cdb[2] & 0x8))
 				{
 					OsPrint(("PIO data out, T_DIR=0 match check"));
 					goto error;
 				}
 
 				pCmd->flags.data_out = 1;
 				break;
 		}
 		pCmd->type = CMD_TYPE_PASSTHROUGH;
 		pCmd->priv = ext = cmdext_get(vbus_ext);
 		HPT_ASSERT(ext);
 		ext->ccb = ccb;
 		pCmd->target = vd;
 		pCmd->done = os_cmddone;
 		pCmd->buildsgl = os_buildsgl;
 		pCmd->psg = ext->psg;
 
 		if(!ccb->csio.dxfer_len)
 		{
 			ldm_queue_cmd(pCmd);
 			return;
 		}
 		pCmd->flags.physical_sg = 1;
 		error = bus_dmamap_load_ccb(vbus_ext->io_dmat, 
 					ext->dma_map, ccb, 
 					hpt_io_dmamap_callback, pCmd,
 				    	BUS_DMA_WAITOK
 					);
 		KdPrint(("bus_dmamap_load return %d", error));
 		if (error && error!=EINPROGRESS) {
 			os_printk("bus_dmamap_load error %d", error);
 			cmdext_put(ext);
 			ldm_free_cmds(pCmd);
 			ccb->ccb_h.status = CAM_REQ_CMP_ERR;
 			xpt_done(ccb);
 		}
 		return;
 error:
 		ldm_free_cmds(pCmd);
 		ccb->ccb_h.status = CAM_REQ_INVALID;
 		break;
 	}
 
 	case INQUIRY:
 	{
 		PINQUIRYDATA inquiryData;
 		HIM_DEVICE_CONFIG devconf;
 		HPT_U8 *rbuf;
 
 		memset(ccb->csio.data_ptr, 0, ccb->csio.dxfer_len);
 		inquiryData = (PINQUIRYDATA)ccb->csio.data_ptr;
 
 		if (cdb[1] & 1) {
 			rbuf = (HPT_U8 *)inquiryData;
 			switch(cdb[2]) {
 			case 0:
 				rbuf[0] = 0;
 				rbuf[1] = 0;
 				rbuf[2] = 0;
 				rbuf[3] = 3;
 				rbuf[4] = 0;
 				rbuf[5] = 0x80;
 				rbuf[6] = 0x83;
 				ccb->ccb_h.status = CAM_REQ_CMP;
 				break;
 			case 0x80: {
 				rbuf[0] = 0;
 				rbuf[1] = 0x80;
 				rbuf[2] = 0;
 				if (vd->type == VD_RAW) {
 					rbuf[3] = 20;
 					vd->u.raw.him->get_device_config(vd->u.raw.phy_dev,&devconf);
 					memcpy(&rbuf[4], devconf.pIdentifyData->SerialNumber, 20);
 					ldm_ide_fixstring(&rbuf[4], 20);
 				} else {
 					rbuf[3] = 1;
 					rbuf[4] = 0x20;
 				}
 				ccb->ccb_h.status = CAM_REQ_CMP;				
 				break;
 			}
 			case 0x83:
 				rbuf[0] = 0;
 				rbuf[1] = 0x83;
 				rbuf[2] = 0;
 				rbuf[3] = 12; 
 				rbuf[4] = 1;
 				rbuf[5] = 2; 
 				rbuf[6] = 0;
 				rbuf[7] = 8; 
 				rbuf[8] = 0; 
 				rbuf[9] = 0x19;
 				rbuf[10] = 0x3C;
 				rbuf[11] = 0;
 				rbuf[12] = 0;
 				rbuf[13] = 0;
 				rbuf[14] = 0;
 				rbuf[15] = 0;
 				ccb->ccb_h.status = CAM_REQ_CMP;			
 				break;
 			default:
 				ccb->ccb_h.status = CAM_REQ_INVALID;
 				break;
 			}
 
 			break;
 		} 
 		else if (cdb[2]) {	
 			ccb->ccb_h.status = CAM_REQ_INVALID;
 			break;
 		}
 
 		inquiryData->DeviceType = 0; /*DIRECT_ACCESS_DEVICE*/
 		inquiryData->Versions = 5; /*SPC-3*/
 		inquiryData->ResponseDataFormat = 2;
 		inquiryData->AdditionalLength = 0x5b;
 		inquiryData->CommandQueue = 1;
 
 		if (ccb->csio.dxfer_len > 63) {
 			rbuf = (HPT_U8 *)inquiryData;			
 			rbuf[58] = 0x60;
 			rbuf[59] = 0x3;
 			
 			rbuf[64] = 0x3; 
 			rbuf[66] = 0x3; 
 			rbuf[67] = 0x20;
 			
 		}
 		
 		if (vd->type == VD_RAW) {
 			vd->u.raw.him->get_device_config(vd->u.raw.phy_dev,&devconf);
 
 			if ((devconf.pIdentifyData->GeneralConfiguration & 0x80))
 				inquiryData->RemovableMedia = 1;
 
 			
 			memcpy(&inquiryData->VendorId, "ATA     ", 8);
 			memcpy(&inquiryData->ProductId, devconf.pIdentifyData->ModelNumber, 16);
 			ldm_ide_fixstring((HPT_U8 *)&inquiryData->ProductId, 16);
 			memcpy(&inquiryData->ProductRevisionLevel, devconf.pIdentifyData->FirmwareRevision, 4);
 			ldm_ide_fixstring((HPT_U8 *)&inquiryData->ProductRevisionLevel, 4);
 			if (inquiryData->ProductRevisionLevel[0] == 0 || inquiryData->ProductRevisionLevel[0] == ' ')
 				memcpy(&inquiryData->ProductRevisionLevel, "n/a ", 4);
 		} else {
 			memcpy(&inquiryData->VendorId, "HPT     ", 8);
 			snprintf((char *)&inquiryData->ProductId, 16, "DISK_%d_%d        ",
 				os_get_vbus_seq(vbus_ext), vd->target_id);
 			inquiryData->ProductId[15] = ' ';
 			memcpy(&inquiryData->ProductRevisionLevel, "4.00", 4);
 		}
 
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 	}
 	case READ_CAPACITY:
 	{
 		HPT_U8 *rbuf = ccb->csio.data_ptr;
 		HPT_U32 cap;
 		HPT_U8 sector_size_shift = 0;
 		HPT_U64 new_cap;
 		HPT_U32 sector_size = 0;
 
 		if (mIsArray(vd->type))
 			sector_size_shift = vd->u.array.sector_size_shift;
 		else{
 			if(vd->type == VD_RAW){
 				sector_size = vd->u.raw.logical_sector_size;
 			}
 		
 			switch (sector_size) {
 				case 0x1000:
 					KdPrint(("set 4k setctor size in READ_CAPACITY"));
 					sector_size_shift = 3;
 					break;
 				default:
 					break;
 			}			
 		}
 		new_cap = vd->capacity >> sector_size_shift;
 		
 		if (new_cap > 0xfffffffful)
 			cap = 0xffffffff;
 		else
 			cap = new_cap - 1;
 			
 		rbuf[0] = (HPT_U8)(cap>>24);
 		rbuf[1] = (HPT_U8)(cap>>16);
 		rbuf[2] = (HPT_U8)(cap>>8);
 		rbuf[3] = (HPT_U8)cap;
 		rbuf[4] = 0;
 		rbuf[5] = 0;
 		rbuf[6] = 2 << sector_size_shift;
 		rbuf[7] = 0;
 
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 	}
 	
 	case REPORT_LUNS:
 	{
 		HPT_U8 *rbuf = ccb->csio.data_ptr;
 		memset(rbuf, 0, 16);
 		rbuf[3] = 8;
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;				
 	}
 	case SERVICE_ACTION_IN: 
 	{
 		HPT_U8 *rbuf = ccb->csio.data_ptr;
 		HPT_U64	cap = 0;
 		HPT_U8 sector_size_shift = 0;
 		HPT_U32 sector_size = 0;
 
 		if(mIsArray(vd->type))
 			sector_size_shift = vd->u.array.sector_size_shift;
 		else{
 			if(vd->type == VD_RAW){
 				sector_size = vd->u.raw.logical_sector_size;
 			}
 		
 			switch (sector_size) {
 				case 0x1000:
 					KdPrint(("set 4k setctor size in SERVICE_ACTION_IN"));
 					sector_size_shift = 3;
 					break;
 				default:
 					break;
 			}			
 		}
 		cap = (vd->capacity >> sector_size_shift) - 1;
 					
 		rbuf[0] = (HPT_U8)(cap>>56);
 		rbuf[1] = (HPT_U8)(cap>>48);
 		rbuf[2] = (HPT_U8)(cap>>40);
 		rbuf[3] = (HPT_U8)(cap>>32);
 		rbuf[4] = (HPT_U8)(cap>>24);
 		rbuf[5] = (HPT_U8)(cap>>16);
 		rbuf[6] = (HPT_U8)(cap>>8);
 		rbuf[7] = (HPT_U8)cap;
 		rbuf[8] = 0;
 		rbuf[9] = 0;
 		rbuf[10] = 2 << sector_size_shift;
 		rbuf[11] = 0;
 		
 		if(!mIsArray(vd->type)){
 			rbuf[13] = vd->u.raw.logicalsectors_per_physicalsector;
 			rbuf[14] = (HPT_U8)((vd->u.raw.lowest_aligned >> 8) & 0x3f);
 			rbuf[15] = (HPT_U8)(vd->u.raw.lowest_aligned);
 		}
 		
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;	
 	}
 	
 	case READ_6:
 	case READ_10:
 	case READ_16:
 	case WRITE_6:
 	case WRITE_10:
 	case WRITE_16:
 	case 0x13:
 	case 0x2f:
 	case 0x8f: /* VERIFY_16 */
 	{
 		int error;
 		HPT_U8 sector_size_shift = 0;
 		HPT_U32 sector_size = 0;
 		pCmd = ldm_alloc_cmds(vbus, vd->cmds_per_request);
 		if(!pCmd){
 			KdPrint(("Failed to allocate command!"));
 			ccb->ccb_h.status = CAM_BUSY;
 			break;
 		}
 
 		switch (cdb[0])	{
 		case READ_6:
 		case WRITE_6:
 		case 0x13:
 			pCmd->uCmd.Ide.Lba =  ((HPT_U32)cdb[1] << 16) | ((HPT_U32)cdb[2] << 8) | (HPT_U32)cdb[3];
 			pCmd->uCmd.Ide.nSectors = (HPT_U16) cdb[4];
 			break;
 		case READ_16:
 		case WRITE_16:
 		case 0x8f: /* VERIFY_16 */
 		{
 			HPT_U64 block =
 				((HPT_U64)cdb[2]<<56) |
 				((HPT_U64)cdb[3]<<48) |
 				((HPT_U64)cdb[4]<<40) |
 				((HPT_U64)cdb[5]<<32) |
 				((HPT_U64)cdb[6]<<24) |
 				((HPT_U64)cdb[7]<<16) |
 				((HPT_U64)cdb[8]<<8) |
 				((HPT_U64)cdb[9]);
 			pCmd->uCmd.Ide.Lba = block;
 			pCmd->uCmd.Ide.nSectors = (HPT_U16)cdb[13] | ((HPT_U16)cdb[12]<<8);
 			break;
 		}
 		
 		default:
 			pCmd->uCmd.Ide.Lba = (HPT_U32)cdb[5] | ((HPT_U32)cdb[4] << 8) | ((HPT_U32)cdb[3] << 16) | ((HPT_U32)cdb[2] << 24);
 			pCmd->uCmd.Ide.nSectors = (HPT_U16) cdb[8] | ((HPT_U16)cdb[7]<<8);
 			break;
 		}
 
 		if(mIsArray(vd->type)) {
 			sector_size_shift = vd->u.array.sector_size_shift;
 		}
 		else{
 			if(vd->type == VD_RAW){
 				sector_size = vd->u.raw.logical_sector_size;
 			}
 	  		
 			switch (sector_size) {
 				case 0x1000:
 					KdPrint(("<8>resize sector size from 4k to 512"));
 					sector_size_shift = 3;
 					break;
 				default:
 					break;
 	 		}			
 		}
 		pCmd->uCmd.Ide.Lba <<= sector_size_shift;
 		pCmd->uCmd.Ide.nSectors <<= sector_size_shift;
 
 		
 		switch (cdb[0]) {
 		case READ_6:
 		case READ_10:
 		case READ_16:
 			pCmd->flags.data_in = 1;
 			break;
 		case WRITE_6:
 		case WRITE_10:
 		case WRITE_16:
 			pCmd->flags.data_out = 1;
 			break;
 		}
 		pCmd->priv = ext = cmdext_get(vbus_ext);
 		HPT_ASSERT(ext);
 		ext->ccb = ccb;
 		pCmd->target = vd;
 		pCmd->done = os_cmddone;
 		pCmd->buildsgl = os_buildsgl;
 		pCmd->psg = ext->psg;
 		pCmd->flags.physical_sg = 1;
 		error = bus_dmamap_load_ccb(vbus_ext->io_dmat, 
 					ext->dma_map, ccb, 
 					hpt_io_dmamap_callback, pCmd,
 				    	BUS_DMA_WAITOK
 					);
 		KdPrint(("bus_dmamap_load return %d", error));
 		if (error && error!=EINPROGRESS) {
 			os_printk("bus_dmamap_load error %d", error);
 			cmdext_put(ext);
 			ldm_free_cmds(pCmd);
 			ccb->ccb_h.status = CAM_REQ_CMP_ERR;
 			xpt_done(ccb);
 		}
 		return;
 	}
 
 	default:
 		ccb->ccb_h.status = CAM_REQ_INVALID;
 		break;
 	}
 
 	xpt_done(ccb);
 	return;
 }
 
 static void hpt_action(struct cam_sim *sim, union ccb *ccb)
 {
 	PVBUS_EXT vbus_ext = (PVBUS_EXT)cam_sim_softc(sim);
 
 	KdPrint(("hpt_action(fn=%d, id=%d)", ccb->ccb_h.func_code, ccb->ccb_h.target_id));
 
 	hpt_assert_vbus_locked(vbus_ext);
 	switch (ccb->ccb_h.func_code) {
 	
 	case XPT_SCSI_IO:
 		hpt_scsi_io(vbus_ext, ccb);
 		return;
 
 	case XPT_RESET_BUS:
 		ldm_reset_vbus((PVBUS)vbus_ext->vbus);
 		break;
 
 	case XPT_GET_TRAN_SETTINGS:
 	case XPT_SET_TRAN_SETTINGS:
 		ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
 		break;
 
 	case XPT_CALC_GEOMETRY:
 		ccb->ccg.heads = 255;
 		ccb->ccg.secs_per_track = 63;
 		ccb->ccg.cylinders = ccb->ccg.volume_size / (ccb->ccg.heads * ccb->ccg.secs_per_track);
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 
 	case XPT_PATH_INQ:
 	{
 		struct ccb_pathinq *cpi = &ccb->cpi;
 
 		cpi->version_num = 1;
 		cpi->hba_inquiry = PI_SDTR_ABLE;
 		cpi->target_sprt = 0;
 		cpi->hba_misc = PIM_NOBUSRESET;
 		cpi->hba_eng_cnt = 0;
 		cpi->max_target = osm_max_targets;
 		cpi->max_lun = 0;
 		cpi->unit_number = cam_sim_unit(sim);
 		cpi->bus_id = cam_sim_bus(sim);
 		cpi->initiator_id = osm_max_targets;
 		cpi->base_transfer_speed = 3300;
 
 		strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
 		strlcpy(cpi->hba_vid, "HPT   ", HBA_IDLEN);
 		strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
 		cpi->transport = XPORT_SPI;
 		cpi->transport_version = 2;
 		cpi->protocol = PROTO_SCSI;
 		cpi->protocol_version = SCSI_REV_2;
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		break;
 	}
 
 	default:
 		ccb->ccb_h.status = CAM_REQ_INVALID;
 		break;
 	}
 
 	xpt_done(ccb);
 	return;
 }
 
 static void hpt_pci_intr(void *arg)
 {	
 	PVBUS_EXT vbus_ext = (PVBUS_EXT)arg;
 	hpt_lock_vbus(vbus_ext);
 	ldm_intr((PVBUS)vbus_ext->vbus);
 	hpt_unlock_vbus(vbus_ext);
 }
 
 static void hpt_poll(struct cam_sim *sim)
 {
 	PVBUS_EXT vbus_ext = cam_sim_softc(sim);
 	hpt_assert_vbus_locked(vbus_ext);
 	ldm_intr((PVBUS)vbus_ext->vbus);
 }
 
 static void hpt_async(void * callback_arg, u_int32_t code, struct cam_path * path, void * arg)
 {
 	KdPrint(("hpt_async"));
 }
 
 static int hpt_shutdown(device_t dev)
 {
 	KdPrint(("hpt_shutdown(dev=%p)", dev));
 	return 0;
 }
 
 static int hpt_detach(device_t dev)
 {
 	/* we don't allow the driver to be unloaded. */
 	return EBUSY;
 }
 
 static void hpt_ioctl_done(struct _IOCTL_ARG *arg)
 {
 	arg->ioctl_cmnd = 0;
 	wakeup(arg);
 }
 
 static void __hpt_do_ioctl(PVBUS_EXT vbus_ext, IOCTL_ARG *ioctl_args)
 {
 	ioctl_args->result = -1;
 	ioctl_args->done = hpt_ioctl_done;
 	ioctl_args->ioctl_cmnd = (void *)1;
 
 	hpt_lock_vbus(vbus_ext);
 	ldm_ioctl((PVBUS)vbus_ext->vbus, ioctl_args);
 
 	while (ioctl_args->ioctl_cmnd) {
 		if (hpt_sleep(vbus_ext, ioctl_args, PPAUSE, "hptctl", HPT_OSM_TIMEOUT)==0)
 			break;
 		ldm_reset_vbus((PVBUS)vbus_ext->vbus);
 		__hpt_do_tasks(vbus_ext);
 	}
 
 	/* KdPrint(("ioctl %x result %d", ioctl_args->dwIoControlCode, ioctl_args->result)); */
 
 	hpt_unlock_vbus(vbus_ext);
 }
 
 static void hpt_do_ioctl(IOCTL_ARG *ioctl_args)
 {
 	PVBUS vbus;
 	PVBUS_EXT vbus_ext;
 	
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		__hpt_do_ioctl(vbus_ext, ioctl_args);
 		if (ioctl_args->result!=HPT_IOCTL_RESULT_WRONG_VBUS)
 			return;
 	}
 }
 
 #define HPT_DO_IOCTL(code, inbuf, insize, outbuf, outsize) ({\
 	IOCTL_ARG arg;\
 	arg.dwIoControlCode = code;\
 	arg.lpInBuffer = inbuf;\
 	arg.lpOutBuffer = outbuf;\
 	arg.nInBufferSize = insize;\
 	arg.nOutBufferSize = outsize;\
 	arg.lpBytesReturned = 0;\
 	hpt_do_ioctl(&arg);\
 	arg.result;\
 })
 
 #define DEVICEID_VALID(id) ((id) && ((HPT_U32)(id)!=0xffffffff))
 
 static int hpt_get_logical_devices(DEVICEID * pIds, int nMaxCount)
 {
 	int i;
 	HPT_U32 count = nMaxCount-1;
 	
 	if (HPT_DO_IOCTL(HPT_IOCTL_GET_LOGICAL_DEVICES,
 			&count, sizeof(HPT_U32), pIds, sizeof(DEVICEID)*nMaxCount))
 		return -1;
 
 	nMaxCount = (int)pIds[0];
 	for (i=0; i<nMaxCount; i++) pIds[i] = pIds[i+1];
 	return nMaxCount;
 }
 
 static int hpt_get_device_info_v3(DEVICEID id, PLOGICAL_DEVICE_INFO_V3 pInfo)
 {
 	return HPT_DO_IOCTL(HPT_IOCTL_GET_DEVICE_INFO_V3,
 				&id, sizeof(DEVICEID), pInfo, sizeof(LOGICAL_DEVICE_INFO_V3));
 }
 
 /* not belong to this file logically, but we want to use ioctl interface */
 static int __hpt_stop_tasks(PVBUS_EXT vbus_ext, DEVICEID id)
 {
 	LOGICAL_DEVICE_INFO_V3 devinfo;
 	int i, result;
 	DEVICEID param[2] = { id, 0 };
 	
 	if (hpt_get_device_info_v3(id, &devinfo))
 		return -1;
 		
 	if (devinfo.Type!=LDT_ARRAY)
 		return -1;
 		
 	if (devinfo.u.array.Flags & ARRAY_FLAG_REBUILDING)
 		param[1] = AS_REBUILD_ABORT;
 	else if (devinfo.u.array.Flags & ARRAY_FLAG_VERIFYING)
 		param[1] = AS_VERIFY_ABORT;
 	else if (devinfo.u.array.Flags & ARRAY_FLAG_INITIALIZING)
 		param[1] = AS_INITIALIZE_ABORT;
 	else if (devinfo.u.array.Flags & ARRAY_FLAG_TRANSFORMING)
 		param[1] = AS_TRANSFORM_ABORT;
 	else
 		return -1;
 
 	KdPrint(("SET_ARRAY_STATE(%x, %d)", param[0], param[1]));
 	result = HPT_DO_IOCTL(HPT_IOCTL_SET_ARRAY_STATE,
 				param, sizeof(param), 0, 0);
 				
 	for (i=0; i<devinfo.u.array.nDisk; i++)
 		if (DEVICEID_VALID(devinfo.u.array.Members[i]))
 			__hpt_stop_tasks(vbus_ext, devinfo.u.array.Members[i]);
 			
 	return result;
 }
 
 static void hpt_stop_tasks(PVBUS_EXT vbus_ext)
 {
 	DEVICEID ids[32];
 	int i, count;
 
 	count = hpt_get_logical_devices((DEVICEID *)&ids, sizeof(ids)/sizeof(ids[0]));
 	
 	for (i=0; i<count; i++)
 		__hpt_stop_tasks(vbus_ext, ids[i]);
 }
 
 static	d_open_t	hpt_open;
 static	d_close_t	hpt_close;
 static	d_ioctl_t	hpt_ioctl;
 static  int 		hpt_rescan_bus(void);
 
 static struct cdevsw hpt_cdevsw = {
 	.d_open =	hpt_open,
 	.d_close =	hpt_close,
 	.d_ioctl =	hpt_ioctl,
 	.d_name =	driver_name,
 	.d_version =	D_VERSION,
 };
 
 static struct intr_config_hook hpt_ich;
 
 /*
  * hpt_final_init will be called after all hpt_attach.
  */
 static void hpt_final_init(void *dummy)
 {
 	int       i,unit_number=0;
 	PVBUS_EXT vbus_ext;
 	PVBUS vbus;
 	PHBA hba;
 
 	/* Clear the config hook */
 	config_intrhook_disestablish(&hpt_ich);
 
 	/* allocate memory */
 	i = 0;
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		if (hpt_alloc_mem(vbus_ext)) {
 			os_printk("out of memory");
 			return;
 		}
 		i++;
 	}
 
 	if (!i) {
 		if (bootverbose)
 			os_printk("no controller detected.");
 		return;
 	}
 
 	/* initializing hardware */
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		/* make timer available here */
 		mtx_init(&vbus_ext->lock, "hptsleeplock", NULL, MTX_DEF);
 		callout_init_mtx(&vbus_ext->timer, &vbus_ext->lock, 0);
 		if (hpt_init_vbus(vbus_ext)) {
 			os_printk("fail to initialize hardware");
 			break; /* FIXME */
 		}
 	}
 
 	/* register CAM interface */
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		struct cam_devq *devq;
 		struct ccb_setasync	ccb;
 		
 		if (bus_dma_tag_create(NULL,/* parent */
 				4,	/* alignment */
 				BUS_SPACE_MAXADDR_32BIT+1, /* boundary */
 				BUS_SPACE_MAXADDR,	/* lowaddr */
 				BUS_SPACE_MAXADDR, 	/* highaddr */
 				NULL, NULL, 		/* filter, filterarg */
 				PAGE_SIZE * (os_max_sg_descriptors-1),	/* maxsize */
 				os_max_sg_descriptors,	/* nsegments */
 				0x10000,	/* maxsegsize */
 				BUS_DMA_WAITOK,		/* flags */
 				busdma_lock_mutex,	/* lockfunc */
 				&vbus_ext->lock,		/* lockfuncarg */
 				&vbus_ext->io_dmat	/* tag */))
 		{
 			return ;
 		}
 
 		for (i=0; i<os_max_queue_comm; i++) {
 			POS_CMDEXT ext = (POS_CMDEXT)malloc(sizeof(OS_CMDEXT), M_DEVBUF, M_WAITOK);
 			if (!ext) {
 				os_printk("Can't alloc cmdext(%d)", i);
 				return ;
 			}
 			ext->vbus_ext = vbus_ext;
 			ext->next = vbus_ext->cmdext_list;
 			vbus_ext->cmdext_list = ext;
 	
 			if (bus_dmamap_create(vbus_ext->io_dmat, 0, &ext->dma_map)) {
 				os_printk("Can't create dma map(%d)", i);
 				return ;
 			}
 			callout_init_mtx(&ext->timeout, &vbus_ext->lock, 0);
 		}
 
 		if ((devq = cam_simq_alloc(os_max_queue_comm)) == NULL) {
 			os_printk("cam_simq_alloc failed");
 			return ;
 		}
 
 		hpt_lock_vbus(vbus_ext);
 		vbus_ext->sim = cam_sim_alloc(hpt_action, hpt_poll, driver_name,
 				vbus_ext, unit_number, &vbus_ext->lock,
 				os_max_queue_comm, /*tagged*/8,  devq);
 		unit_number++;
 		if (!vbus_ext->sim) {
 			os_printk("cam_sim_alloc failed");
 			cam_simq_free(devq);
 			hpt_unlock_vbus(vbus_ext);
 			return ;
 		}
 
 		if (xpt_bus_register(vbus_ext->sim, NULL, 0) != CAM_SUCCESS) {
 			os_printk("xpt_bus_register failed");
 			cam_sim_free(vbus_ext->sim, /*free devq*/ TRUE);
 			vbus_ext->sim = NULL;
 			return ;
 		}
 	
 		if (xpt_create_path(&vbus_ext->path, /*periph */ NULL,
 				cam_sim_path(vbus_ext->sim), CAM_TARGET_WILDCARD,
 				CAM_LUN_WILDCARD) != CAM_REQ_CMP)
 		{
 			os_printk("xpt_create_path failed");
 			xpt_bus_deregister(cam_sim_path(vbus_ext->sim));
 			cam_sim_free(vbus_ext->sim, /*free_devq*/TRUE);
 			hpt_unlock_vbus(vbus_ext);
 			vbus_ext->sim = NULL;
 			return ;
 		}
 		hpt_unlock_vbus(vbus_ext);
 
 		memset(&ccb, 0, sizeof(ccb));
 		xpt_setup_ccb(&ccb.ccb_h, vbus_ext->path, /*priority*/5);
 		ccb.ccb_h.func_code = XPT_SASYNC_CB;
 		ccb.event_enable = AC_LOST_DEVICE;
 		ccb.callback = hpt_async;
 		ccb.callback_arg = vbus_ext;
 		xpt_action((union ccb *)&ccb);
 
 		for (hba = vbus_ext->hba_list; hba; hba = hba->next) {
 			int rid = 0;
 			if ((hba->irq_res = bus_alloc_resource_any(hba->pcidev,
 				SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL)
 			{
 				os_printk("can't allocate interrupt");
 				return ;
 			}
 			
 			if (bus_setup_intr(hba->pcidev, hba->irq_res, INTR_TYPE_CAM | INTR_MPSAFE,
 				NULL, hpt_pci_intr, vbus_ext, &hba->irq_handle)) 
 			{
 				os_printk("can't set up interrupt");
 				return ;
 			}
 			hba->ldm_adapter.him->intr_control(hba->ldm_adapter.him_handle, HPT_TRUE);
 
 		}
 
 		vbus_ext->shutdown_eh = EVENTHANDLER_REGISTER(shutdown_final, 
 									hpt_shutdown_vbus, vbus_ext, SHUTDOWN_PRI_DEFAULT);
 		if (!vbus_ext->shutdown_eh)
 			os_printk("Shutdown event registration failed");
 	}
 	
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		TASK_INIT(&vbus_ext->worker, 0, (task_fn_t *)hpt_do_tasks, vbus_ext);
 		if (vbus_ext->tasks)
 			TASK_ENQUEUE(&vbus_ext->worker);
 	}	
 
 	make_dev(&hpt_cdevsw, DRIVER_MINOR, UID_ROOT, GID_OPERATOR,
 	    S_IRUSR | S_IWUSR, "%s", driver_name);
 }
 
 #if defined(KLD_MODULE)
 
 typedef struct driverlink *driverlink_t;
 struct driverlink {
 	kobj_class_t	driver;
 	TAILQ_ENTRY(driverlink) link;	/* list of drivers in devclass */
 };
 
 typedef TAILQ_HEAD(driver_list, driverlink) driver_list_t;
 
 struct devclass {
 	TAILQ_ENTRY(devclass) link;
 	devclass_t	parent;		/* parent in devclass hierarchy */
 	driver_list_t	drivers;     /* bus devclasses store drivers for bus */
 	char		*name;
 	device_t	*devices;	/* array of devices indexed by unit */
 	int		maxunit;	/* size of devices array */
 };
 
 static void override_kernel_driver(void)
 {
 	driverlink_t dl, dlfirst;
 	driver_t *tmpdriver;
 	devclass_t dc = devclass_find("pci");
 	
 	if (dc){
 		dlfirst = TAILQ_FIRST(&dc->drivers);
 		for (dl = dlfirst; dl; dl = TAILQ_NEXT(dl, link)) {
 			if(strcmp(dl->driver->name, driver_name) == 0) {
 				tmpdriver=dl->driver;
 				dl->driver=dlfirst->driver;
 				dlfirst->driver=tmpdriver;
 				break;
 			}
 		}
 	}
 }
 
 #else 
 #define override_kernel_driver()
 #endif
 
 static void hpt_init(void *dummy)
 {
 	if (bootverbose)
 		os_printk("%s %s", driver_name_long, driver_ver);
 
 	override_kernel_driver();
 	init_config();
 
 	hpt_ich.ich_func = hpt_final_init;
 	hpt_ich.ich_arg = NULL;
 	if (config_intrhook_establish(&hpt_ich) != 0) {
 		printf("%s: cannot establish configuration hook\n",
 		    driver_name_long);
 	}
 
 }
 SYSINIT(hptinit, SI_SUB_CONFIGURE, SI_ORDER_FIRST, hpt_init, NULL);
 
 /*
  * CAM driver interface
  */
 static device_method_t driver_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		hpt_probe),
 	DEVMETHOD(device_attach,	hpt_attach),
 	DEVMETHOD(device_detach,	hpt_detach),
 	DEVMETHOD(device_shutdown,	hpt_shutdown),
 	{ 0, 0 }
 };
 
 static driver_t hpt_pci_driver = {
 	driver_name,
 	driver_methods,
 	sizeof(HBA)
 };
 
 #ifndef TARGETNAME
 #error "no TARGETNAME found"
 #endif
 
 /* use this to make TARGETNAME be expanded */
 #define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5)
 #define __MODULE_VERSION(p1, p2) MODULE_VERSION(p1, p2)
 #define __MODULE_DEPEND(p1, p2, p3, p4, p5) MODULE_DEPEND(p1, p2, p3, p4, p5)
 __DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, 0, 0);
 __MODULE_VERSION(TARGETNAME, 1);
 __MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
 
 static int hpt_open(struct cdev *dev, int flags, int devtype, struct thread *td)
 {
 	return 0;
 }
 
 static int hpt_close(struct cdev *dev, int flags, int devtype, struct thread *td)
 {
 	return 0;
 }
 
 static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread *td)
 {
 	PHPT_IOCTL_PARAM piop=(PHPT_IOCTL_PARAM)data;
 	IOCTL_ARG ioctl_args;
 	HPT_U32 bytesReturned = 0;
 
 	switch (cmd){
 	case HPT_DO_IOCONTROL:
 	{	
 		if (piop->Magic == HPT_IOCTL_MAGIC || piop->Magic == HPT_IOCTL_MAGIC32) {
 			KdPrint(("ioctl=%x in=%p len=%d out=%p len=%d\n",
 				piop->dwIoControlCode,
 				piop->lpInBuffer,
 				piop->nInBufferSize,
 				piop->lpOutBuffer,
 				piop->nOutBufferSize));
 			
 		memset(&ioctl_args, 0, sizeof(ioctl_args));
 		
 		ioctl_args.dwIoControlCode = piop->dwIoControlCode;
 		ioctl_args.nInBufferSize = piop->nInBufferSize;
 		ioctl_args.nOutBufferSize = piop->nOutBufferSize;
 		ioctl_args.lpBytesReturned = &bytesReturned;
 
 		if (ioctl_args.nInBufferSize) {
 			ioctl_args.lpInBuffer = malloc(ioctl_args.nInBufferSize, M_DEVBUF, M_WAITOK);
 			if (!ioctl_args.lpInBuffer)
 				goto invalid;
 			if (copyin((void*)piop->lpInBuffer,
 					ioctl_args.lpInBuffer, piop->nInBufferSize))
 				goto invalid;
 		}
 	
 		if (ioctl_args.nOutBufferSize) {
 			ioctl_args.lpOutBuffer = malloc(ioctl_args.nOutBufferSize, M_DEVBUF, M_WAITOK | M_ZERO);
 			if (!ioctl_args.lpOutBuffer)
 				goto invalid;
 		}
 		
 		hpt_do_ioctl(&ioctl_args);
 	
 		if (ioctl_args.result==HPT_IOCTL_RESULT_OK) {
 			if (piop->nOutBufferSize) {
 				if (copyout(ioctl_args.lpOutBuffer,
 					(void*)piop->lpOutBuffer, piop->nOutBufferSize))
 					goto invalid;
 			}
 			if (piop->lpBytesReturned) {
 				if (copyout(&bytesReturned,
 					(void*)piop->lpBytesReturned, sizeof(HPT_U32)))
 					goto invalid;
 			}
 			if (ioctl_args.lpInBuffer) free(ioctl_args.lpInBuffer, M_DEVBUF);
 			if (ioctl_args.lpOutBuffer) free(ioctl_args.lpOutBuffer, M_DEVBUF);
 			return 0;
 		}
 invalid:
 		if (ioctl_args.lpInBuffer) free(ioctl_args.lpInBuffer, M_DEVBUF);
 		if (ioctl_args.lpOutBuffer) free(ioctl_args.lpOutBuffer, M_DEVBUF);
 		return EFAULT;
 	}
 	return EFAULT;
 	}
 
 	case HPT_SCAN_BUS:
 	{
 		return hpt_rescan_bus();
 	}
 	default:
 		KdPrint(("invalid command!"));
 		return EFAULT;
 	}	
 
 }
 
 static int	hpt_rescan_bus(void)
 {
 	union ccb			*ccb;
 	PVBUS 				vbus;
 	PVBUS_EXT			vbus_ext;	
 		
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		if ((ccb = xpt_alloc_ccb()) == NULL)
 		{
 			return(ENOMEM);
 		}
 		if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(vbus_ext->sim),
 			CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP)	
 		{
 			xpt_free_ccb(ccb);
 			return(EIO);
 		}
 		xpt_rescan(ccb);
 	}
 	return(0);	
 }
diff --git a/sys/dev/hptrr/hptrr_osm_bsd.c b/sys/dev/hptrr/hptrr_osm_bsd.c
index 4208dd620e37..68e9af3aff02 100644
--- a/sys/dev/hptrr/hptrr_osm_bsd.c
+++ b/sys/dev/hptrr/hptrr_osm_bsd.c
@@ -1,1323 +1,1323 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) HighPoint Technologies, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 #include <dev/hptrr/hptrr_config.h>
 /* $Id: osm_bsd.c,v 1.27 2007/11/22 07:35:49 gmm Exp $
  *
  * HighPoint RAID Driver for FreeBSD
  * Copyright (C) 2005 HighPoint Technologies, Inc. All Rights Reserved.
  */
 #include <dev/hptrr/os_bsd.h>
 #include <dev/hptrr/hptintf.h>
 
 static int attach_generic = 0;
 TUNABLE_INT("hw.hptrr.attach_generic", &attach_generic);
 
 static HIM *hpt_match(device_t dev)
 {
 	PCI_ID pci_id;
 	int i;
 	HIM *him;
 
 	/* Some of supported chips are used not only by HPT. */
 	if (pci_get_vendor(dev) != 0x1103 && !attach_generic)
 		return (NULL);
 	for (him = him_list; him; him = him->next) {
 		for (i=0; him->get_supported_device_id(i, &pci_id); i++) {
 			if ((pci_get_vendor(dev) == pci_id.vid) &&
 				(pci_get_device(dev) == pci_id.did)){
 				return (him);
 			}
 		}
 	}
 	return (NULL);
 }
 
 static int hpt_probe(device_t dev)
 {
 	HIM *him;
 
 	him = hpt_match(dev);
 	if (him != NULL) {
 		KdPrint(("hpt_probe: adapter at PCI %d:%d:%d, IRQ %d",
 			pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev), pci_get_irq(dev)
 			    ));
 		device_set_desc(dev, him->name);
 		return (BUS_PROBE_DEFAULT);
 	}
 
 	return (ENXIO);
 }
 
 static int hpt_attach(device_t dev)
 {
 	PHBA hba = (PHBA)device_get_softc(dev);
 	HIM *him;
 	PCI_ID pci_id;
 	HPT_UINT size;
 	PVBUS vbus;
 	PVBUS_EXT vbus_ext;
 	
 	KdPrint(("hpt_attach(%d/%d/%d)", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev)));
 
 	him = hpt_match(dev);
 	hba->ext_type = EXT_TYPE_HBA;
 	hba->ldm_adapter.him = him;
 
 	pci_enable_busmaster(dev);
 
 	pci_id.vid = pci_get_vendor(dev);
 	pci_id.did = pci_get_device(dev);
 	pci_id.rev = pci_get_revid(dev);
 
 	size = him->get_adapter_size(&pci_id);
 	hba->ldm_adapter.him_handle = malloc(size, M_DEVBUF, M_WAITOK);
 
 	hba->pcidev = dev;
 	hba->pciaddr.tree = 0;
 	hba->pciaddr.bus = pci_get_bus(dev);
 	hba->pciaddr.device = pci_get_slot(dev);
 	hba->pciaddr.function = pci_get_function(dev);
 
 	if (!him->create_adapter(&pci_id, hba->pciaddr, hba->ldm_adapter.him_handle, hba)) {
 		free(hba->ldm_adapter.him_handle, M_DEVBUF);
 		return ENXIO;
 	}
 
 	os_printk("adapter at PCI %d:%d:%d, IRQ %d",
 		hba->pciaddr.bus, hba->pciaddr.device, hba->pciaddr.function, pci_get_irq(dev));
 
 	if (!ldm_register_adapter(&hba->ldm_adapter)) {
 		size = ldm_get_vbus_size();
 		vbus_ext = malloc(sizeof(VBUS_EXT) + size, M_DEVBUF, M_WAITOK |
 		    M_ZERO);
 		vbus_ext->ext_type = EXT_TYPE_VBUS;
 		ldm_create_vbus((PVBUS)vbus_ext->vbus, vbus_ext);
 		ldm_register_adapter(&hba->ldm_adapter);
 	}
 
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		if (hba->ldm_adapter.vbus==vbus) {
 			hba->vbus_ext = vbus_ext;
 			hba->next = vbus_ext->hba_list;
 			vbus_ext->hba_list = hba;
 			break;
 		}
 	}	
 	return 0;
 }
 
 /*
  * Maybe we'd better to use the bus_dmamem_alloc to alloc DMA memory,
  * but there are some problems currently (alignment, etc).
  */
 static __inline void *__get_free_pages(int order)
 {
 	/* don't use low memory - other devices may get starved */
 	return contigmalloc(PAGE_SIZE<<order, 
 			M_DEVBUF, M_WAITOK, BUS_SPACE_MAXADDR_24BIT, BUS_SPACE_MAXADDR, PAGE_SIZE, 0);
 }
 
-static __inline void free_pages(void *p, int order)
+static __inline void free_pages(void *p)
 {
-	contigfree(p, PAGE_SIZE<<order, M_DEVBUF);
+	free(p, M_DEVBUF);
 }
 
 static int hpt_alloc_mem(PVBUS_EXT vbus_ext)
 {
 	PHBA hba;
 	struct freelist *f;
 	HPT_UINT i;
 	void **p;
 
 	for (hba = vbus_ext->hba_list; hba; hba = hba->next)
 		hba->ldm_adapter.him->get_meminfo(hba->ldm_adapter.him_handle);
 
 	ldm_get_mem_info((PVBUS)vbus_ext->vbus, 0);
 
 	for (f=vbus_ext->freelist_head; f; f=f->next) {
 		KdPrint(("%s: %d*%d=%d bytes",
 			f->tag, f->count, f->size, f->count*f->size));
 		for (i=0; i<f->count; i++) {
 			p = (void **)malloc(f->size, M_DEVBUF, M_WAITOK);
 			if (!p)	return (ENXIO);
 			*p = f->head;
 			f->head = p;
 		}
 	}
 
 	for (f=vbus_ext->freelist_dma_head; f; f=f->next) {
 		int order, size, j;
 
 		HPT_ASSERT((f->size & (f->alignment-1))==0);
 
 		for (order=0, size=PAGE_SIZE; size<f->size; order++, size<<=1)
 			;
 
 		KdPrint(("%s: %d*%d=%d bytes, order %d",
 			f->tag, f->count, f->size, f->count*f->size, order));
 		HPT_ASSERT(f->alignment<=PAGE_SIZE);
 
 		for (i=0; i<f->count;) {
 			p = (void **)__get_free_pages(order);
 			if (!p) return -1;
 			for (j = size/f->size; j && i<f->count; i++,j--) {
 				*p = f->head;
 				*(BUS_ADDRESS *)(p+1) = (BUS_ADDRESS)vtophys(p);
 				f->head = p;
 				p = (void **)((unsigned long)p + f->size);
 			}
 		}
 	}
 	
 	HPT_ASSERT(PAGE_SIZE==DMAPOOL_PAGE_SIZE);
 
 	for (i=0; i<os_max_cache_pages; i++) {
 		p = (void **)__get_free_pages(0);
 		if (!p) return -1;
 		HPT_ASSERT(((HPT_UPTR)p & (DMAPOOL_PAGE_SIZE-1))==0);
 		dmapool_put_page((PVBUS)vbus_ext->vbus, p, (BUS_ADDRESS)vtophys(p));
 	}
 
 	return 0;
 }
 
 static void hpt_free_mem(PVBUS_EXT vbus_ext)
 {
 	struct freelist *f;
 	void *p;
 	int i;
 	BUS_ADDRESS bus;
 
 	for (f=vbus_ext->freelist_head; f; f=f->next) {
 #if DBG
 		if (f->count!=f->reserved_count) {
 			KdPrint(("memory leak for freelist %s (%d/%d)", f->tag, f->count, f->reserved_count));
 		}
 #endif
 		while ((p=freelist_get(f)))
 			free(p, M_DEVBUF);
 	}
 
 	for (i=0; i<os_max_cache_pages; i++) {
 		p = dmapool_get_page((PVBUS)vbus_ext->vbus, &bus);
 		HPT_ASSERT(p);
-		free_pages(p, 0);
+		free_pages(p);
 	}
 
 	for (f=vbus_ext->freelist_dma_head; f; f=f->next) {
 		int order, size;
 #if DBG
 		if (f->count!=f->reserved_count) {
 			KdPrint(("memory leak for dma freelist %s (%d/%d)", f->tag, f->count, f->reserved_count));
 		}
 #endif
 		for (order=0, size=PAGE_SIZE; size<f->size; order++, size<<=1) ;
 
 		while ((p=freelist_get_dma(f, &bus))) {
 			if (order)
-				free_pages(p, order);
+				free_pages(p);
 			else {
 			/* can't free immediately since other blocks in this page may still be in the list */
 				if (((HPT_UPTR)p & (PAGE_SIZE-1))==0)
 					dmapool_put_page((PVBUS)vbus_ext->vbus, p, bus);
 			}
 		}
 	}
 	
 	while ((p = dmapool_get_page((PVBUS)vbus_ext->vbus, &bus)))
-		free_pages(p, 0);
+		free_pages(p);
 }
 
 static int hpt_init_vbus(PVBUS_EXT vbus_ext)
 {
 	PHBA hba;
 
 	for (hba = vbus_ext->hba_list; hba; hba = hba->next)
 		if (!hba->ldm_adapter.him->initialize(hba->ldm_adapter.him_handle)) {
 			KdPrint(("fail to initialize %p", hba));
 			return -1;
 		}
 
 	ldm_initialize_vbus((PVBUS)vbus_ext->vbus, &vbus_ext->hba_list->ldm_adapter);
 	return 0;
 }
 
 static void hpt_flush_done(PCOMMAND pCmd)
 {
 	PVDEV vd = pCmd->target;
 
 	if (mIsArray(vd->type) && vd->u.array.transform && vd!=vd->u.array.transform->target) {
 		vd = vd->u.array.transform->target;
 		HPT_ASSERT(vd);
 		pCmd->target = vd;
 		pCmd->Result = RETURN_PENDING;
 		vdev_queue_cmd(pCmd);
 		return;
 	}
 
 	*(int *)pCmd->priv = 1;
 	wakeup(pCmd);
 }
 
 /*
  * flush a vdev (without retry).
  */
 static int hpt_flush_vdev(PVBUS_EXT vbus_ext, PVDEV vd)
 {
 	PCOMMAND pCmd;
 	int result = 0, done;
 	HPT_UINT count;
 
 	KdPrint(("flusing dev %p", vd));
 
 	hpt_assert_vbus_locked(vbus_ext);
 
 	if (mIsArray(vd->type) && vd->u.array.transform)
 		count = max(vd->u.array.transform->source->cmds_per_request,
 					vd->u.array.transform->target->cmds_per_request);
 	else
 		count = vd->cmds_per_request;
 
 	pCmd = ldm_alloc_cmds(vd->vbus, count);
 
 	if (!pCmd) {
 		return -1;
 	}
 
 	pCmd->type = CMD_TYPE_FLUSH;
 	pCmd->flags.hard_flush = 1;
 	pCmd->target = vd;
 	pCmd->done = hpt_flush_done;
 	done = 0;
 	pCmd->priv = &done;
 
 	ldm_queue_cmd(pCmd);
 	
 	if (!done) {
 		while (hpt_sleep(vbus_ext, pCmd, PPAUSE, "hptfls", HPT_OSM_TIMEOUT)) {
 			ldm_reset_vbus(vd->vbus);
 		}
 	}
 
 	KdPrint(("flush result %d", pCmd->Result));
 
 	if (pCmd->Result!=RETURN_SUCCESS)
 		result = -1;
 
 	ldm_free_cmds(pCmd);
 
 	return result;
 }
 
 static void hpt_stop_tasks(PVBUS_EXT vbus_ext);
 static void hpt_shutdown_vbus(PVBUS_EXT vbus_ext, int howto)
 {
 	PVBUS     vbus = (PVBUS)vbus_ext->vbus;
 	PHBA hba;
 	int i;
 	
 	KdPrint(("hpt_shutdown_vbus"));
 
 	/* stop all ctl tasks and disable the worker taskqueue */
 	hpt_stop_tasks(vbus_ext);
 	hpt_lock_vbus(vbus_ext);
 	vbus_ext->worker.ta_context = 0;
 
 	/* flush devices */
 	for (i=0; i<osm_max_targets; i++) {
 		PVDEV vd = ldm_find_target(vbus, i);
 		if (vd) {
 			/* retry once */
 			if (hpt_flush_vdev(vbus_ext, vd))
 				hpt_flush_vdev(vbus_ext, vd);
 		}
 	}
 
 	ldm_shutdown(vbus);
 	hpt_unlock_vbus(vbus_ext);
 
 	ldm_release_vbus(vbus);
 
 	for (hba=vbus_ext->hba_list; hba; hba=hba->next)
 		bus_teardown_intr(hba->pcidev, hba->irq_res, hba->irq_handle);
 
 	hpt_free_mem(vbus_ext);
 
 	while ((hba=vbus_ext->hba_list)) {
 		vbus_ext->hba_list = hba->next;
 		free(hba->ldm_adapter.him_handle, M_DEVBUF);
 	}
 
 	callout_drain(&vbus_ext->timer);
 	mtx_destroy(&vbus_ext->lock);
 	free(vbus_ext, M_DEVBUF);
 	KdPrint(("hpt_shutdown_vbus done"));
 }
 
 static void __hpt_do_tasks(PVBUS_EXT vbus_ext)
 {
 	OSM_TASK *tasks;
 
 	tasks = vbus_ext->tasks;
 	vbus_ext->tasks = 0;
 
 	while (tasks) {
 		OSM_TASK *t = tasks;
 		tasks = t->next;
 		t->next = 0;
 		t->func(vbus_ext->vbus, t->data);
 	}
 }
 
 static void hpt_do_tasks(PVBUS_EXT vbus_ext, int pending)
 {
 	if(vbus_ext){
 		hpt_lock_vbus(vbus_ext);
 		__hpt_do_tasks(vbus_ext);
 		hpt_unlock_vbus(vbus_ext);
 	}
 }
 
 static void hpt_action(struct cam_sim *sim, union ccb *ccb);
 static void hpt_poll(struct cam_sim *sim);
 static void hpt_async(void * callback_arg, u_int32_t code, struct cam_path * path, void * arg);
 static void hpt_pci_intr(void *arg);
 
 static __inline POS_CMDEXT cmdext_get(PVBUS_EXT vbus_ext)
 {
 	POS_CMDEXT p = vbus_ext->cmdext_list;
 	if (p)
 		vbus_ext->cmdext_list = p->next;
 	return p;
 }
 
 static __inline void cmdext_put(POS_CMDEXT p)
 {
 	p->next = p->vbus_ext->cmdext_list;
 	p->vbus_ext->cmdext_list = p;
 }
 
 static void hpt_timeout(void *arg)
 {
 	PCOMMAND pCmd = (PCOMMAND)arg;
 	POS_CMDEXT ext = (POS_CMDEXT)pCmd->priv;
 	
 	KdPrint(("pCmd %p timeout", pCmd));
 	
 	ldm_reset_vbus((PVBUS)ext->vbus_ext->vbus);
 }
 
 static void os_cmddone(PCOMMAND pCmd)
 {
 	POS_CMDEXT ext = (POS_CMDEXT)pCmd->priv;
 	union ccb *ccb = ext->ccb;
 
 	KdPrint(("os_cmddone(%p, %d)", pCmd, pCmd->Result));
 
 	callout_stop(&ext->timeout);
 
 	switch(pCmd->Result) {
 	case RETURN_SUCCESS:
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 	case RETURN_BAD_DEVICE:
 		ccb->ccb_h.status = CAM_DEV_NOT_THERE;
 		break;
 	case RETURN_DEVICE_BUSY:
 		ccb->ccb_h.status = CAM_BUSY;
 		break;
 	case RETURN_INVALID_REQUEST:
 		ccb->ccb_h.status = CAM_REQ_INVALID;
 		break;
 	case RETURN_SELECTION_TIMEOUT:
 		ccb->ccb_h.status = CAM_SEL_TIMEOUT;
 		break;
 	case RETURN_RETRY:
 		ccb->ccb_h.status = CAM_BUSY;
 		break;
 	default:
 		ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR;
 		break;
 	}
 
 	if (pCmd->flags.data_in) {
 		bus_dmamap_sync(ext->vbus_ext->io_dmat, ext->dma_map, BUS_DMASYNC_POSTREAD);
 	}
 	else if (pCmd->flags.data_out) {
 		bus_dmamap_sync(ext->vbus_ext->io_dmat, ext->dma_map, BUS_DMASYNC_POSTWRITE);
 	}
 	
 	bus_dmamap_unload(ext->vbus_ext->io_dmat, ext->dma_map);
 
 	cmdext_put(ext);
 	ldm_free_cmds(pCmd);
 	xpt_done(ccb);
 }
 
 static int os_buildsgl(PCOMMAND pCmd, PSG pSg, int logical)
 {
 	POS_CMDEXT ext = (POS_CMDEXT)pCmd->priv;
 	union ccb *ccb = ext->ccb;
 
 	if (logical) {
 		os_set_sgptr(pSg, (HPT_U8 *)ccb->csio.data_ptr);
 		pSg->size = ccb->csio.dxfer_len;
 		pSg->eot = 1;
 		return TRUE;
 	}
 
 	/* since we have provided physical sg, nobody will ask us to build physical sg */
 	HPT_ASSERT(0);
 	return FALSE;
 }
 
 static void hpt_io_dmamap_callback(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
 {
 	PCOMMAND pCmd = (PCOMMAND)arg;
 	POS_CMDEXT ext = (POS_CMDEXT)pCmd->priv;
 	PSG psg = pCmd->psg;
 	int idx;
 	
 	HPT_ASSERT(pCmd->flags.physical_sg);
 	
 	if (error)
 		panic("busdma error");
 		
 	HPT_ASSERT(nsegs<=os_max_sg_descriptors);
 
 	if (nsegs != 0) {
 		for (idx = 0; idx < nsegs; idx++, psg++) {
 			psg->addr.bus = segs[idx].ds_addr;
 			psg->size = segs[idx].ds_len;
 			psg->eot = 0;
 		}
 			psg[-1].eot = 1;
 		
 		if (pCmd->flags.data_in) {
 			bus_dmamap_sync(ext->vbus_ext->io_dmat, ext->dma_map,
 			    BUS_DMASYNC_PREREAD);
 		}
 		else if (pCmd->flags.data_out) {
 			bus_dmamap_sync(ext->vbus_ext->io_dmat, ext->dma_map,
 			    BUS_DMASYNC_PREWRITE);
 		}
 	}
 	callout_reset(&ext->timeout, HPT_OSM_TIMEOUT, hpt_timeout, pCmd);
 	ldm_queue_cmd(pCmd);
 }
 
 static void hpt_scsi_io(PVBUS_EXT vbus_ext, union ccb *ccb)
 {
 	PVBUS vbus = (PVBUS)vbus_ext->vbus;
 	PVDEV vd;
 	PCOMMAND pCmd;
 	POS_CMDEXT ext;
 	HPT_U8 *cdb;
 
 	if (ccb->ccb_h.flags & CAM_CDB_POINTER)
 		cdb = ccb->csio.cdb_io.cdb_ptr;
 	else
 		cdb = ccb->csio.cdb_io.cdb_bytes;
 	
 	KdPrint(("hpt_scsi_io: ccb %x id %d lun %d cdb %x-%x-%x",
 		ccb,
 		ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
 		*(HPT_U32 *)&cdb[0], *(HPT_U32 *)&cdb[4], *(HPT_U32 *)&cdb[8]
 	));
 
 	/* ccb->ccb_h.path_id is not our bus id - don't check it */
 	if (ccb->ccb_h.target_lun != 0 ||
 		ccb->ccb_h.target_id >= osm_max_targets ||
 		(ccb->ccb_h.flags & CAM_CDB_PHYS))
 	{
 		ccb->ccb_h.status = CAM_TID_INVALID;
 		xpt_done(ccb);
 		return;
 	}
 
 	vd = ldm_find_target(vbus, ccb->ccb_h.target_id);
 
 	if (!vd) {
 		ccb->ccb_h.status = CAM_SEL_TIMEOUT;
 		xpt_done(ccb);
 		return;
 	}
    
 	switch (cdb[0]) {
 	case TEST_UNIT_READY:
 	case START_STOP_UNIT:
 	case SYNCHRONIZE_CACHE:
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 
 	case INQUIRY:
 		{
 			PINQUIRYDATA inquiryData;
 			memset(ccb->csio.data_ptr, 0, ccb->csio.dxfer_len);
 			inquiryData = (PINQUIRYDATA)ccb->csio.data_ptr;
 		
 			inquiryData->AdditionalLength = 31;
 			inquiryData->CommandQueue = 1;
 			memcpy(&inquiryData->VendorId, "HPT     ", 8);
 			memcpy(&inquiryData->ProductId, "DISK 0_0        ", 16);
 	
 			if (vd->target_id / 10) {
 				inquiryData->ProductId[7] = (vd->target_id % 100) / 10 + '0';
 				inquiryData->ProductId[8] = (vd->target_id % 100) % 10 + '0';
 			}
 			else
 				inquiryData->ProductId[7] = (vd->target_id % 100) % 10 + '0';
 	
 			memcpy(&inquiryData->ProductRevisionLevel, "4.00", 4);
 	
 			ccb->ccb_h.status = CAM_REQ_CMP;
 		}
 		break;
 
 	case READ_CAPACITY:
 	{
 		HPT_U8 *rbuf = ccb->csio.data_ptr;
 		HPT_U32 cap;
 		
 		if (vd->capacity>0xfffffffful)
 			cap = 0xfffffffful;
 		else
 			cap = vd->capacity - 1;
 	
 		rbuf[0] = (HPT_U8)(cap>>24);
 		rbuf[1] = (HPT_U8)(cap>>16);
 		rbuf[2] = (HPT_U8)(cap>>8);
 		rbuf[3] = (HPT_U8)cap;
 		rbuf[4] = 0;
 		rbuf[5] = 0;
 		rbuf[6] = 2;
 		rbuf[7] = 0;
 
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 	}
 	
 	case SERVICE_ACTION_IN: 
 	{
 		HPT_U8 *rbuf = ccb->csio.data_ptr;
 		HPT_U64	cap = vd->capacity - 1;
 		
 		rbuf[0] = (HPT_U8)(cap>>56);
 		rbuf[1] = (HPT_U8)(cap>>48);
 		rbuf[2] = (HPT_U8)(cap>>40);
 		rbuf[3] = (HPT_U8)(cap>>32);
 		rbuf[4] = (HPT_U8)(cap>>24);
 		rbuf[5] = (HPT_U8)(cap>>16);
 		rbuf[6] = (HPT_U8)(cap>>8);
 		rbuf[7] = (HPT_U8)cap;
 		rbuf[8] = 0;
 		rbuf[9] = 0;
 		rbuf[10] = 2;
 		rbuf[11] = 0;
 		
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;	
 	}
 	
 	case READ_6:
 	case READ_10:
 	case READ_16:
 	case WRITE_6:
 	case WRITE_10:
 	case WRITE_16:
 	case 0x13:
 	case 0x2f:
 	{
 		int error;
 
 		pCmd = ldm_alloc_cmds(vbus, vd->cmds_per_request);
 		if(!pCmd){
 			KdPrint(("Failed to allocate command!"));
 			ccb->ccb_h.status = CAM_BUSY;
 			break;
 		}
 
 		switch (cdb[0])	{
 		case READ_6:
 		case WRITE_6:
 		case 0x13:
 			pCmd->uCmd.Ide.Lba =  ((HPT_U32)cdb[1] << 16) | ((HPT_U32)cdb[2] << 8) | (HPT_U32)cdb[3];
 			pCmd->uCmd.Ide.nSectors = (HPT_U16) cdb[4];
 			break;
 		case READ_16:
 		case WRITE_16: 
 		{
 			HPT_U64 block =
 				((HPT_U64)cdb[2]<<56) |
 				((HPT_U64)cdb[3]<<48) |
 				((HPT_U64)cdb[4]<<40) |
 				((HPT_U64)cdb[5]<<32) |
 				((HPT_U64)cdb[6]<<24) |
 				((HPT_U64)cdb[7]<<16) |
 				((HPT_U64)cdb[8]<<8) |
 				((HPT_U64)cdb[9]);
 			pCmd->uCmd.Ide.Lba = block;
 			pCmd->uCmd.Ide.nSectors = (HPT_U16)cdb[13] | ((HPT_U16)cdb[12]<<8);
 			break;
 		}
 		
 		default:
 			pCmd->uCmd.Ide.Lba = (HPT_U32)cdb[5] | ((HPT_U32)cdb[4] << 8) | ((HPT_U32)cdb[3] << 16) | ((HPT_U32)cdb[2] << 24);
 			pCmd->uCmd.Ide.nSectors = (HPT_U16) cdb[8] | ((HPT_U16)cdb[7]<<8);
 			break;
 		}
 		
 		switch (cdb[0]) {
 		case READ_6:
 		case READ_10:
 		case READ_16:
 			pCmd->flags.data_in = 1;
 			break;
 		case WRITE_6:
 		case WRITE_10:
 		case WRITE_16:
 			pCmd->flags.data_out = 1;
 			break;
 		}
 		pCmd->priv = ext = cmdext_get(vbus_ext);
 		HPT_ASSERT(ext);
 		ext->ccb = ccb;
 		pCmd->target = vd;
 		pCmd->done = os_cmddone;
 		pCmd->buildsgl = os_buildsgl;
 		pCmd->psg = ext->psg;
 		pCmd->flags.physical_sg = 1;
 		error = bus_dmamap_load_ccb(vbus_ext->io_dmat, 
 					ext->dma_map, 
 					ccb,
 					hpt_io_dmamap_callback, pCmd,
 			    		BUS_DMA_WAITOK
 					);
 		KdPrint(("bus_dmamap_load return %d", error));
 		if (error && error!=EINPROGRESS) {
 			os_printk("bus_dmamap_load error %d", error);
 			cmdext_put(ext);
 			ldm_free_cmds(pCmd);
 			ccb->ccb_h.status = CAM_REQ_CMP_ERR;
 			xpt_done(ccb);
 		}
 		return;
 	}
 
 	default:
 		ccb->ccb_h.status = CAM_REQ_INVALID;
 		break;
 	}
 
 	xpt_done(ccb);
 	return;
 }
 
 static void hpt_action(struct cam_sim *sim, union ccb *ccb)
 {
 	PVBUS_EXT vbus_ext = (PVBUS_EXT)cam_sim_softc(sim);
 
 	KdPrint(("hpt_action(fn=%d, id=%d)", ccb->ccb_h.func_code, ccb->ccb_h.target_id));
 
 	hpt_assert_vbus_locked(vbus_ext);
 	switch (ccb->ccb_h.func_code) {
 	
 	case XPT_SCSI_IO:
 		hpt_scsi_io(vbus_ext, ccb);
 		return;
 
 	case XPT_RESET_BUS:
 		ldm_reset_vbus((PVBUS)vbus_ext->vbus);
 		break;
 
 	case XPT_GET_TRAN_SETTINGS:
 	case XPT_SET_TRAN_SETTINGS:
 		ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
 		break;
 
 	case XPT_CALC_GEOMETRY:
 		cam_calc_geometry(&ccb->ccg, 1);
 		break;
 
 	case XPT_PATH_INQ:
 	{
 		struct ccb_pathinq *cpi = &ccb->cpi;
 
 		cpi->version_num = 1;
 		cpi->hba_inquiry = PI_SDTR_ABLE;
 		cpi->target_sprt = 0;
 		cpi->hba_misc = PIM_NOBUSRESET;
 		cpi->hba_eng_cnt = 0;
 		cpi->max_target = osm_max_targets;
 		cpi->max_lun = 0;
 		cpi->unit_number = cam_sim_unit(sim);
 		cpi->bus_id = cam_sim_bus(sim);
 		cpi->initiator_id = osm_max_targets;
 		cpi->base_transfer_speed = 3300;
 
 		strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
 		strlcpy(cpi->hba_vid, "HPT   ", HBA_IDLEN);
 		strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
 		cpi->transport = XPORT_SPI;
 		cpi->transport_version = 2;
 		cpi->protocol = PROTO_SCSI;
 		cpi->protocol_version = SCSI_REV_2;
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		break;
 	}
 
 	default:
 		ccb->ccb_h.status = CAM_REQ_INVALID;
 		break;
 	}
 
 	xpt_done(ccb);
 	return;
 }
 
 static void hpt_pci_intr(void *arg)
 {	
 	PVBUS_EXT vbus_ext = (PVBUS_EXT)arg;
 	hpt_lock_vbus(vbus_ext);
 	ldm_intr((PVBUS)vbus_ext->vbus);
 	hpt_unlock_vbus(vbus_ext);
 }
 
 static void hpt_poll(struct cam_sim *sim)
 {
 	PVBUS_EXT vbus_ext = cam_sim_softc(sim);
 	hpt_assert_vbus_locked(vbus_ext);
 	ldm_intr((PVBUS)vbus_ext->vbus);
 }
 
 static void hpt_async(void * callback_arg, u_int32_t code, struct cam_path * path, void * arg)
 {
 	KdPrint(("hpt_async"));
 }
 
 static int hpt_shutdown(device_t dev)
 {
 	KdPrint(("hpt_shutdown(dev=%p)", dev));
 	return 0;
 }
 
 static int hpt_detach(device_t dev)
 {
 	/* we don't allow the driver to be unloaded. */
 	return EBUSY;
 }
 
 static void hpt_ioctl_done(struct _IOCTL_ARG *arg)
 {
 	arg->ioctl_cmnd = 0;
 	wakeup(arg);
 }
 
 static void __hpt_do_ioctl(PVBUS_EXT vbus_ext, IOCTL_ARG *ioctl_args)
 {
 	ioctl_args->result = -1;
 	ioctl_args->done = hpt_ioctl_done;
 	ioctl_args->ioctl_cmnd = (void *)1;
 
 	hpt_lock_vbus(vbus_ext);
 	ldm_ioctl((PVBUS)vbus_ext->vbus, ioctl_args);
 
 	while (ioctl_args->ioctl_cmnd) {
 		if (hpt_sleep(vbus_ext, ioctl_args, PPAUSE, "hptctl", HPT_OSM_TIMEOUT)==0)
 			break;
 		ldm_reset_vbus((PVBUS)vbus_ext->vbus);
 		__hpt_do_tasks(vbus_ext);
 	}
 
 	/* KdPrint(("ioctl %x result %d", ioctl_args->dwIoControlCode, ioctl_args->result)); */
 
 	hpt_unlock_vbus(vbus_ext);
 }
 
 static void hpt_do_ioctl(IOCTL_ARG *ioctl_args)
 {
 	PVBUS vbus;
 	PVBUS_EXT vbus_ext;
 	
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		__hpt_do_ioctl(vbus_ext, ioctl_args);
 		if (ioctl_args->result!=HPT_IOCTL_RESULT_WRONG_VBUS)
 			return;
 	}
 }
 
 #define HPT_DO_IOCTL(code, inbuf, insize, outbuf, outsize) ({\
 	IOCTL_ARG arg;\
 	arg.dwIoControlCode = code;\
 	arg.lpInBuffer = inbuf;\
 	arg.lpOutBuffer = outbuf;\
 	arg.nInBufferSize = insize;\
 	arg.nOutBufferSize = outsize;\
 	arg.lpBytesReturned = 0;\
 	hpt_do_ioctl(&arg);\
 	arg.result;\
 })
 
 #define DEVICEID_VALID(id) ((id) && ((HPT_U32)(id)!=0xffffffff))
 
 static int hpt_get_logical_devices(DEVICEID * pIds, int nMaxCount)
 {
 	int i;
 	HPT_U32 count = nMaxCount-1;
 	
 	if (HPT_DO_IOCTL(HPT_IOCTL_GET_LOGICAL_DEVICES,
 			&count, sizeof(HPT_U32), pIds, sizeof(DEVICEID)*nMaxCount))
 		return -1;
 
 	nMaxCount = (int)pIds[0];
 	for (i=0; i<nMaxCount; i++) pIds[i] = pIds[i+1];
 	return nMaxCount;
 }
 
 static int hpt_get_device_info_v3(DEVICEID id, PLOGICAL_DEVICE_INFO_V3 pInfo)
 {
 	return HPT_DO_IOCTL(HPT_IOCTL_GET_DEVICE_INFO_V3,
 				&id, sizeof(DEVICEID), pInfo, sizeof(LOGICAL_DEVICE_INFO_V3));
 }
 
 /* not belong to this file logically, but we want to use ioctl interface */
 static int __hpt_stop_tasks(PVBUS_EXT vbus_ext, DEVICEID id)
 {
 	LOGICAL_DEVICE_INFO_V3 devinfo;
 	int i, result;
 	DEVICEID param[2] = { id, 0 };
 	
 	if (hpt_get_device_info_v3(id, &devinfo))
 		return -1;
 		
 	if (devinfo.Type!=LDT_ARRAY)
 		return -1;
 		
 	if (devinfo.u.array.Flags & ARRAY_FLAG_REBUILDING)
 		param[1] = AS_REBUILD_ABORT;
 	else if (devinfo.u.array.Flags & ARRAY_FLAG_VERIFYING)
 		param[1] = AS_VERIFY_ABORT;
 	else if (devinfo.u.array.Flags & ARRAY_FLAG_INITIALIZING)
 		param[1] = AS_INITIALIZE_ABORT;
 	else if (devinfo.u.array.Flags & ARRAY_FLAG_TRANSFORMING)
 		param[1] = AS_TRANSFORM_ABORT;
 	else
 		return -1;
 
 	KdPrint(("SET_ARRAY_STATE(%x, %d)", param[0], param[1]));
 	result = HPT_DO_IOCTL(HPT_IOCTL_SET_ARRAY_STATE,
 				param, sizeof(param), 0, 0);
 				
 	for (i=0; i<devinfo.u.array.nDisk; i++)
 		if (DEVICEID_VALID(devinfo.u.array.Members[i]))
 			__hpt_stop_tasks(vbus_ext, devinfo.u.array.Members[i]);
 			
 	return result;
 }
 
 static void hpt_stop_tasks(PVBUS_EXT vbus_ext)
 {
 	DEVICEID ids[32];
 	int i, count;
 
 	count = hpt_get_logical_devices((DEVICEID *)&ids, sizeof(ids)/sizeof(ids[0]));
 	
 	for (i=0; i<count; i++)
 		__hpt_stop_tasks(vbus_ext, ids[i]);
 }
 
 static	d_open_t	hpt_open;
 static	d_close_t	hpt_close;
 static	d_ioctl_t	hpt_ioctl;
 static  int 		hpt_rescan_bus(void);
 
 static struct cdevsw hpt_cdevsw = {
 	.d_open =	hpt_open,
 	.d_close =	hpt_close,
 	.d_ioctl =	hpt_ioctl,
 	.d_name =	driver_name,
 	.d_version =	D_VERSION,
 };
 
 static struct intr_config_hook hpt_ich;
 
 /*
  * hpt_final_init will be called after all hpt_attach.
  */
 static void hpt_final_init(void *dummy)
 {
 	int       i;
 	PVBUS_EXT vbus_ext;
 	PVBUS vbus;
 	PHBA hba;
 
 	/* Clear the config hook */
 	config_intrhook_disestablish(&hpt_ich);
 
 	/* allocate memory */
 	i = 0;
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		if (hpt_alloc_mem(vbus_ext)) {
 			os_printk("out of memory");
 			return;
 		}
 		i++;
 	}
 
 	if (!i) {
 		if (bootverbose)
 			os_printk("no controller detected.");
 		return;
 	}
 
 	/* initializing hardware */
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		/* make timer available here */
 		mtx_init(&vbus_ext->lock, "hptsleeplock", NULL, MTX_DEF);
 		callout_init_mtx(&vbus_ext->timer, &vbus_ext->lock, 0);
 		if (hpt_init_vbus(vbus_ext)) {
 			os_printk("fail to initialize hardware");
 			break; /* FIXME */
 		}
 	}
 
 	/* register CAM interface */
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		struct cam_devq *devq;
 		struct ccb_setasync	ccb;
 		
 		if (bus_dma_tag_create(NULL,/* parent */
 				4,	/* alignment */
 				BUS_SPACE_MAXADDR_32BIT+1, /* boundary */
 				BUS_SPACE_MAXADDR,	/* lowaddr */
 				BUS_SPACE_MAXADDR, 	/* highaddr */
 				NULL, NULL, 		/* filter, filterarg */
 				PAGE_SIZE * (os_max_sg_descriptors-1),	/* maxsize */
 				os_max_sg_descriptors,	/* nsegments */
 				0x10000,	/* maxsegsize */
 				BUS_DMA_WAITOK,		/* flags */
 				busdma_lock_mutex,	/* lockfunc */
 				&vbus_ext->lock,		/* lockfuncarg */
 				&vbus_ext->io_dmat	/* tag */))
 		{
 			return ;
 		}
 
 		for (i=0; i<os_max_queue_comm; i++) {
 			POS_CMDEXT ext = (POS_CMDEXT)malloc(sizeof(OS_CMDEXT), M_DEVBUF, M_WAITOK);
 			if (!ext) {
 				os_printk("Can't alloc cmdext(%d)", i);
 				return ;
 			}
 			ext->vbus_ext = vbus_ext;
 			ext->next = vbus_ext->cmdext_list;
 			vbus_ext->cmdext_list = ext;
 	
 			if (bus_dmamap_create(vbus_ext->io_dmat, 0, &ext->dma_map)) {
 				os_printk("Can't create dma map(%d)", i);
 				return ;
 			}
 			callout_init_mtx(&ext->timeout, &vbus_ext->lock, 0);
 		}
 
 		if ((devq = cam_simq_alloc(os_max_queue_comm)) == NULL) {
 			os_printk("cam_simq_alloc failed");
 			return ;
 		}
 
 		vbus_ext->sim = cam_sim_alloc(hpt_action, hpt_poll, driver_name,
 				vbus_ext, 0, &vbus_ext->lock, os_max_queue_comm,
 				/*tagged*/8,  devq);
 				
 		if (!vbus_ext->sim) {
 			os_printk("cam_sim_alloc failed");
 			cam_simq_free(devq);
 			return ;
 		}
 
 		hpt_lock_vbus(vbus_ext);
 		if (xpt_bus_register(vbus_ext->sim, NULL, 0) != CAM_SUCCESS) {
 			os_printk("xpt_bus_register failed");
 			cam_sim_free(vbus_ext->sim, /*free devq*/ TRUE);
 			hpt_unlock_vbus(vbus_ext);
 			vbus_ext->sim = NULL;
 			return ;
 		}
 	
 		if (xpt_create_path(&vbus_ext->path, /*periph */ NULL,
 				cam_sim_path(vbus_ext->sim), CAM_TARGET_WILDCARD,
 				CAM_LUN_WILDCARD) != CAM_REQ_CMP)
 		{
 			os_printk("xpt_create_path failed");
 			xpt_bus_deregister(cam_sim_path(vbus_ext->sim));
 			cam_sim_free(vbus_ext->sim, /*free_devq*/TRUE);
 			hpt_unlock_vbus(vbus_ext);
 			vbus_ext->sim = NULL;
 			return ;
 		}
 		hpt_unlock_vbus(vbus_ext);
 
 		memset(&ccb, 0, sizeof(ccb));
 		xpt_setup_ccb(&ccb.ccb_h, vbus_ext->path, /*priority*/5);
 		ccb.ccb_h.func_code = XPT_SASYNC_CB;
 		ccb.event_enable = AC_LOST_DEVICE;
 		ccb.callback = hpt_async;
 		ccb.callback_arg = vbus_ext;
 		xpt_action((union ccb *)&ccb);
 
 		for (hba = vbus_ext->hba_list; hba; hba = hba->next) {
 			int rid = 0;
 			if ((hba->irq_res = bus_alloc_resource_any(hba->pcidev,
 				SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL)
 			{
 				os_printk("can't allocate interrupt");
 				return ;
 			}
 			
 			if (bus_setup_intr(hba->pcidev, hba->irq_res, INTR_TYPE_CAM | INTR_MPSAFE,
 				NULL, hpt_pci_intr, vbus_ext, &hba->irq_handle)) 
 			{
 				os_printk("can't set up interrupt");
 				return ;
 			}
 			hba->ldm_adapter.him->intr_control(hba->ldm_adapter.him_handle, HPT_TRUE);
 		}
 
 		vbus_ext->shutdown_eh = EVENTHANDLER_REGISTER(shutdown_final, 
 									hpt_shutdown_vbus, vbus_ext, SHUTDOWN_PRI_DEFAULT);
 		if (!vbus_ext->shutdown_eh)
 			os_printk("Shutdown event registration failed");
 	}
 	
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		TASK_INIT(&vbus_ext->worker, 0, (task_fn_t *)hpt_do_tasks, vbus_ext);
 		if (vbus_ext->tasks)
 			TASK_ENQUEUE(&vbus_ext->worker);
 	}	
 
 	make_dev(&hpt_cdevsw, DRIVER_MINOR, UID_ROOT, GID_OPERATOR,
 	    S_IRUSR | S_IWUSR, "%s", driver_name);
 }
 
 #if defined(KLD_MODULE)
 
 typedef struct driverlink *driverlink_t;
 struct driverlink {
 	kobj_class_t	driver;
 	TAILQ_ENTRY(driverlink) link;	/* list of drivers in devclass */
 };
 
 typedef TAILQ_HEAD(driver_list, driverlink) driver_list_t;
 
 struct devclass {
 	TAILQ_ENTRY(devclass) link;
 	devclass_t	parent;		/* parent in devclass hierarchy */
 	driver_list_t	drivers;     /* bus devclasses store drivers for bus */
 	char		*name;
 	device_t	*devices;	/* array of devices indexed by unit */
 	int		maxunit;	/* size of devices array */
 };
 
 static void override_kernel_driver(void)
 {
 	driverlink_t dl, dlfirst;
 	driver_t *tmpdriver;
 	devclass_t dc = devclass_find("pci");
 	
 	if (dc){
 		dlfirst = TAILQ_FIRST(&dc->drivers);
 		for (dl = dlfirst; dl; dl = TAILQ_NEXT(dl, link)) {
 			if(strcmp(dl->driver->name, driver_name) == 0) {
 				tmpdriver=dl->driver;
 				dl->driver=dlfirst->driver;
 				dlfirst->driver=tmpdriver;
 				break;
 			}
 		}
 	}
 }
 
 #else 
 #define override_kernel_driver()
 #endif
 
 static void hpt_init(void *dummy)
 {
 	if (bootverbose)
 		os_printk("%s %s", driver_name_long, driver_ver);
 
 	override_kernel_driver();
 	init_config();
 
 	hpt_ich.ich_func = hpt_final_init;
 	hpt_ich.ich_arg = NULL;
 	if (config_intrhook_establish(&hpt_ich) != 0) {
 		printf("%s: cannot establish configuration hook\n",
 		    driver_name_long);
 	}
 
 }
 SYSINIT(hptinit, SI_SUB_CONFIGURE, SI_ORDER_FIRST, hpt_init, NULL);
 
 /*
  * CAM driver interface
  */
 static device_method_t driver_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		hpt_probe),
 	DEVMETHOD(device_attach,	hpt_attach),
 	DEVMETHOD(device_detach,	hpt_detach),
 	DEVMETHOD(device_shutdown,	hpt_shutdown),
 	DEVMETHOD_END
 };
 
 static driver_t hpt_pci_driver = {
 	driver_name,
 	driver_methods,
 	sizeof(HBA)
 };
 
 #ifndef TARGETNAME
 #error "no TARGETNAME found"
 #endif
 
 /* use this to make TARGETNAME be expanded */
 #define __DRIVER_MODULE(p1, p2, p3, p4, p5) DRIVER_MODULE(p1, p2, p3, p4, p5)
 #define __MODULE_VERSION(p1, p2) MODULE_VERSION(p1, p2)
 #define __MODULE_DEPEND(p1, p2, p3, p4, p5) MODULE_DEPEND(p1, p2, p3, p4, p5)
 __DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, 0, 0);
 __MODULE_VERSION(TARGETNAME, 1);
 __MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
 
 static int hpt_open(struct cdev *dev, int flags, int devtype, struct thread *td)
 {
 	return 0;
 }
 
 static int hpt_close(struct cdev *dev, int flags, int devtype, struct thread *td)
 {
 	return 0;
 }
 
 static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread *td)
 {
 	PHPT_IOCTL_PARAM piop=(PHPT_IOCTL_PARAM)data;
 	IOCTL_ARG ioctl_args;
 	HPT_U32 bytesReturned = 0;
 
 	switch (cmd){
 	case HPT_DO_IOCONTROL:
 	{	
 		if (piop->Magic == HPT_IOCTL_MAGIC || piop->Magic == HPT_IOCTL_MAGIC32) {
 			KdPrint(("ioctl=%x in=%p len=%d out=%p len=%d\n",
 				piop->dwIoControlCode,
 				piop->lpInBuffer,
 				piop->nInBufferSize,
 				piop->lpOutBuffer,
 				piop->nOutBufferSize));
 			
 		memset(&ioctl_args, 0, sizeof(ioctl_args));
 		
 		ioctl_args.dwIoControlCode = piop->dwIoControlCode;
 		ioctl_args.nInBufferSize = piop->nInBufferSize;
 		ioctl_args.nOutBufferSize = piop->nOutBufferSize;
 		ioctl_args.lpBytesReturned = &bytesReturned;
 
 		if (ioctl_args.nInBufferSize) {
 			ioctl_args.lpInBuffer = malloc(ioctl_args.nInBufferSize, M_DEVBUF, M_WAITOK);
 			if (!ioctl_args.lpInBuffer)
 				goto invalid;
 			if (copyin((void*)piop->lpInBuffer,
 					ioctl_args.lpInBuffer, piop->nInBufferSize))
 				goto invalid;
 		}
 	
 		if (ioctl_args.nOutBufferSize) {
 			ioctl_args.lpOutBuffer = malloc(ioctl_args.nOutBufferSize, M_DEVBUF, M_WAITOK | M_ZERO);
 			if (!ioctl_args.lpOutBuffer)
 				goto invalid;
 		}
 		
 		hpt_do_ioctl(&ioctl_args);
 	
 		if (ioctl_args.result==HPT_IOCTL_RESULT_OK) {
 			if (piop->nOutBufferSize) {
 				if (copyout(ioctl_args.lpOutBuffer,
 					(void*)piop->lpOutBuffer, piop->nOutBufferSize))
 					goto invalid;
 			}
 			if (piop->lpBytesReturned) {
 				if (copyout(&bytesReturned,
 					(void*)piop->lpBytesReturned, sizeof(HPT_U32)))
 					goto invalid;
 			}
 			if (ioctl_args.lpInBuffer) free(ioctl_args.lpInBuffer, M_DEVBUF);
 			if (ioctl_args.lpOutBuffer) free(ioctl_args.lpOutBuffer, M_DEVBUF);
 			return 0;
 		}
 invalid:
 		if (ioctl_args.lpInBuffer) free(ioctl_args.lpInBuffer, M_DEVBUF);
 		if (ioctl_args.lpOutBuffer) free(ioctl_args.lpOutBuffer, M_DEVBUF);
 		return EFAULT;
 	}
 	return EFAULT;
 	}
 
 	case HPT_SCAN_BUS:
 	{
 		return hpt_rescan_bus();
 	}
 	default:
 		KdPrint(("invalid command!"));
 		return EFAULT;
 	}	
 
 }
 
 static int	hpt_rescan_bus(void)
 {
 	union ccb			*ccb;
 	PVBUS 				vbus;
 	PVBUS_EXT			vbus_ext;	
 		
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		if ((ccb = xpt_alloc_ccb()) == NULL)
 			return(ENOMEM);
 		if (xpt_create_path(&ccb->ccb_h.path, NULL,
 		    cam_sim_path(vbus_ext->sim),
 		    CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
 			xpt_free_ccb(ccb);
 			return(EIO);
 		}
 		xpt_rescan(ccb);
 	}
 	
 	return(0);	
 }
diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c
index 9f51f5b32199..5bdd804b06d5 100644
--- a/sys/dev/hyperv/netvsc/if_hn.c
+++ b/sys/dev/hyperv/netvsc/if_hn.c
@@ -1,7681 +1,7680 @@
 /*-
  * Copyright (c) 2010-2012 Citrix Inc.
  * Copyright (c) 2009-2012,2016-2017 Microsoft Corp.
  * Copyright (c) 2012 NetApp Inc.
  * 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 unmodified, 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.
  */
 
 /*-
  * Copyright (c) 2004-2006 Kip Macy
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 #include "opt_hn.h"
 #include "opt_inet6.h"
 #include "opt_inet.h"
 #include "opt_rss.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/counter.h>
 #include <sys/kernel.h>
 #include <sys/limits.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
 #include <sys/queue.h>
 #include <sys/lock.h>
 #include <sys/proc.h>
 #include <sys/rmlock.h>
 #include <sys/sbuf.h>
 #include <sys/sched.h>
 #include <sys/smp.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sx.h>
 #include <sys/sysctl.h>
 #include <sys/taskqueue.h>
 #include <sys/buf_ring.h>
 #include <sys/eventhandler.h>
 #include <sys/epoch.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>
 
 #include <machine/atomic.h>
 #include <machine/in_cksum.h>
 
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
 #include <net/if_var.h>
 #include <net/rndis.h>
 #ifdef RSS
 #include <net/rss_config.h>
 #endif
 
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip6.h>
 #include <netinet/tcp.h>
 #include <netinet/tcp_lro.h>
 #include <netinet/udp.h>
 
 #include <dev/hyperv/include/hyperv.h>
 #include <dev/hyperv/include/hyperv_busdma.h>
 #include <dev/hyperv/include/vmbus.h>
 #include <dev/hyperv/include/vmbus_xact.h>
 
 #include <dev/hyperv/netvsc/ndis.h>
 #include <dev/hyperv/netvsc/if_hnreg.h>
 #include <dev/hyperv/netvsc/if_hnvar.h>
 #include <dev/hyperv/netvsc/hn_nvs.h>
 #include <dev/hyperv/netvsc/hn_rndis.h>
 
 #include "vmbus_if.h"
 
 #define HN_IFSTART_SUPPORT
 
 #define HN_RING_CNT_DEF_MAX		8
 
 #define HN_VFMAP_SIZE_DEF		8
 
 #define HN_XPNT_VF_ATTWAIT_MIN		2	/* seconds */
 
 /* YYY should get it from the underlying channel */
 #define HN_TX_DESC_CNT			512
 
 #define HN_RNDIS_PKT_LEN					\
 	(sizeof(struct rndis_packet_msg) +			\
 	 HN_RNDIS_PKTINFO_SIZE(HN_NDIS_HASH_VALUE_SIZE) +	\
 	 HN_RNDIS_PKTINFO_SIZE(NDIS_VLAN_INFO_SIZE) +		\
 	 HN_RNDIS_PKTINFO_SIZE(NDIS_LSO2_INFO_SIZE) +		\
 	 HN_RNDIS_PKTINFO_SIZE(NDIS_TXCSUM_INFO_SIZE))
 #define HN_RNDIS_PKT_BOUNDARY		PAGE_SIZE
 #define HN_RNDIS_PKT_ALIGN		CACHE_LINE_SIZE
 
 #define HN_TX_DATA_BOUNDARY		PAGE_SIZE
 #define HN_TX_DATA_MAXSIZE		IP_MAXPACKET
 #define HN_TX_DATA_SEGSIZE		PAGE_SIZE
 /* -1 for RNDIS packet message */
 #define HN_TX_DATA_SEGCNT_MAX		(HN_GPACNT_MAX - 1)
 
 #define HN_DIRECT_TX_SIZE_DEF		128
 
 #define HN_EARLY_TXEOF_THRESH		8
 
 #define HN_PKTBUF_LEN_DEF		(16 * 1024)
 
 #define HN_LROENT_CNT_DEF		128
 
 #define HN_LRO_LENLIM_MULTIRX_DEF	(12 * ETHERMTU)
 #define HN_LRO_LENLIM_DEF		(25 * ETHERMTU)
 /* YYY 2*MTU is a bit rough, but should be good enough. */
 #define HN_LRO_LENLIM_MIN(ifp)		(2 * if_getmtu(ifp))
 
 #define HN_LRO_ACKCNT_DEF		1
 
 #define HN_LOCK_INIT(sc)		\
 	sx_init(&(sc)->hn_lock, device_get_nameunit((sc)->hn_dev))
 #define HN_LOCK_DESTROY(sc)		sx_destroy(&(sc)->hn_lock)
 #define HN_LOCK_ASSERT(sc)		sx_assert(&(sc)->hn_lock, SA_XLOCKED)
 #define HN_LOCK(sc)					\
 do {							\
 	while (sx_try_xlock(&(sc)->hn_lock) == 0) {	\
 		/* Relinquish cpu to avoid deadlock */	\
 		sched_relinquish(curthread);		\
 		DELAY(1000);				\
 	}						\
 } while (0)
 #define HN_UNLOCK(sc)			sx_xunlock(&(sc)->hn_lock)
 
 #define HN_CSUM_IP_MASK			(CSUM_IP | CSUM_IP_TCP | CSUM_IP_UDP)
 #define HN_CSUM_IP6_MASK		(CSUM_IP6_TCP | CSUM_IP6_UDP)
 #define HN_CSUM_IP_HWASSIST(sc)		\
 	((sc)->hn_tx_ring[0].hn_csum_assist & HN_CSUM_IP_MASK)
 #define HN_CSUM_IP6_HWASSIST(sc)	\
 	((sc)->hn_tx_ring[0].hn_csum_assist & HN_CSUM_IP6_MASK)
 
 #define HN_PKTSIZE_MIN(align)		\
 	roundup2(ETHER_MIN_LEN + ETHER_VLAN_ENCAP_LEN - ETHER_CRC_LEN + \
 	    HN_RNDIS_PKT_LEN, (align))
 #define HN_PKTSIZE(m, align)		\
 	roundup2((m)->m_pkthdr.len + HN_RNDIS_PKT_LEN, (align))
 
 #ifdef RSS
 #define HN_RING_IDX2CPU(sc, idx)	rss_getcpu((idx) % rss_getnumbuckets())
 #else
 #define HN_RING_IDX2CPU(sc, idx)	(((sc)->hn_cpu + (idx)) % mp_ncpus)
 #endif
 
 struct hn_txdesc {
 #ifndef HN_USE_TXDESC_BUFRING
 	SLIST_ENTRY(hn_txdesc)		link;
 #endif
 	STAILQ_ENTRY(hn_txdesc)		agg_link;
 
 	/* Aggregated txdescs, in sending order. */
 	STAILQ_HEAD(, hn_txdesc)	agg_list;
 
 	/* The oldest packet, if transmission aggregation happens. */
 	struct mbuf			*m;
 	struct hn_tx_ring		*txr;
 	int				refs;
 	uint32_t			flags;	/* HN_TXD_FLAG_ */
 	struct hn_nvs_sendctx		send_ctx;
 	uint32_t			chim_index;
 	int				chim_size;
 
 	bus_dmamap_t			data_dmap;
 
 	bus_addr_t			rndis_pkt_paddr;
 	struct rndis_packet_msg		*rndis_pkt;
 	bus_dmamap_t			rndis_pkt_dmap;
 };
 
 #define HN_TXD_FLAG_ONLIST		0x0001
 #define HN_TXD_FLAG_DMAMAP		0x0002
 #define HN_TXD_FLAG_ONAGG		0x0004
 
 #define	HN_NDIS_PKTINFO_SUBALLOC	0x01
 #define	HN_NDIS_PKTINFO_1ST_FRAG	0x02
 #define	HN_NDIS_PKTINFO_LAST_FRAG	0x04
 
 struct packet_info_id {
 	uint8_t				ver;
 	uint8_t				flag;
 	uint16_t			pkt_id;
 };
 
 #define NDIS_PKTINFOID_SZ		sizeof(struct packet_info_id)
 
 
 struct hn_rxinfo {
 	const uint32_t			*vlan_info;
 	const uint32_t			*csum_info;
 	const uint32_t			*hash_info;
 	const uint32_t			*hash_value;
 	const struct packet_info_id	*pktinfo_id;
 };
 
 struct hn_rxvf_setarg {
 	struct hn_rx_ring	*rxr;
 	if_t			vf_ifp;
 };
 
 #define HN_RXINFO_VLAN			0x0001
 #define HN_RXINFO_CSUM			0x0002
 #define HN_RXINFO_HASHINF		0x0004
 #define HN_RXINFO_HASHVAL		0x0008
 #define HN_RXINFO_PKTINFO_ID		0x0010
 #define HN_RXINFO_ALL			\
 	(HN_RXINFO_VLAN |		\
 	 HN_RXINFO_CSUM |		\
 	 HN_RXINFO_HASHINF |		\
 	 HN_RXINFO_HASHVAL |		\
 	 HN_RXINFO_PKTINFO_ID)
 
 static int			hn_probe(device_t);
 static int			hn_attach(device_t);
 static int			hn_detach(device_t);
 static int			hn_shutdown(device_t);
 static void			hn_chan_callback(struct vmbus_channel *,
 				    void *);
 
 static void			hn_init(void *);
 static int			hn_ioctl(if_t, u_long, caddr_t);
 #ifdef HN_IFSTART_SUPPORT
 static void			hn_start(if_t);
 #endif
 static int			hn_transmit(if_t, struct mbuf *);
 static void			hn_xmit_qflush(if_t);
 static int			hn_ifmedia_upd(if_t);
 static void			hn_ifmedia_sts(if_t,
 				    struct ifmediareq *);
 
 static void			hn_ifnet_event(void *, if_t, int);
 static void			hn_ifaddr_event(void *, if_t);
 static void			hn_ifnet_attevent(void *, if_t);
 static void			hn_ifnet_detevent(void *, if_t);
 static void			hn_ifnet_lnkevent(void *, if_t, int);
 
 static bool			hn_ismyvf(const struct hn_softc *,
 				    const if_t);
 static void			hn_rxvf_change(struct hn_softc *,
 				    if_t, bool);
 static void			hn_rxvf_set(struct hn_softc *, if_t);
 static void			hn_rxvf_set_task(void *, int);
 static void			hn_xpnt_vf_input(if_t, struct mbuf *);
 static int			hn_xpnt_vf_iocsetflags(struct hn_softc *);
 static int			hn_xpnt_vf_iocsetcaps(struct hn_softc *,
 				    struct ifreq *);
 static void			hn_xpnt_vf_saveifflags(struct hn_softc *);
 static bool			hn_xpnt_vf_isready(struct hn_softc *);
 static void			hn_xpnt_vf_setready(struct hn_softc *);
 static void			hn_xpnt_vf_init_taskfunc(void *, int);
 static void			hn_xpnt_vf_init(struct hn_softc *);
 static void			hn_xpnt_vf_setenable(struct hn_softc *);
 static void			hn_xpnt_vf_setdisable(struct hn_softc *, bool);
 static void			hn_vf_rss_fixup(struct hn_softc *, bool);
 static void			hn_vf_rss_restore(struct hn_softc *);
 
 static int			hn_rndis_rxinfo(const void *, int,
 				    struct hn_rxinfo *);
 static void			hn_rndis_rx_data(struct hn_rx_ring *,
 				    const void *, int);
 static void			hn_rndis_rx_status(struct hn_softc *,
 				    const void *, int);
 static void			hn_rndis_init_fixat(struct hn_softc *, int);
 
 static void			hn_nvs_handle_notify(struct hn_softc *,
 				    const struct vmbus_chanpkt_hdr *);
 static void			hn_nvs_handle_comp(struct hn_softc *,
 				    struct vmbus_channel *,
 				    const struct vmbus_chanpkt_hdr *);
 static void			hn_nvs_handle_rxbuf(struct hn_rx_ring *,
 				    struct vmbus_channel *,
 				    const struct vmbus_chanpkt_hdr *);
 static void			hn_nvs_ack_rxbuf(struct hn_rx_ring *,
 				    struct vmbus_channel *, uint64_t);
 
 static int			hn_lro_lenlim_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_lro_ackcnt_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_trust_hcsum_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_chim_size_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_rx_stat_u64_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_rx_stat_ulong_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_tx_stat_ulong_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_tx_conf_int_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_ndis_version_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_caps_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_hwassist_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_rxfilter_sysctl(SYSCTL_HANDLER_ARGS);
 #ifndef RSS
 static int			hn_rss_key_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_rss_ind_sysctl(SYSCTL_HANDLER_ARGS);
 #endif
 static int			hn_rss_hash_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_rss_hcap_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_rss_mbuf_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_txagg_size_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_txagg_pkts_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_txagg_pktmax_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_txagg_align_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_polling_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_vf_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_rxvf_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_vflist_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_vfmap_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_xpnt_vf_accbpf_sysctl(SYSCTL_HANDLER_ARGS);
 static int			hn_xpnt_vf_enabled_sysctl(SYSCTL_HANDLER_ARGS);
 
 static void			hn_stop(struct hn_softc *, bool);
 static void			hn_init_locked(struct hn_softc *);
 static int			hn_chan_attach(struct hn_softc *,
 				    struct vmbus_channel *);
 static void			hn_chan_detach(struct hn_softc *,
 				    struct vmbus_channel *);
 static int			hn_attach_subchans(struct hn_softc *);
 static void			hn_detach_allchans(struct hn_softc *);
 static void			hn_chan_rollup(struct hn_rx_ring *,
 				    struct hn_tx_ring *);
 static void			hn_set_ring_inuse(struct hn_softc *, int);
 static int			hn_synth_attach(struct hn_softc *, int);
 static void			hn_synth_detach(struct hn_softc *);
 static int			hn_synth_alloc_subchans(struct hn_softc *,
 				    int *);
 static bool			hn_synth_attachable(const struct hn_softc *);
 static void			hn_suspend(struct hn_softc *);
 static void			hn_suspend_data(struct hn_softc *);
 static void			hn_suspend_mgmt(struct hn_softc *);
 static void			hn_resume(struct hn_softc *);
 static void			hn_resume_data(struct hn_softc *);
 static void			hn_resume_mgmt(struct hn_softc *);
 static void			hn_suspend_mgmt_taskfunc(void *, int);
 static void			hn_chan_drain(struct hn_softc *,
 				    struct vmbus_channel *);
 static void			hn_disable_rx(struct hn_softc *);
 static void			hn_drain_rxtx(struct hn_softc *, int);
 static void			hn_polling(struct hn_softc *, u_int);
 static void			hn_chan_polling(struct vmbus_channel *, u_int);
 static void			hn_mtu_change_fixup(struct hn_softc *);
 
 static void			hn_update_link_status(struct hn_softc *);
 static void			hn_change_network(struct hn_softc *);
 static void			hn_link_taskfunc(void *, int);
 static void			hn_netchg_init_taskfunc(void *, int);
 static void			hn_netchg_status_taskfunc(void *, int);
 static void			hn_link_status(struct hn_softc *);
 
 static int			hn_create_rx_data(struct hn_softc *, int);
 static void			hn_destroy_rx_data(struct hn_softc *);
 static int			hn_check_iplen(const struct mbuf *, int);
 static void			hn_rxpkt_proto(const struct mbuf *, int *, int *);
 static int			hn_set_rxfilter(struct hn_softc *, uint32_t);
 static int			hn_rxfilter_config(struct hn_softc *);
 static int			hn_rss_reconfig(struct hn_softc *);
 static void			hn_rss_ind_fixup(struct hn_softc *);
 static void			hn_rss_mbuf_hash(struct hn_softc *, uint32_t);
 static int			hn_rxpkt(struct hn_rx_ring *);
 static uint32_t			hn_rss_type_fromndis(uint32_t);
 static uint32_t			hn_rss_type_tondis(uint32_t);
 
 static int			hn_tx_ring_create(struct hn_softc *, int);
 static void			hn_tx_ring_destroy(struct hn_tx_ring *);
 static int			hn_create_tx_data(struct hn_softc *, int);
 static void			hn_fixup_tx_data(struct hn_softc *);
 static void			hn_fixup_rx_data(struct hn_softc *);
 static void			hn_destroy_tx_data(struct hn_softc *);
 static void			hn_txdesc_dmamap_destroy(struct hn_txdesc *);
 static void			hn_txdesc_gc(struct hn_tx_ring *,
 				    struct hn_txdesc *);
 static int			hn_encap(if_t, struct hn_tx_ring *,
 				    struct hn_txdesc *, struct mbuf **);
 static int			hn_txpkt(if_t, struct hn_tx_ring *,
 				    struct hn_txdesc *);
 static void			hn_set_chim_size(struct hn_softc *, int);
 static void			hn_set_tso_maxsize(struct hn_softc *, int, int);
 static bool			hn_tx_ring_pending(struct hn_tx_ring *);
 static void			hn_tx_ring_qflush(struct hn_tx_ring *);
 static void			hn_resume_tx(struct hn_softc *, int);
 static void			hn_set_txagg(struct hn_softc *);
 static void			*hn_try_txagg(if_t,
 				    struct hn_tx_ring *, struct hn_txdesc *,
 				    int);
 static int			hn_get_txswq_depth(const struct hn_tx_ring *);
 static void			hn_txpkt_done(struct hn_nvs_sendctx *,
 				    struct hn_softc *, struct vmbus_channel *,
 				    const void *, int);
 static int			hn_txpkt_sglist(struct hn_tx_ring *,
 				    struct hn_txdesc *);
 static int			hn_txpkt_chim(struct hn_tx_ring *,
 				    struct hn_txdesc *);
 static int			hn_xmit(struct hn_tx_ring *, int);
 static void			hn_xmit_taskfunc(void *, int);
 static void			hn_xmit_txeof(struct hn_tx_ring *);
 static void			hn_xmit_txeof_taskfunc(void *, int);
 #ifdef HN_IFSTART_SUPPORT
 static int			hn_start_locked(struct hn_tx_ring *, int);
 static void			hn_start_taskfunc(void *, int);
 static void			hn_start_txeof(struct hn_tx_ring *);
 static void			hn_start_txeof_taskfunc(void *, int);
 #endif
 
 static int			hn_rsc_sysctl(SYSCTL_HANDLER_ARGS);
 
 SYSCTL_NODE(_hw, OID_AUTO, hn, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL,
     "Hyper-V network interface");
 
 /* Trust tcp segment verification on host side. */
 static int			hn_trust_hosttcp = 1;
 SYSCTL_INT(_hw_hn, OID_AUTO, trust_hosttcp, CTLFLAG_RDTUN,
     &hn_trust_hosttcp, 0,
     "Trust tcp segment verification on host side, "
     "when csum info is missing (global setting)");
 
 /* Trust udp datagrams verification on host side. */
 static int			hn_trust_hostudp = 1;
 SYSCTL_INT(_hw_hn, OID_AUTO, trust_hostudp, CTLFLAG_RDTUN,
     &hn_trust_hostudp, 0,
     "Trust udp datagram verification on host side, "
     "when csum info is missing (global setting)");
 
 /* Trust ip packets verification on host side. */
 static int			hn_trust_hostip = 1;
 SYSCTL_INT(_hw_hn, OID_AUTO, trust_hostip, CTLFLAG_RDTUN,
     &hn_trust_hostip, 0,
     "Trust ip packet verification on host side, "
     "when csum info is missing (global setting)");
 
 /*
  * Offload UDP/IPv4 checksum.
  */
 static int			hn_enable_udp4cs = 1;
 SYSCTL_INT(_hw_hn, OID_AUTO, enable_udp4cs, CTLFLAG_RDTUN,
     &hn_enable_udp4cs, 0, "Offload UDP/IPv4 checksum");
 
 /*
  * Offload UDP/IPv6 checksum.
  */
 static int			hn_enable_udp6cs = 1;
 SYSCTL_INT(_hw_hn, OID_AUTO, enable_udp6cs, CTLFLAG_RDTUN,
     &hn_enable_udp6cs, 0, "Offload UDP/IPv6 checksum");
 
 /* Stats. */
 static counter_u64_t		hn_udpcs_fixup;
 SYSCTL_COUNTER_U64(_hw_hn, OID_AUTO, udpcs_fixup, CTLFLAG_RW,
     &hn_udpcs_fixup, "# of UDP checksum fixup");
 
 /*
  * See hn_set_hlen().
  *
  * This value is for Azure.  For Hyper-V, set this above
  * 65536 to disable UDP datagram checksum fixup.
  */
 static int			hn_udpcs_fixup_mtu = 1420;
 SYSCTL_INT(_hw_hn, OID_AUTO, udpcs_fixup_mtu, CTLFLAG_RWTUN,
     &hn_udpcs_fixup_mtu, 0, "UDP checksum fixup MTU threshold");
 
 /* Limit TSO burst size */
 static int			hn_tso_maxlen = IP_MAXPACKET;
 SYSCTL_INT(_hw_hn, OID_AUTO, tso_maxlen, CTLFLAG_RDTUN,
     &hn_tso_maxlen, 0, "TSO burst limit");
 
 /* Limit chimney send size */
 static int			hn_tx_chimney_size = 0;
 SYSCTL_INT(_hw_hn, OID_AUTO, tx_chimney_size, CTLFLAG_RDTUN,
     &hn_tx_chimney_size, 0, "Chimney send packet size limit");
 
 /* Limit the size of packet for direct transmission */
 static int			hn_direct_tx_size = HN_DIRECT_TX_SIZE_DEF;
 SYSCTL_INT(_hw_hn, OID_AUTO, direct_tx_size, CTLFLAG_RDTUN,
     &hn_direct_tx_size, 0, "Size of the packet for direct transmission");
 
 /* # of LRO entries per RX ring */
 #if defined(INET) || defined(INET6)
 static int			hn_lro_entry_count = HN_LROENT_CNT_DEF;
 SYSCTL_INT(_hw_hn, OID_AUTO, lro_entry_count, CTLFLAG_RDTUN,
     &hn_lro_entry_count, 0, "LRO entry count");
 #endif
 
 static int			hn_tx_taskq_cnt = 1;
 SYSCTL_INT(_hw_hn, OID_AUTO, tx_taskq_cnt, CTLFLAG_RDTUN,
     &hn_tx_taskq_cnt, 0, "# of TX taskqueues");
 
 #define HN_TX_TASKQ_M_INDEP	0
 #define HN_TX_TASKQ_M_GLOBAL	1
 #define HN_TX_TASKQ_M_EVTTQ	2
 
 static int			hn_tx_taskq_mode = HN_TX_TASKQ_M_INDEP;
 SYSCTL_INT(_hw_hn, OID_AUTO, tx_taskq_mode, CTLFLAG_RDTUN,
     &hn_tx_taskq_mode, 0, "TX taskqueue modes: "
     "0 - independent, 1 - share global tx taskqs, 2 - share event taskqs");
 
 #ifndef HN_USE_TXDESC_BUFRING
 static int			hn_use_txdesc_bufring = 0;
 #else
 static int			hn_use_txdesc_bufring = 1;
 #endif
 SYSCTL_INT(_hw_hn, OID_AUTO, use_txdesc_bufring, CTLFLAG_RD,
     &hn_use_txdesc_bufring, 0, "Use buf_ring for TX descriptors");
 
 #ifdef HN_IFSTART_SUPPORT
 /* Use ifnet.if_start instead of ifnet.if_transmit */
 static int			hn_use_if_start = 0;
 SYSCTL_INT(_hw_hn, OID_AUTO, use_if_start, CTLFLAG_RDTUN,
     &hn_use_if_start, 0, "Use if_start TX method");
 #endif
 
 /* # of channels to use */
 static int			hn_chan_cnt = 0;
 SYSCTL_INT(_hw_hn, OID_AUTO, chan_cnt, CTLFLAG_RDTUN,
     &hn_chan_cnt, 0,
     "# of channels to use; each channel has one RX ring and one TX ring");
 
 /* # of transmit rings to use */
 static int			hn_tx_ring_cnt = 0;
 SYSCTL_INT(_hw_hn, OID_AUTO, tx_ring_cnt, CTLFLAG_RDTUN,
     &hn_tx_ring_cnt, 0, "# of TX rings to use");
 
 /* Software TX ring deptch */
 static int			hn_tx_swq_depth = 0;
 SYSCTL_INT(_hw_hn, OID_AUTO, tx_swq_depth, CTLFLAG_RDTUN,
     &hn_tx_swq_depth, 0, "Depth of IFQ or BUFRING");
 
 /* Enable sorted LRO, and the depth of the per-channel mbuf queue */
 static u_int			hn_lro_mbufq_depth = 0;
 SYSCTL_UINT(_hw_hn, OID_AUTO, lro_mbufq_depth, CTLFLAG_RDTUN,
     &hn_lro_mbufq_depth, 0, "Depth of LRO mbuf queue");
 
 /* Packet transmission aggregation size limit */
 static int			hn_tx_agg_size = -1;
 SYSCTL_INT(_hw_hn, OID_AUTO, tx_agg_size, CTLFLAG_RDTUN,
     &hn_tx_agg_size, 0, "Packet transmission aggregation size limit");
 
 /* Packet transmission aggregation count limit */
 static int			hn_tx_agg_pkts = -1;
 SYSCTL_INT(_hw_hn, OID_AUTO, tx_agg_pkts, CTLFLAG_RDTUN,
     &hn_tx_agg_pkts, 0, "Packet transmission aggregation packet limit");
 
 /* VF list */
 SYSCTL_PROC(_hw_hn, OID_AUTO, vflist,
     CTLFLAG_RD | CTLTYPE_STRING | CTLFLAG_NEEDGIANT, 0, 0,
     hn_vflist_sysctl, "A",
     "VF list");
 
 /* VF mapping */
 SYSCTL_PROC(_hw_hn, OID_AUTO, vfmap,
     CTLFLAG_RD | CTLTYPE_STRING | CTLFLAG_NEEDGIANT, 0, 0,
     hn_vfmap_sysctl, "A",
     "VF mapping");
 
 /* Transparent VF */
 static int			hn_xpnt_vf = 1;
 SYSCTL_INT(_hw_hn, OID_AUTO, vf_transparent, CTLFLAG_RDTUN,
     &hn_xpnt_vf, 0, "Transparent VF mod");
 
 /* Accurate BPF support for Transparent VF */
 static int			hn_xpnt_vf_accbpf = 0;
 SYSCTL_INT(_hw_hn, OID_AUTO, vf_xpnt_accbpf, CTLFLAG_RDTUN,
     &hn_xpnt_vf_accbpf, 0, "Accurate BPF for transparent VF");
 
 /* Extra wait for transparent VF attach routing; unit seconds. */
 static int			hn_xpnt_vf_attwait = HN_XPNT_VF_ATTWAIT_MIN;
 SYSCTL_INT(_hw_hn, OID_AUTO, vf_xpnt_attwait, CTLFLAG_RWTUN,
     &hn_xpnt_vf_attwait, 0,
     "Extra wait for transparent VF attach routing; unit: seconds");
 
 static u_int			hn_cpu_index;	/* next CPU for channel */
 static struct taskqueue		**hn_tx_taskque;/* shared TX taskqueues */
 
 static struct rmlock		hn_vfmap_lock;
 static int			hn_vfmap_size;
 static if_t			*hn_vfmap;
 
 #ifndef RSS
 static const uint8_t
 hn_rss_key_default[NDIS_HASH_KEYSIZE_TOEPLITZ] = {
 	0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2,
 	0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0,
 	0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x30, 0xb4,
 	0x77, 0xcb, 0x2d, 0xa3, 0x80, 0x30, 0xf2, 0x0c,
 	0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa
 };
 #endif	/* !RSS */
 
 static const struct hyperv_guid	hn_guid = {
 	.hv_guid = {
 	    0x63, 0x51, 0x61, 0xf8, 0x3e, 0xdf, 0xc5, 0x46,
 	    0x91, 0x3f, 0xf2, 0xd2, 0xf9, 0x65, 0xed, 0x0e }
 };
 
 static device_method_t hn_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		hn_probe),
 	DEVMETHOD(device_attach,	hn_attach),
 	DEVMETHOD(device_detach,	hn_detach),
 	DEVMETHOD(device_shutdown,	hn_shutdown),
 	DEVMETHOD_END
 };
 
 static driver_t hn_driver = {
 	"hn",
 	hn_methods,
 	sizeof(struct hn_softc)
 };
 
 DRIVER_MODULE(hn, vmbus, hn_driver, 0, 0);
 MODULE_VERSION(hn, 1);
 MODULE_DEPEND(hn, vmbus, 1, 1, 1);
 
 static void
 hn_set_lro_lenlim(struct hn_softc *sc, int lenlim)
 {
 	int i;
 
 	for (i = 0; i < sc->hn_rx_ring_cnt; ++i)
 		sc->hn_rx_ring[i].hn_lro.lro_length_lim = lenlim;
 }
 
 static int
 hn_txpkt_sglist(struct hn_tx_ring *txr, struct hn_txdesc *txd)
 {
 
 	KASSERT(txd->chim_index == HN_NVS_CHIM_IDX_INVALID &&
 	    txd->chim_size == 0, ("invalid rndis sglist txd"));
 	return (hn_nvs_send_rndis_sglist(txr->hn_chan, HN_NVS_RNDIS_MTYPE_DATA,
 	    &txd->send_ctx, txr->hn_gpa, txr->hn_gpa_cnt));
 }
 
 static int
 hn_txpkt_chim(struct hn_tx_ring *txr, struct hn_txdesc *txd)
 {
 	struct hn_nvs_rndis rndis;
 
 	KASSERT(txd->chim_index != HN_NVS_CHIM_IDX_INVALID &&
 	    txd->chim_size > 0, ("invalid rndis chim txd"));
 
 	rndis.nvs_type = HN_NVS_TYPE_RNDIS;
 	rndis.nvs_rndis_mtype = HN_NVS_RNDIS_MTYPE_DATA;
 	rndis.nvs_chim_idx = txd->chim_index;
 	rndis.nvs_chim_sz = txd->chim_size;
 
 	return (hn_nvs_send(txr->hn_chan, VMBUS_CHANPKT_FLAG_RC,
 	    &rndis, sizeof(rndis), &txd->send_ctx));
 }
 
 static __inline uint32_t
 hn_chim_alloc(struct hn_softc *sc)
 {
 	int i, bmap_cnt = sc->hn_chim_bmap_cnt;
 	u_long *bmap = sc->hn_chim_bmap;
 	uint32_t ret = HN_NVS_CHIM_IDX_INVALID;
 
 	for (i = 0; i < bmap_cnt; ++i) {
 		int idx;
 
 		idx = ffsl(~bmap[i]);
 		if (idx == 0)
 			continue;
 
 		--idx; /* ffsl is 1-based */
 		KASSERT(i * LONG_BIT + idx < sc->hn_chim_cnt,
 		    ("invalid i %d and idx %d", i, idx));
 
 		if (atomic_testandset_long(&bmap[i], idx))
 			continue;
 
 		ret = i * LONG_BIT + idx;
 		break;
 	}
 	return (ret);
 }
 
 static __inline void
 hn_chim_free(struct hn_softc *sc, uint32_t chim_idx)
 {
 	u_long mask;
 	uint32_t idx;
 
 	idx = chim_idx / LONG_BIT;
 	KASSERT(idx < sc->hn_chim_bmap_cnt,
 	    ("invalid chimney index 0x%x", chim_idx));
 
 	mask = 1UL << (chim_idx % LONG_BIT);
 	KASSERT(sc->hn_chim_bmap[idx] & mask,
 	    ("index bitmap 0x%lx, chimney index %u, "
 	     "bitmap idx %d, bitmask 0x%lx",
 	     sc->hn_chim_bmap[idx], chim_idx, idx, mask));
 
 	atomic_clear_long(&sc->hn_chim_bmap[idx], mask);
 }
 
 #if defined(INET6) || defined(INET)
 
 #define PULLUP_HDR(m, len)				\
 do {							\
 	if (__predict_false((m)->m_len < (len))) {	\
 		(m) = m_pullup((m), (len));		\
 		if ((m) == NULL)			\
 			return (NULL);			\
 	}						\
 } while (0)
 
 /*
  * NOTE: If this function failed, the m_head would be freed.
  */
 static __inline struct mbuf *
 hn_tso_fixup(struct mbuf *m_head)
 {
 	struct ether_vlan_header *evl;
 	struct tcphdr *th;
 	int ehlen;
 
 	KASSERT(M_WRITABLE(m_head), ("TSO mbuf not writable"));
 
 	PULLUP_HDR(m_head, sizeof(*evl));
 	evl = mtod(m_head, struct ether_vlan_header *);
 	if (evl->evl_encap_proto == ntohs(ETHERTYPE_VLAN))
 		ehlen = ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN;
 	else
 		ehlen = ETHER_HDR_LEN;
 	m_head->m_pkthdr.l2hlen = ehlen;
 
 #ifdef INET
 	if (m_head->m_pkthdr.csum_flags & CSUM_IP_TSO) {
 		struct ip *ip;
 		int iphlen;
 
 		PULLUP_HDR(m_head, ehlen + sizeof(*ip));
 		ip = mtodo(m_head, ehlen);
 		iphlen = ip->ip_hl << 2;
 		m_head->m_pkthdr.l3hlen = iphlen;
 
 		PULLUP_HDR(m_head, ehlen + iphlen + sizeof(*th));
 		th = mtodo(m_head, ehlen + iphlen);
 
 		ip->ip_len = 0;
 		ip->ip_sum = 0;
 		th->th_sum = in_pseudo(ip->ip_src.s_addr,
 		    ip->ip_dst.s_addr, htons(IPPROTO_TCP));
 	}
 #endif
 #if defined(INET6) && defined(INET)
 	else
 #endif
 #ifdef INET6
 	{
 		struct ip6_hdr *ip6;
 
 		PULLUP_HDR(m_head, ehlen + sizeof(*ip6));
 		ip6 = mtodo(m_head, ehlen);
 		if (ip6->ip6_nxt != IPPROTO_TCP) {
 			m_freem(m_head);
 			return (NULL);
 		}
 		m_head->m_pkthdr.l3hlen = sizeof(*ip6);
 
 		PULLUP_HDR(m_head, ehlen + sizeof(*ip6) + sizeof(*th));
 		th = mtodo(m_head, ehlen + sizeof(*ip6));
 
 		ip6->ip6_plen = 0;
 		th->th_sum = in6_cksum_pseudo(ip6, 0, IPPROTO_TCP, 0);
 	}
 #endif
 	return (m_head);
 }
 
 /*
  * NOTE: If this function failed, the m_head would be freed.
  */
 static __inline struct mbuf *
 hn_set_hlen(struct mbuf *m_head)
 {
 	const struct ether_vlan_header *evl;
 	int ehlen;
 
 	PULLUP_HDR(m_head, sizeof(*evl));
 	evl = mtod(m_head, const struct ether_vlan_header *);
 	if (evl->evl_encap_proto == ntohs(ETHERTYPE_VLAN))
 		ehlen = ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN;
 	else
 		ehlen = ETHER_HDR_LEN;
 	m_head->m_pkthdr.l2hlen = ehlen;
 
 #ifdef INET
 	if (m_head->m_pkthdr.csum_flags & (CSUM_IP_TCP | CSUM_IP_UDP)) {
 		const struct ip *ip;
 		int iphlen;
 
 		PULLUP_HDR(m_head, ehlen + sizeof(*ip));
 		ip = mtodo(m_head, ehlen);
 		iphlen = ip->ip_hl << 2;
 		m_head->m_pkthdr.l3hlen = iphlen;
 
 		/*
 		 * UDP checksum offload does not work in Azure, if the
 		 * following conditions meet:
 		 * - sizeof(IP hdr + UDP hdr + payload) > 1420.
 		 * - IP_DF is not set in the IP hdr.
 		 *
 		 * Fallback to software checksum for these UDP datagrams.
 		 */
 		if ((m_head->m_pkthdr.csum_flags & CSUM_IP_UDP) &&
 		    m_head->m_pkthdr.len > hn_udpcs_fixup_mtu + ehlen &&
 		    (ntohs(ip->ip_off) & IP_DF) == 0) {
 			uint16_t off = ehlen + iphlen;
 
 			counter_u64_add(hn_udpcs_fixup, 1);
 			PULLUP_HDR(m_head, off + sizeof(struct udphdr));
 			*(uint16_t *)(m_head->m_data + off +
                             m_head->m_pkthdr.csum_data) = in_cksum_skip(
 			    m_head, m_head->m_pkthdr.len, off);
 			m_head->m_pkthdr.csum_flags &= ~CSUM_IP_UDP;
 		}
 	}
 #endif
 #if defined(INET6) && defined(INET)
 	else
 #endif
 #ifdef INET6
 	{
 		const struct ip6_hdr *ip6;
 
 		PULLUP_HDR(m_head, ehlen + sizeof(*ip6));
 		ip6 = mtodo(m_head, ehlen);
 		if (ip6->ip6_nxt != IPPROTO_TCP &&
 		    ip6->ip6_nxt != IPPROTO_UDP) {
 			m_freem(m_head);
 			return (NULL);
 		}
 		m_head->m_pkthdr.l3hlen = sizeof(*ip6);
 	}
 #endif
 	return (m_head);
 }
 
 /*
  * NOTE: If this function failed, the m_head would be freed.
  */
 static __inline struct mbuf *
 hn_check_tcpsyn(struct mbuf *m_head, int *tcpsyn)
 {
 	const struct tcphdr *th;
 	int ehlen, iphlen;
 
 	*tcpsyn = 0;
 	ehlen = m_head->m_pkthdr.l2hlen;
 	iphlen = m_head->m_pkthdr.l3hlen;
 
 	PULLUP_HDR(m_head, ehlen + iphlen + sizeof(*th));
 	th = mtodo(m_head, ehlen + iphlen);
 	if (th->th_flags & TH_SYN)
 		*tcpsyn = 1;
 	return (m_head);
 }
 
 #undef PULLUP_HDR
 
 #endif	/* INET6 || INET */
 
 static int
 hn_set_rxfilter(struct hn_softc *sc, uint32_t filter)
 {
 	int error = 0;
 
 	HN_LOCK_ASSERT(sc);
 
 	if (sc->hn_rx_filter != filter) {
 		error = hn_rndis_set_rxfilter(sc, filter);
 		if (!error)
 			sc->hn_rx_filter = filter;
 	}
 	return (error);
 }
 
 static int
 hn_rxfilter_config(struct hn_softc *sc)
 {
 	if_t ifp = sc->hn_ifp;
 	uint32_t filter;
 
 	HN_LOCK_ASSERT(sc);
 
 	/*
 	 * If the non-transparent mode VF is activated, we don't know how
 	 * its RX filter is configured, so stick the synthetic device in
 	 * the promiscous mode.
 	 */
 	if ((if_getflags(ifp) & IFF_PROMISC) || (sc->hn_flags & HN_FLAG_RXVF)) {
 		filter = NDIS_PACKET_TYPE_PROMISCUOUS;
 	} else {
 		filter = NDIS_PACKET_TYPE_DIRECTED;
 		if (if_getflags(ifp) & IFF_BROADCAST)
 			filter |= NDIS_PACKET_TYPE_BROADCAST;
 		/* TODO: support multicast list */
 		if ((if_getflags(ifp) & IFF_ALLMULTI) ||
 		    !if_maddr_empty(ifp))
 			filter |= NDIS_PACKET_TYPE_ALL_MULTICAST;
 	}
 	return (hn_set_rxfilter(sc, filter));
 }
 
 static void
 hn_set_txagg(struct hn_softc *sc)
 {
 	uint32_t size, pkts;
 	int i;
 
 	/*
 	 * Setup aggregation size.
 	 */
 	if (sc->hn_agg_size < 0)
 		size = UINT32_MAX;
 	else
 		size = sc->hn_agg_size;
 
 	if (sc->hn_rndis_agg_size < size)
 		size = sc->hn_rndis_agg_size;
 
 	/* NOTE: We only aggregate packets using chimney sending buffers. */
 	if (size > (uint32_t)sc->hn_chim_szmax)
 		size = sc->hn_chim_szmax;
 
 	if (size <= 2 * HN_PKTSIZE_MIN(sc->hn_rndis_agg_align)) {
 		/* Disable */
 		size = 0;
 		pkts = 0;
 		goto done;
 	}
 
 	/* NOTE: Type of the per TX ring setting is 'int'. */
 	if (size > INT_MAX)
 		size = INT_MAX;
 
 	/*
 	 * Setup aggregation packet count.
 	 */
 	if (sc->hn_agg_pkts < 0)
 		pkts = UINT32_MAX;
 	else
 		pkts = sc->hn_agg_pkts;
 
 	if (sc->hn_rndis_agg_pkts < pkts)
 		pkts = sc->hn_rndis_agg_pkts;
 
 	if (pkts <= 1) {
 		/* Disable */
 		size = 0;
 		pkts = 0;
 		goto done;
 	}
 
 	/* NOTE: Type of the per TX ring setting is 'short'. */
 	if (pkts > SHRT_MAX)
 		pkts = SHRT_MAX;
 
 done:
 	/* NOTE: Type of the per TX ring setting is 'short'. */
 	if (sc->hn_rndis_agg_align > SHRT_MAX) {
 		/* Disable */
 		size = 0;
 		pkts = 0;
 	}
 
 	if (bootverbose) {
 		if_printf(sc->hn_ifp, "TX agg size %u, pkts %u, align %u\n",
 		    size, pkts, sc->hn_rndis_agg_align);
 	}
 
 	for (i = 0; i < sc->hn_tx_ring_cnt; ++i) {
 		struct hn_tx_ring *txr = &sc->hn_tx_ring[i];
 
 		mtx_lock(&txr->hn_tx_lock);
 		txr->hn_agg_szmax = size;
 		txr->hn_agg_pktmax = pkts;
 		txr->hn_agg_align = sc->hn_rndis_agg_align;
 		mtx_unlock(&txr->hn_tx_lock);
 	}
 }
 
 static int
 hn_get_txswq_depth(const struct hn_tx_ring *txr)
 {
 
 	KASSERT(txr->hn_txdesc_cnt > 0, ("tx ring is not setup yet"));
 	if (hn_tx_swq_depth < txr->hn_txdesc_cnt)
 		return txr->hn_txdesc_cnt;
 	return hn_tx_swq_depth;
 }
 
 static int
 hn_rss_reconfig(struct hn_softc *sc)
 {
 	int error;
 
 	HN_LOCK_ASSERT(sc);
 
 	if ((sc->hn_flags & HN_FLAG_SYNTH_ATTACHED) == 0)
 		return (ENXIO);
 
 	/*
 	 * Disable RSS first.
 	 *
 	 * NOTE:
 	 * Direct reconfiguration by setting the UNCHG flags does
 	 * _not_ work properly.
 	 */
 	if (bootverbose)
 		if_printf(sc->hn_ifp, "disable RSS\n");
 	error = hn_rndis_conf_rss(sc, NDIS_RSS_FLAG_DISABLE);
 	if (error) {
 		if_printf(sc->hn_ifp, "RSS disable failed\n");
 		return (error);
 	}
 
 	/*
 	 * Reenable the RSS w/ the updated RSS key or indirect
 	 * table.
 	 */
 	if (bootverbose)
 		if_printf(sc->hn_ifp, "reconfig RSS\n");
 	error = hn_rndis_conf_rss(sc, NDIS_RSS_FLAG_NONE);
 	if (error) {
 		if_printf(sc->hn_ifp, "RSS reconfig failed\n");
 		return (error);
 	}
 	return (0);
 }
 
 static void
 hn_rss_ind_fixup(struct hn_softc *sc)
 {
 	struct ndis_rssprm_toeplitz *rss = &sc->hn_rss;
 	int i, nchan;
 
 	nchan = sc->hn_rx_ring_inuse;
 	KASSERT(nchan > 1, ("invalid # of channels %d", nchan));
 
 	/*
 	 * Check indirect table to make sure that all channels in it
 	 * can be used.
 	 */
 	for (i = 0; i < NDIS_HASH_INDCNT; ++i) {
 		if (rss->rss_ind[i] >= nchan) {
 			if_printf(sc->hn_ifp,
 			    "RSS indirect table %d fixup: %u -> %d\n",
 			    i, rss->rss_ind[i], nchan - 1);
 			rss->rss_ind[i] = nchan - 1;
 		}
 	}
 }
 
 static int
 hn_ifmedia_upd(if_t ifp __unused)
 {
 
 	/* Ignore since autoselect is the only defined and valid media */
 	return (0);
 }
 
 static void
 hn_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr)
 {
 	struct hn_softc *sc = if_getsoftc(ifp);
 
 	ifmr->ifm_status = IFM_AVALID;
 	ifmr->ifm_active = IFM_ETHER;
 
 	if ((sc->hn_link_flags & HN_LINK_FLAG_LINKUP) == 0) {
 		ifmr->ifm_active |= IFM_NONE;
 		return;
 	}
 	ifmr->ifm_status |= IFM_ACTIVE;
 	ifmr->ifm_active |= IFM_10G_T | IFM_FDX;
 }
 
 static void
 hn_rxvf_set_task(void *xarg, int pending __unused)
 {
 	struct hn_rxvf_setarg *arg = xarg;
 
 	arg->rxr->hn_rxvf_ifp = arg->vf_ifp;
 }
 
 static void
 hn_rxvf_set(struct hn_softc *sc, if_t vf_ifp)
 {
 	struct hn_rx_ring *rxr;
 	struct hn_rxvf_setarg arg;
 	struct task task;
 	int i;
 
 	HN_LOCK_ASSERT(sc);
 
 	TASK_INIT(&task, 0, hn_rxvf_set_task, &arg);
 
 	for (i = 0; i < sc->hn_rx_ring_cnt; ++i) {
 		rxr = &sc->hn_rx_ring[i];
 
 		if (i < sc->hn_rx_ring_inuse) {
 			arg.rxr = rxr;
 			arg.vf_ifp = vf_ifp;
 			vmbus_chan_run_task(rxr->hn_chan, &task);
 		} else {
 			rxr->hn_rxvf_ifp = vf_ifp;
 		}
 	}
 }
 
 static bool
 hn_ismyvf(const struct hn_softc *sc, const if_t ifp)
 {
 	if_t hn_ifp;
 
 	hn_ifp = sc->hn_ifp;
 
 	if (ifp == hn_ifp)
 		return (false);
 
 	if (if_getalloctype(ifp) != IFT_ETHER)
 		return (false);
 
 	/* Ignore lagg/vlan interfaces */
 	if (strcmp(if_getdname(ifp), "lagg") == 0 ||
 	    strcmp(if_getdname(ifp), "vlan") == 0)
 		return (false);
 
 	/*
 	 * During detach events if_getifaddr(ifp) might be NULL.
 	 * Make sure the bcmp() below doesn't panic on that:
 	 */
 	if (if_getifaddr(ifp) == NULL || if_getifaddr(hn_ifp) == NULL)
 		return (false);
 
 	if (bcmp(if_getlladdr(ifp), if_getlladdr(hn_ifp), ETHER_ADDR_LEN) != 0)
 		return (false);
 
 	return (true);
 }
 
 static void
 hn_rxvf_change(struct hn_softc *sc, if_t ifp, bool rxvf)
 {
 	if_t hn_ifp;
 
 	HN_LOCK(sc);
 
 	if (!(sc->hn_flags & HN_FLAG_SYNTH_ATTACHED))
 		goto out;
 
 	if (!hn_ismyvf(sc, ifp))
 		goto out;
 	hn_ifp = sc->hn_ifp;
 
 	if (rxvf) {
 		if (sc->hn_flags & HN_FLAG_RXVF)
 			goto out;
 
 		sc->hn_flags |= HN_FLAG_RXVF;
 		hn_rxfilter_config(sc);
 	} else {
 		if (!(sc->hn_flags & HN_FLAG_RXVF))
 			goto out;
 
 		sc->hn_flags &= ~HN_FLAG_RXVF;
 		if (if_getdrvflags(hn_ifp) & IFF_DRV_RUNNING)
 			hn_rxfilter_config(sc);
 		else
 			hn_set_rxfilter(sc, NDIS_PACKET_TYPE_NONE);
 	}
 
 	hn_nvs_set_datapath(sc,
 	    rxvf ? HN_NVS_DATAPATH_VF : HN_NVS_DATAPATH_SYNTH);
 
 	hn_rxvf_set(sc, rxvf ? ifp : NULL);
 
 	if (rxvf) {
 		hn_vf_rss_fixup(sc, true);
 		hn_suspend_mgmt(sc);
 		sc->hn_link_flags &=
 		    ~(HN_LINK_FLAG_LINKUP | HN_LINK_FLAG_NETCHG);
 		if_link_state_change(hn_ifp, LINK_STATE_DOWN);
 	} else {
 		hn_vf_rss_restore(sc);
 		hn_resume_mgmt(sc);
 	}
 
 	devctl_notify("HYPERV_NIC_VF", if_name(hn_ifp),
 	    rxvf ? "VF_UP" : "VF_DOWN", NULL);
 
 	if (bootverbose) {
 		if_printf(hn_ifp, "datapath is switched %s %s\n",
 		    rxvf ? "to" : "from", if_name(ifp));
 	}
 out:
 	HN_UNLOCK(sc);
 }
 
 static void
 hn_ifnet_event(void *arg, if_t ifp, int event)
 {
 
 	if (event != IFNET_EVENT_UP && event != IFNET_EVENT_DOWN)
 		return;
 	hn_rxvf_change(arg, ifp, event == IFNET_EVENT_UP);
 }
 
 static void
 hn_ifaddr_event(void *arg, if_t ifp)
 {
 
 	hn_rxvf_change(arg, ifp, if_getflags(ifp) & IFF_UP);
 }
 
 static int
 hn_xpnt_vf_iocsetcaps(struct hn_softc *sc, struct ifreq *ifr __unused)
 {
 	if_t ifp, vf_ifp;
 
 	HN_LOCK_ASSERT(sc);
 	ifp = sc->hn_ifp;
 	vf_ifp = sc->hn_vf_ifp;
 
 	/*
 	 * Just sync up with VF's enabled capabilities.
 	 */
 	if_setcapenable(ifp, if_getcapenable(vf_ifp));
 	if_sethwassist(ifp, if_gethwassist(vf_ifp));
 
 	return (0);
 }
 
 static int
 hn_xpnt_vf_iocsetflags(struct hn_softc *sc)
 {
 	if_t vf_ifp;
 	struct ifreq ifr;
 
 	HN_LOCK_ASSERT(sc);
 	vf_ifp = sc->hn_vf_ifp;
 
 	memset(&ifr, 0, sizeof(ifr));
 	strlcpy(ifr.ifr_name, if_name(vf_ifp), sizeof(ifr.ifr_name));
 	ifr.ifr_flags = if_getflags(vf_ifp) & 0xffff;
 	ifr.ifr_flagshigh = if_getflags(vf_ifp) >> 16;
 	return (ifhwioctl(SIOCSIFFLAGS, vf_ifp, (caddr_t)&ifr, curthread));
 }
 
 static void
 hn_xpnt_vf_saveifflags(struct hn_softc *sc)
 {
 	if_t ifp = sc->hn_ifp;
 	int allmulti = 0;
 
 	HN_LOCK_ASSERT(sc);
 
 	/* XXX vlan(4) style mcast addr maintenance */
 	if (!if_maddr_empty(ifp))
 		allmulti = IFF_ALLMULTI;
 
 	/* Always set the VF's if_flags */
 	if_setflags(sc->hn_vf_ifp, if_getflags(ifp) | allmulti);
 }
 
 static void
 hn_xpnt_vf_input(if_t vf_ifp, struct mbuf *m)
 {
 	struct rm_priotracker pt;
 	if_t hn_ifp = NULL;
 	struct mbuf *mn;
 
 	/*
 	 * XXX racy, if hn(4) ever detached.
 	 */
 	rm_rlock(&hn_vfmap_lock, &pt);
 	if (if_getindex(vf_ifp) < hn_vfmap_size)
 		hn_ifp = hn_vfmap[if_getindex(vf_ifp)];
 	rm_runlock(&hn_vfmap_lock, &pt);
 
 	if (hn_ifp != NULL) {
 		for (mn = m; mn != NULL; mn = mn->m_nextpkt) {
 			/*
 			 * Allow tapping on the VF.
 			 */
 			ETHER_BPF_MTAP(vf_ifp, mn);
 
 			/*
 			 * Update VF stats.
 			 */
 			if ((if_getcapenable(vf_ifp) & IFCAP_HWSTATS) == 0) {
 				if_inc_counter(vf_ifp, IFCOUNTER_IBYTES,
 				    mn->m_pkthdr.len);
 			}
 			/*
 			 * XXX IFCOUNTER_IMCAST
 			 * This stat updating is kinda invasive, since it
 			 * requires two checks on the mbuf: the length check
 			 * and the ethernet header check.  As of this write,
 			 * all multicast packets go directly to hn(4), which
 			 * makes imcast stat updating in the VF a try in vian.
 			 */
 
 			/*
 			 * Fix up rcvif and increase hn(4)'s ipackets.
 			 */
 			mn->m_pkthdr.rcvif = hn_ifp;
 			if_inc_counter(hn_ifp, IFCOUNTER_IPACKETS, 1);
 		}
 		/*
 		 * Go through hn(4)'s if_input.
 		 */
 		if_input(hn_ifp, m);
 	} else {
 		/*
 		 * In the middle of the transition; free this
 		 * mbuf chain.
 		 */
 		while (m != NULL) {
 			mn = m->m_nextpkt;
 			m->m_nextpkt = NULL;
 			m_freem(m);
 			m = mn;
 		}
 	}
 }
 
 static void
 hn_mtu_change_fixup(struct hn_softc *sc)
 {
 	if_t ifp;
 
 	HN_LOCK_ASSERT(sc);
 	ifp = sc->hn_ifp;
 
 	hn_set_tso_maxsize(sc, hn_tso_maxlen, if_getmtu(ifp));
 	if (sc->hn_rx_ring[0].hn_lro.lro_length_lim < HN_LRO_LENLIM_MIN(ifp))
 		hn_set_lro_lenlim(sc, HN_LRO_LENLIM_MIN(ifp));
 }
 
 static uint32_t
 hn_rss_type_fromndis(uint32_t rss_hash)
 {
 	uint32_t types = 0;
 
 	if (rss_hash & NDIS_HASH_IPV4)
 		types |= RSS_TYPE_IPV4;
 	if (rss_hash & NDIS_HASH_TCP_IPV4)
 		types |= RSS_TYPE_TCP_IPV4;
 	if (rss_hash & NDIS_HASH_IPV6)
 		types |= RSS_TYPE_IPV6;
 	if (rss_hash & NDIS_HASH_IPV6_EX)
 		types |= RSS_TYPE_IPV6_EX;
 	if (rss_hash & NDIS_HASH_TCP_IPV6)
 		types |= RSS_TYPE_TCP_IPV6;
 	if (rss_hash & NDIS_HASH_TCP_IPV6_EX)
 		types |= RSS_TYPE_TCP_IPV6_EX;
 	if (rss_hash & NDIS_HASH_UDP_IPV4_X)
 		types |= RSS_TYPE_UDP_IPV4;
 	return (types);
 }
 
 static uint32_t
 hn_rss_type_tondis(uint32_t types)
 {
 	uint32_t rss_hash = 0;
 
 	KASSERT((types & (RSS_TYPE_UDP_IPV6 | RSS_TYPE_UDP_IPV6_EX)) == 0,
 	    ("UDP6 and UDP6EX are not supported"));
 
 	if (types & RSS_TYPE_IPV4)
 		rss_hash |= NDIS_HASH_IPV4;
 	if (types & RSS_TYPE_TCP_IPV4)
 		rss_hash |= NDIS_HASH_TCP_IPV4;
 	if (types & RSS_TYPE_IPV6)
 		rss_hash |= NDIS_HASH_IPV6;
 	if (types & RSS_TYPE_IPV6_EX)
 		rss_hash |= NDIS_HASH_IPV6_EX;
 	if (types & RSS_TYPE_TCP_IPV6)
 		rss_hash |= NDIS_HASH_TCP_IPV6;
 	if (types & RSS_TYPE_TCP_IPV6_EX)
 		rss_hash |= NDIS_HASH_TCP_IPV6_EX;
 	if (types & RSS_TYPE_UDP_IPV4)
 		rss_hash |= NDIS_HASH_UDP_IPV4_X;
 	return (rss_hash);
 }
 
 static void
 hn_rss_mbuf_hash(struct hn_softc *sc, uint32_t mbuf_hash)
 {
 	int i;
 
 	HN_LOCK_ASSERT(sc);
 
 	for (i = 0; i < sc->hn_rx_ring_cnt; ++i)
 		sc->hn_rx_ring[i].hn_mbuf_hash = mbuf_hash;
 }
 
 static void
 hn_vf_rss_fixup(struct hn_softc *sc, bool reconf)
 {
 	if_t ifp, vf_ifp;
 	struct ifrsshash ifrh;
 	struct ifrsskey ifrk;
 	int error;
 	uint32_t my_types, diff_types, mbuf_types = 0;
 
 	HN_LOCK_ASSERT(sc);
 	KASSERT(sc->hn_flags & HN_FLAG_SYNTH_ATTACHED,
 	    ("%s: synthetic parts are not attached", if_name(sc->hn_ifp)));
 
 	if (sc->hn_rx_ring_inuse == 1) {
 		/* No RSS on synthetic parts; done. */
 		return;
 	}
 	if ((sc->hn_rss_hcap & NDIS_HASH_FUNCTION_TOEPLITZ) == 0) {
 		/* Synthetic parts do not support Toeplitz; done. */
 		return;
 	}
 
 	ifp = sc->hn_ifp;
 	vf_ifp = sc->hn_vf_ifp;
 
 	/*
 	 * Extract VF's RSS key.  Only 40 bytes key for Toeplitz is
 	 * supported.
 	 */
 	memset(&ifrk, 0, sizeof(ifrk));
 	strlcpy(ifrk.ifrk_name, if_name(vf_ifp), sizeof(ifrk.ifrk_name));
 	error = ifhwioctl(SIOCGIFRSSKEY, vf_ifp, (caddr_t)&ifrk, curthread);
 	if (error) {
 		if_printf(ifp, "%s SIOCGIFRSSKEY failed: %d\n",
 		    if_name(vf_ifp), error);
 		goto done;
 	}
 	if (ifrk.ifrk_func != RSS_FUNC_TOEPLITZ) {
 		if_printf(ifp, "%s RSS function %u is not Toeplitz\n",
 		    if_name(vf_ifp), ifrk.ifrk_func);
 		goto done;
 	}
 	if (ifrk.ifrk_keylen != NDIS_HASH_KEYSIZE_TOEPLITZ) {
 		if_printf(ifp, "%s invalid RSS Toeplitz key length %d\n",
 		    if_name(vf_ifp), ifrk.ifrk_keylen);
 		goto done;
 	}
 
 	/*
 	 * Extract VF's RSS hash.  Only Toeplitz is supported.
 	 */
 	memset(&ifrh, 0, sizeof(ifrh));
 	strlcpy(ifrh.ifrh_name, if_name(vf_ifp), sizeof(ifrh.ifrh_name));
 	error = ifhwioctl(SIOCGIFRSSHASH, vf_ifp, (caddr_t)&ifrh, curthread);
 	if (error) {
 		if_printf(ifp, "%s SIOCGRSSHASH failed: %d\n",
 		    if_name(vf_ifp), error);
 		goto done;
 	}
 	if (ifrh.ifrh_func != RSS_FUNC_TOEPLITZ) {
 		if_printf(ifp, "%s RSS function %u is not Toeplitz\n",
 		    if_name(vf_ifp), ifrh.ifrh_func);
 		goto done;
 	}
 
 	my_types = hn_rss_type_fromndis(sc->hn_rss_hcap);
 	if ((ifrh.ifrh_types & my_types) == 0) {
 		/* This disables RSS; ignore it then */
 		if_printf(ifp, "%s intersection of RSS types failed.  "
 		    "VF %#x, mine %#x\n", if_name(vf_ifp),
 		    ifrh.ifrh_types, my_types);
 		goto done;
 	}
 
 	diff_types = my_types ^ ifrh.ifrh_types;
 	my_types &= ifrh.ifrh_types;
 	mbuf_types = my_types;
 
 	/*
 	 * Detect RSS hash value/type confliction.
 	 *
 	 * NOTE:
 	 * We don't disable the hash type, but stop delivery the hash
 	 * value/type through mbufs on RX path.
 	 *
 	 * XXX If HN_CAP_UDPHASH is set in hn_caps, then UDP 4-tuple
 	 * hash is delivered with type of TCP_IPV4.  This means if
 	 * UDP_IPV4 is enabled, then TCP_IPV4 should be forced, at
 	 * least to hn_mbuf_hash.  However, given that _all_ of the
 	 * NICs implement TCP_IPV4, this will _not_ impose any issues
 	 * here.
 	 */
 	if ((my_types & RSS_TYPE_IPV4) &&
 	    (diff_types & ifrh.ifrh_types &
 	     (RSS_TYPE_TCP_IPV4 | RSS_TYPE_UDP_IPV4))) {
 		/* Conflict; disable IPV4 hash type/value delivery. */
 		if_printf(ifp, "disable IPV4 mbuf hash delivery\n");
 		mbuf_types &= ~RSS_TYPE_IPV4;
 	}
 	if ((my_types & RSS_TYPE_IPV6) &&
 	    (diff_types & ifrh.ifrh_types &
 	     (RSS_TYPE_TCP_IPV6 | RSS_TYPE_UDP_IPV6 |
 	      RSS_TYPE_TCP_IPV6_EX | RSS_TYPE_UDP_IPV6_EX |
 	      RSS_TYPE_IPV6_EX))) {
 		/* Conflict; disable IPV6 hash type/value delivery. */
 		if_printf(ifp, "disable IPV6 mbuf hash delivery\n");
 		mbuf_types &= ~RSS_TYPE_IPV6;
 	}
 	if ((my_types & RSS_TYPE_IPV6_EX) &&
 	    (diff_types & ifrh.ifrh_types &
 	     (RSS_TYPE_TCP_IPV6 | RSS_TYPE_UDP_IPV6 |
 	      RSS_TYPE_TCP_IPV6_EX | RSS_TYPE_UDP_IPV6_EX |
 	      RSS_TYPE_IPV6))) {
 		/* Conflict; disable IPV6_EX hash type/value delivery. */
 		if_printf(ifp, "disable IPV6_EX mbuf hash delivery\n");
 		mbuf_types &= ~RSS_TYPE_IPV6_EX;
 	}
 	if ((my_types & RSS_TYPE_TCP_IPV6) &&
 	    (diff_types & ifrh.ifrh_types & RSS_TYPE_TCP_IPV6_EX)) {
 		/* Conflict; disable TCP_IPV6 hash type/value delivery. */
 		if_printf(ifp, "disable TCP_IPV6 mbuf hash delivery\n");
 		mbuf_types &= ~RSS_TYPE_TCP_IPV6;
 	}
 	if ((my_types & RSS_TYPE_TCP_IPV6_EX) &&
 	    (diff_types & ifrh.ifrh_types & RSS_TYPE_TCP_IPV6)) {
 		/* Conflict; disable TCP_IPV6_EX hash type/value delivery. */
 		if_printf(ifp, "disable TCP_IPV6_EX mbuf hash delivery\n");
 		mbuf_types &= ~RSS_TYPE_TCP_IPV6_EX;
 	}
 	if ((my_types & RSS_TYPE_UDP_IPV6) &&
 	    (diff_types & ifrh.ifrh_types & RSS_TYPE_UDP_IPV6_EX)) {
 		/* Conflict; disable UDP_IPV6 hash type/value delivery. */
 		if_printf(ifp, "disable UDP_IPV6 mbuf hash delivery\n");
 		mbuf_types &= ~RSS_TYPE_UDP_IPV6;
 	}
 	if ((my_types & RSS_TYPE_UDP_IPV6_EX) &&
 	    (diff_types & ifrh.ifrh_types & RSS_TYPE_UDP_IPV6)) {
 		/* Conflict; disable UDP_IPV6_EX hash type/value delivery. */
 		if_printf(ifp, "disable UDP_IPV6_EX mbuf hash delivery\n");
 		mbuf_types &= ~RSS_TYPE_UDP_IPV6_EX;
 	}
 
 	/*
 	 * Indirect table does not matter.
 	 */
 
 	sc->hn_rss_hash = (sc->hn_rss_hcap & NDIS_HASH_FUNCTION_MASK) |
 	    hn_rss_type_tondis(my_types);
 	memcpy(sc->hn_rss.rss_key, ifrk.ifrk_key, sizeof(sc->hn_rss.rss_key));
 	sc->hn_flags |= HN_FLAG_HAS_RSSKEY;
 
 	if (reconf) {
 		error = hn_rss_reconfig(sc);
 		if (error) {
 			/* XXX roll-back? */
 			if_printf(ifp, "hn_rss_reconfig failed: %d\n", error);
 			/* XXX keep going. */
 		}
 	}
 done:
 	/* Hash deliverability for mbufs. */
 	hn_rss_mbuf_hash(sc, hn_rss_type_tondis(mbuf_types));
 }
 
 static void
 hn_vf_rss_restore(struct hn_softc *sc)
 {
 
 	HN_LOCK_ASSERT(sc);
 	KASSERT(sc->hn_flags & HN_FLAG_SYNTH_ATTACHED,
 	    ("%s: synthetic parts are not attached", if_name(sc->hn_ifp)));
 
 	if (sc->hn_rx_ring_inuse == 1)
 		goto done;
 
 	/*
 	 * Restore hash types.  Key does _not_ matter.
 	 */
 	if (sc->hn_rss_hash != sc->hn_rss_hcap) {
 		int error;
 
 		sc->hn_rss_hash = sc->hn_rss_hcap;
 		error = hn_rss_reconfig(sc);
 		if (error) {
 			if_printf(sc->hn_ifp, "hn_rss_reconfig failed: %d\n",
 			    error);
 			/* XXX keep going. */
 		}
 	}
 done:
 	/* Hash deliverability for mbufs. */
 	hn_rss_mbuf_hash(sc, NDIS_HASH_ALL);
 }
 
 static void
 hn_xpnt_vf_setready(struct hn_softc *sc)
 {
 	if_t ifp, vf_ifp;
 	struct ifreq ifr;
 
 	HN_LOCK_ASSERT(sc);
 	ifp = sc->hn_ifp;
 	vf_ifp = sc->hn_vf_ifp;
 
 	/*
 	 * Mark the VF ready.
 	 */
 	sc->hn_vf_rdytick = 0;
 
 	/*
 	 * Save information for restoration.
 	 */
 	sc->hn_saved_caps = if_getcapabilities(ifp);
 	sc->hn_saved_tsomax = if_gethwtsomax(ifp);
 	sc->hn_saved_tsosegcnt = if_gethwtsomaxsegcount(ifp);
 	sc->hn_saved_tsosegsz = if_gethwtsomaxsegsize(ifp);
 	sc->hn_saved_capenable = if_getcapenable(ifp);
 	sc->hn_saved_hwassist = if_gethwassist(ifp);
 
 	/*
 	 * Intersect supported/enabled capabilities.
 	 *
 	 * NOTE:
 	 * if_hwassist is not changed here.
 	 */
 	if_setcapabilitiesbit(ifp, 0, if_getcapabilities(vf_ifp));
 	if_setcapenablebit(ifp, 0, if_getcapabilities(ifp));
 
 	/*
 	 * Fix TSO settings.
 	 */
 	if (if_gethwtsomax(ifp) > if_gethwtsomax(vf_ifp))
 		if_sethwtsomax(ifp, if_gethwtsomax(vf_ifp));
 	if (if_gethwtsomaxsegcount(ifp) > if_gethwtsomaxsegcount(vf_ifp))
 		if_sethwtsomaxsegcount(ifp, if_gethwtsomaxsegcount(vf_ifp));
 	if (if_gethwtsomaxsegsize(ifp) > if_gethwtsomaxsegsize(vf_ifp))
 		if_sethwtsomaxsegsize(ifp, if_gethwtsomaxsegsize(vf_ifp));
 
 	/*
 	 * Change VF's enabled capabilities.
 	 */
 	memset(&ifr, 0, sizeof(ifr));
 	strlcpy(ifr.ifr_name, if_name(vf_ifp), sizeof(ifr.ifr_name));
 	ifr.ifr_reqcap = if_getcapenable(ifp);
 	hn_xpnt_vf_iocsetcaps(sc, &ifr);
 
 	if (if_getmtu(ifp) != ETHERMTU) {
 		int error;
 
 		/*
 		 * Change VF's MTU.
 		 */
 		memset(&ifr, 0, sizeof(ifr));
 		strlcpy(ifr.ifr_name, if_name(vf_ifp), sizeof(ifr.ifr_name));
 		ifr.ifr_mtu = if_getmtu(ifp);
 		error = ifhwioctl(SIOCSIFMTU, vf_ifp, (caddr_t)&ifr, curthread);
 		if (error) {
 			if_printf(ifp, "%s SIOCSIFMTU %u failed\n",
 			    if_name(vf_ifp), if_getmtu(ifp));
 			if (if_getmtu(ifp) > ETHERMTU) {
 				if_printf(ifp, "change MTU to %d\n", ETHERMTU);
 
 				/*
 				 * XXX
 				 * No need to adjust the synthetic parts' MTU;
 				 * failure of the adjustment will cause us
 				 * infinite headache.
 				 */
 				if_setmtu(ifp, ETHERMTU);
 				hn_mtu_change_fixup(sc);
 			}
 		}
 	}
 }
 
 static bool
 hn_xpnt_vf_isready(struct hn_softc *sc)
 {
 
 	HN_LOCK_ASSERT(sc);
 
 	if (!hn_xpnt_vf || sc->hn_vf_ifp == NULL)
 		return (false);
 
 	if (sc->hn_vf_rdytick == 0)
 		return (true);
 
 	if (sc->hn_vf_rdytick > ticks)
 		return (false);
 
 	/* Mark VF as ready. */
 	hn_xpnt_vf_setready(sc);
 	return (true);
 }
 
 static void
 hn_xpnt_vf_setenable(struct hn_softc *sc)
 {
 	int i;
 
 	HN_LOCK_ASSERT(sc);
 
 	/* NOTE: hn_vf_lock for hn_transmit()/hn_qflush() */
 	rm_wlock(&sc->hn_vf_lock);
 	sc->hn_xvf_flags |= HN_XVFFLAG_ENABLED;
 	rm_wunlock(&sc->hn_vf_lock);
 
 	for (i = 0; i < sc->hn_rx_ring_cnt; ++i)
 		sc->hn_rx_ring[i].hn_rx_flags |= HN_RX_FLAG_XPNT_VF;
 }
 
 static void
 hn_xpnt_vf_setdisable(struct hn_softc *sc, bool clear_vf)
 {
 	int i;
 
 	HN_LOCK_ASSERT(sc);
 
 	/* NOTE: hn_vf_lock for hn_transmit()/hn_qflush() */
 	rm_wlock(&sc->hn_vf_lock);
 	sc->hn_xvf_flags &= ~HN_XVFFLAG_ENABLED;
 	if (clear_vf)
 		sc->hn_vf_ifp = NULL;
 	rm_wunlock(&sc->hn_vf_lock);
 
 	for (i = 0; i < sc->hn_rx_ring_cnt; ++i)
 		sc->hn_rx_ring[i].hn_rx_flags &= ~HN_RX_FLAG_XPNT_VF;
 }
 
 static void
 hn_xpnt_vf_init(struct hn_softc *sc)
 {
 	int error;
 
 	HN_LOCK_ASSERT(sc);
 
 	KASSERT((sc->hn_xvf_flags & HN_XVFFLAG_ENABLED) == 0,
 	    ("%s: transparent VF was enabled", if_name(sc->hn_ifp)));
 
 	if (bootverbose) {
 		if_printf(sc->hn_ifp, "try bringing up %s\n",
 		    if_name(sc->hn_vf_ifp));
 	}
 
 	/*
 	 * Bring the VF up.
 	 */
 	hn_xpnt_vf_saveifflags(sc);
 	if_setflagbits(sc->hn_ifp, IFF_UP, 0);
 	error = hn_xpnt_vf_iocsetflags(sc);
 	if (error) {
 		if_printf(sc->hn_ifp, "bringing up %s failed: %d\n",
 		    if_name(sc->hn_vf_ifp), error);
 		return;
 	}
 
 	/*
 	 * NOTE:
 	 * Datapath setting must happen _after_ bringing the VF up.
 	 */
 	hn_nvs_set_datapath(sc, HN_NVS_DATAPATH_VF);
 
 	/*
 	 * NOTE:
 	 * Fixup RSS related bits _after_ the VF is brought up, since
 	 * many VFs generate RSS key during it's initialization.
 	 */
 	hn_vf_rss_fixup(sc, true);
 
 	/* Mark transparent mode VF as enabled. */
 	hn_xpnt_vf_setenable(sc);
 }
 
 static void
 hn_xpnt_vf_init_taskfunc(void *xsc, int pending __unused)
 {
 	struct hn_softc *sc = xsc;
 
 	HN_LOCK(sc);
 
 	if ((sc->hn_flags & HN_FLAG_SYNTH_ATTACHED) == 0)
 		goto done;
 	if (sc->hn_vf_ifp == NULL)
 		goto done;
 	if (sc->hn_xvf_flags & HN_XVFFLAG_ENABLED)
 		goto done;
 
 	if (sc->hn_vf_rdytick != 0) {
 		/* Mark VF as ready. */
 		hn_xpnt_vf_setready(sc);
 	}
 
 	if (if_getdrvflags(sc->hn_ifp) & IFF_DRV_RUNNING) {
 		/*
 		 * Delayed VF initialization.
 		 */
 		if (bootverbose) {
 			if_printf(sc->hn_ifp, "delayed initialize %s\n",
 			    if_name(sc->hn_vf_ifp));
 		}
 		hn_xpnt_vf_init(sc);
 	}
 done:
 	HN_UNLOCK(sc);
 }
 
 static void
 hn_ifnet_attevent(void *xsc, if_t ifp)
 {
 	struct hn_softc *sc = xsc;
 
 	HN_LOCK(sc);
 
 	if (!(sc->hn_flags & HN_FLAG_SYNTH_ATTACHED))
 		goto done;
 
 	if (!hn_ismyvf(sc, ifp))
 		goto done;
 
 	if (sc->hn_vf_ifp != NULL) {
 		if_printf(sc->hn_ifp, "%s was attached as VF\n",
 		    if_name(sc->hn_vf_ifp));
 		goto done;
 	}
 
 	if (hn_xpnt_vf && if_getstartfn(ifp) != NULL) {
 		/*
 		 * ifnet.if_start is _not_ supported by transparent
 		 * mode VF; mainly due to the IFF_DRV_OACTIVE flag.
 		 */
 		if_printf(sc->hn_ifp, "%s uses if_start, which is unsupported "
 		    "in transparent VF mode.\n", if_name(sc->hn_vf_ifp));
 
 		goto done;
 	}
 
 	rm_wlock(&hn_vfmap_lock);
 
 	if (if_getindex(ifp) >= hn_vfmap_size) {
 		if_t *newmap;
 		int newsize;
 
 		newsize = if_getindex(ifp) + HN_VFMAP_SIZE_DEF;
 		newmap = malloc(sizeof(if_t) * newsize, M_DEVBUF,
 		    M_WAITOK | M_ZERO);
 
 		memcpy(newmap, hn_vfmap,
 		    sizeof(if_t) * hn_vfmap_size);
 		free(hn_vfmap, M_DEVBUF);
 		hn_vfmap = newmap;
 		hn_vfmap_size = newsize;
 	}
 	KASSERT(hn_vfmap[if_getindex(ifp)] == NULL,
 	    ("%s: ifindex %d was mapped to %s",
 	     if_name(ifp), if_getindex(ifp), if_name(hn_vfmap[if_getindex(ifp)])));
 	hn_vfmap[if_getindex(ifp)] = sc->hn_ifp;
 
 	rm_wunlock(&hn_vfmap_lock);
 
 	/* NOTE: hn_vf_lock for hn_transmit()/hn_qflush() */
 	rm_wlock(&sc->hn_vf_lock);
 	KASSERT((sc->hn_xvf_flags & HN_XVFFLAG_ENABLED) == 0,
 	    ("%s: transparent VF was enabled", if_name(sc->hn_ifp)));
 	sc->hn_vf_ifp = ifp;
 	rm_wunlock(&sc->hn_vf_lock);
 
 	if (hn_xpnt_vf) {
 		int wait_ticks;
 
 		/*
 		 * Install if_input for vf_ifp, which does vf_ifp -> hn_ifp.
 		 * Save vf_ifp's current if_input for later restoration.
 		 */
 		sc->hn_vf_input = if_getinputfn(ifp);
 		if_setinputfn(ifp, hn_xpnt_vf_input);
 
 		/*
 		 * Stop link status management; use the VF's.
 		 */
 		hn_suspend_mgmt(sc);
 
 		/*
 		 * Give VF sometime to complete its attach routing.
 		 */
 		wait_ticks = hn_xpnt_vf_attwait * hz;
 		sc->hn_vf_rdytick = ticks + wait_ticks;
 
 		taskqueue_enqueue_timeout(sc->hn_vf_taskq, &sc->hn_vf_init,
 		    wait_ticks);
 	}
 done:
 	HN_UNLOCK(sc);
 }
 
 static void
 hn_ifnet_detevent(void *xsc, if_t ifp)
 {
 	struct hn_softc *sc = xsc;
 
 	HN_LOCK(sc);
 
 	if (sc->hn_vf_ifp == NULL)
 		goto done;
 
 	if (!hn_ismyvf(sc, ifp))
 		goto done;
 
 	if (hn_xpnt_vf) {
 		/*
 		 * Make sure that the delayed initialization is not running.
 		 *
 		 * NOTE:
 		 * - This lock _must_ be released, since the hn_vf_init task
 		 *   will try holding this lock.
 		 * - It is safe to release this lock here, since the
 		 *   hn_ifnet_attevent() is interlocked by the hn_vf_ifp.
 		 *
 		 * XXX racy, if hn(4) ever detached.
 		 */
 		HN_UNLOCK(sc);
 		taskqueue_drain_timeout(sc->hn_vf_taskq, &sc->hn_vf_init);
 		HN_LOCK(sc);
 
 		KASSERT(sc->hn_vf_input != NULL, ("%s VF input is not saved",
 		    if_name(sc->hn_ifp)));
 		if_setinputfn(ifp, sc->hn_vf_input);
 		sc->hn_vf_input = NULL;
 
 		if ((sc->hn_flags & HN_FLAG_SYNTH_ATTACHED) &&
 		    (sc->hn_xvf_flags & HN_XVFFLAG_ENABLED))
 			hn_nvs_set_datapath(sc, HN_NVS_DATAPATH_SYNTH);
 
 		if (sc->hn_vf_rdytick == 0) {
 			/*
 			 * The VF was ready; restore some settings.
 			 */
 			if_setcapabilities(ifp, sc->hn_saved_caps);
 
 			if_sethwtsomax(ifp, sc->hn_saved_tsomax);
 			if_sethwtsomaxsegcount(sc->hn_ifp,
 			    sc->hn_saved_tsosegcnt);
 			if_sethwtsomaxsegsize(ifp, sc->hn_saved_tsosegsz);
 
 			if_setcapenable(ifp, sc->hn_saved_capenable);
 			if_sethwassist(ifp, sc->hn_saved_hwassist);
 		}
 
 		if (sc->hn_flags & HN_FLAG_SYNTH_ATTACHED) {
 			/*
 			 * Restore RSS settings.
 			 */
 			hn_vf_rss_restore(sc);
 
 			/*
 			 * Resume link status management, which was suspended
 			 * by hn_ifnet_attevent().
 			 */
 			hn_resume_mgmt(sc);
 		}
 	}
 
 	/* Mark transparent mode VF as disabled. */
 	hn_xpnt_vf_setdisable(sc, true /* clear hn_vf_ifp */);
 
 	rm_wlock(&hn_vfmap_lock);
 
 	KASSERT(if_getindex(ifp) < hn_vfmap_size,
 	    ("ifindex %d, vfmapsize %d", if_getindex(ifp), hn_vfmap_size));
 	if (hn_vfmap[if_getindex(ifp)] != NULL) {
 		KASSERT(hn_vfmap[if_getindex(ifp)] == sc->hn_ifp,
 		    ("%s: ifindex %d was mapped to %s",
 		     if_name(ifp), if_getindex(ifp),
 		     if_name(hn_vfmap[if_getindex(ifp)])));
 		hn_vfmap[if_getindex(ifp)] = NULL;
 	}
 
 	rm_wunlock(&hn_vfmap_lock);
 done:
 	HN_UNLOCK(sc);
 }
 
 static void
 hn_ifnet_lnkevent(void *xsc, if_t ifp, int link_state)
 {
 	struct hn_softc *sc = xsc;
 
 	if (sc->hn_vf_ifp == ifp)
 		if_link_state_change(sc->hn_ifp, link_state);
 }
 
 static int
 hn_tsomax_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	unsigned int tsomax;
 	int error;
 
 	tsomax = if_gethwtsomax(sc->hn_ifp);
 	error = sysctl_handle_int(oidp, &tsomax, 0, req);
 	return error;
 }
 
 static int
 hn_tsomaxsegcnt_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	unsigned int tsomaxsegcnt;
 	int error;
 
 	tsomaxsegcnt = if_gethwtsomaxsegcount(sc->hn_ifp);
 	error = sysctl_handle_int(oidp, &tsomaxsegcnt, 0, req);
 	return error;
 }
 
 static int
 hn_tsomaxsegsz_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	unsigned int tsomaxsegsz;
 	int error;
 
 	tsomaxsegsz = if_gethwtsomaxsegsize(sc->hn_ifp);
 	error = sysctl_handle_int(oidp, &tsomaxsegsz, 0, req);
 	return error;
 }
 
 static int
 hn_probe(device_t dev)
 {
 
 	if (VMBUS_PROBE_GUID(device_get_parent(dev), dev, &hn_guid) == 0) {
 		device_set_desc(dev, "Hyper-V Network Interface");
 		return BUS_PROBE_DEFAULT;
 	}
 	return ENXIO;
 }
 
 static int
 hn_attach(device_t dev)
 {
 	struct hn_softc *sc = device_get_softc(dev);
 	struct sysctl_oid_list *child;
 	struct sysctl_ctx_list *ctx;
 	uint8_t eaddr[ETHER_ADDR_LEN];
 	if_t ifp = NULL;
 	int error, ring_cnt, tx_ring_cnt;
 	uint32_t mtu;
 
 	sc->hn_dev = dev;
 	sc->hn_prichan = vmbus_get_channel(dev);
 	HN_LOCK_INIT(sc);
 	rm_init(&sc->hn_vf_lock, "hnvf");
 	if (hn_xpnt_vf && hn_xpnt_vf_accbpf)
 		sc->hn_xvf_flags |= HN_XVFFLAG_ACCBPF;
 
 	/*
 	 * Initialize these tunables once.
 	 */
 	sc->hn_agg_size = hn_tx_agg_size;
 	sc->hn_agg_pkts = hn_tx_agg_pkts;
 
 	/*
 	 * Setup taskqueue for transmission.
 	 */
 	if (hn_tx_taskq_mode == HN_TX_TASKQ_M_INDEP) {
 		int i;
 
 		sc->hn_tx_taskqs =
 		    malloc(hn_tx_taskq_cnt * sizeof(struct taskqueue *),
 		    M_DEVBUF, M_WAITOK);
 		for (i = 0; i < hn_tx_taskq_cnt; ++i) {
 			sc->hn_tx_taskqs[i] = taskqueue_create("hn_tx",
 			    M_WAITOK, taskqueue_thread_enqueue,
 			    &sc->hn_tx_taskqs[i]);
 			taskqueue_start_threads(&sc->hn_tx_taskqs[i], 1, PI_NET,
 			    "%s tx%d", device_get_nameunit(dev), i);
 		}
 	} else if (hn_tx_taskq_mode == HN_TX_TASKQ_M_GLOBAL) {
 		sc->hn_tx_taskqs = hn_tx_taskque;
 	}
 
 	/*
 	 * Setup taskqueue for mangement tasks, e.g. link status.
 	 */
 	sc->hn_mgmt_taskq0 = taskqueue_create("hn_mgmt", M_WAITOK,
 	    taskqueue_thread_enqueue, &sc->hn_mgmt_taskq0);
 	taskqueue_start_threads(&sc->hn_mgmt_taskq0, 1, PI_NET, "%s mgmt",
 	    device_get_nameunit(dev));
 	TASK_INIT(&sc->hn_link_task, 0, hn_link_taskfunc, sc);
 	TASK_INIT(&sc->hn_netchg_init, 0, hn_netchg_init_taskfunc, sc);
 	TIMEOUT_TASK_INIT(sc->hn_mgmt_taskq0, &sc->hn_netchg_status, 0,
 	    hn_netchg_status_taskfunc, sc);
 
 	if (hn_xpnt_vf) {
 		/*
 		 * Setup taskqueue for VF tasks, e.g. delayed VF bringing up.
 		 */
 		sc->hn_vf_taskq = taskqueue_create("hn_vf", M_WAITOK,
 		    taskqueue_thread_enqueue, &sc->hn_vf_taskq);
 		taskqueue_start_threads(&sc->hn_vf_taskq, 1, PI_NET, "%s vf",
 		    device_get_nameunit(dev));
 		TIMEOUT_TASK_INIT(sc->hn_vf_taskq, &sc->hn_vf_init, 0,
 		    hn_xpnt_vf_init_taskfunc, sc);
 	}
 
 	/*
 	 * Allocate ifnet and setup its name earlier, so that if_printf
 	 * can be used by functions, which will be called after
 	 * ether_ifattach().
 	 */
 	ifp = sc->hn_ifp = if_alloc(IFT_ETHER);
 	if_setsoftc(ifp, sc);
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 
 	/*
 	 * Initialize ifmedia earlier so that it can be unconditionally
 	 * destroyed, if error happened later on.
 	 */
 	ifmedia_init(&sc->hn_media, 0, hn_ifmedia_upd, hn_ifmedia_sts);
 
 	/*
 	 * Figure out the # of RX rings (ring_cnt) and the # of TX rings
 	 * to use (tx_ring_cnt).
 	 *
 	 * NOTE:
 	 * The # of RX rings to use is same as the # of channels to use.
 	 */
 	ring_cnt = hn_chan_cnt;
 	if (ring_cnt <= 0) {
 		/* Default */
 		ring_cnt = mp_ncpus;
 		if (ring_cnt > HN_RING_CNT_DEF_MAX)
 			ring_cnt = HN_RING_CNT_DEF_MAX;
 	} else if (ring_cnt > mp_ncpus) {
 		ring_cnt = mp_ncpus;
 	}
 #ifdef RSS
 	if (ring_cnt > rss_getnumbuckets())
 		ring_cnt = rss_getnumbuckets();
 #endif
 
 	tx_ring_cnt = hn_tx_ring_cnt;
 	if (tx_ring_cnt <= 0 || tx_ring_cnt > ring_cnt)
 		tx_ring_cnt = ring_cnt;
 #ifdef HN_IFSTART_SUPPORT
 	if (hn_use_if_start) {
 		/* ifnet.if_start only needs one TX ring. */
 		tx_ring_cnt = 1;
 	}
 #endif
 
 	/*
 	 * Set the leader CPU for channels.
 	 */
 	sc->hn_cpu = atomic_fetchadd_int(&hn_cpu_index, ring_cnt) % mp_ncpus;
 
 	/*
 	 * Create enough TX/RX rings, even if only limited number of
 	 * channels can be allocated.
 	 */
 	error = hn_create_tx_data(sc, tx_ring_cnt);
 	if (error)
 		goto failed;
 	error = hn_create_rx_data(sc, ring_cnt);
 	if (error)
 		goto failed;
 
 	/*
 	 * Create transaction context for NVS and RNDIS transactions.
 	 */
 	sc->hn_xact = vmbus_xact_ctx_create(bus_get_dma_tag(dev),
 	    HN_XACT_REQ_SIZE, HN_XACT_RESP_SIZE, 0);
 	if (sc->hn_xact == NULL) {
 		error = ENXIO;
 		goto failed;
 	}
 
 	/*
 	 * Install orphan handler for the revocation of this device's
 	 * primary channel.
 	 *
 	 * NOTE:
 	 * The processing order is critical here:
 	 * Install the orphan handler, _before_ testing whether this
 	 * device's primary channel has been revoked or not.
 	 */
 	vmbus_chan_set_orphan(sc->hn_prichan, sc->hn_xact);
 	if (vmbus_chan_is_revoked(sc->hn_prichan)) {
 		error = ENXIO;
 		goto failed;
 	}
 
 	/*
 	 * Attach the synthetic parts, i.e. NVS and RNDIS.
 	 */
 	error = hn_synth_attach(sc, ETHERMTU);
 	if (error)
 		goto failed;
 
 	error = hn_rndis_get_eaddr(sc, eaddr);
 	if (error)
 		goto failed;
 
 	error = hn_rndis_get_mtu(sc, &mtu);
 	if (error)
 		mtu = ETHERMTU;
 	else if (bootverbose)
 		device_printf(dev, "RNDIS mtu %u\n", mtu);
 
 	if (sc->hn_rx_ring_inuse > 1) {
 		/*
 		 * Reduce TCP segment aggregation limit for multiple
 		 * RX rings to increase ACK timeliness.
 		 */
 		hn_set_lro_lenlim(sc, HN_LRO_LENLIM_MULTIRX_DEF);
 	}
 
 	/*
 	 * Fixup TX/RX stuffs after synthetic parts are attached.
 	 */
 	hn_fixup_tx_data(sc);
 	hn_fixup_rx_data(sc);
 
 	ctx = device_get_sysctl_ctx(dev);
 	child = SYSCTL_CHILDREN(device_get_sysctl_tree(dev));
 	SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "nvs_version", CTLFLAG_RD,
 	    &sc->hn_nvs_ver, 0, "NVS version");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "ndis_version",
 	    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0,
 	    hn_ndis_version_sysctl, "A", "NDIS version");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "caps",
 	    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0,
 	    hn_caps_sysctl, "A", "capabilities");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "hwassist",
 	    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0,
 	    hn_hwassist_sysctl, "A", "hwassist");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "tso_max",
 	    CTLTYPE_UINT | CTLFLAG_RD, sc, 0, hn_tsomax_sysctl,
 	    "IU", "max TSO size");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "tso_maxsegcnt",
 	    CTLTYPE_UINT | CTLFLAG_RD, sc, 0, hn_tsomaxsegcnt_sysctl,
 	    "IU", "max # of TSO segments");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "tso_maxsegsz",
 	    CTLTYPE_UINT | CTLFLAG_RD, sc, 0, hn_tsomaxsegsz_sysctl,
 	    "IU", "max size of TSO segment");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rxfilter",
 	    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0,
 	    hn_rxfilter_sysctl, "A", "rxfilter");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rss_hash",
 	    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0,
 	    hn_rss_hash_sysctl, "A", "RSS hash");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rss_hashcap",
 	    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0,
 	    hn_rss_hcap_sysctl, "A", "RSS hash capabilities");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "mbuf_hash",
 	    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0,
 	    hn_rss_mbuf_sysctl, "A", "RSS hash for mbufs");
 	SYSCTL_ADD_INT(ctx, child, OID_AUTO, "rss_ind_size",
 	    CTLFLAG_RD, &sc->hn_rss_ind_size, 0, "RSS indirect entry count");
 #ifndef RSS
 	/*
 	 * Don't allow RSS key/indirect table changes, if RSS is defined.
 	 */
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rss_key",
 	    CTLTYPE_OPAQUE | CTLFLAG_RW | CTLFLAG_MPSAFE, sc, 0,
 	    hn_rss_key_sysctl, "IU", "RSS key");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rss_ind",
 	    CTLTYPE_OPAQUE | CTLFLAG_RW | CTLFLAG_MPSAFE, sc, 0,
 	    hn_rss_ind_sysctl, "IU", "RSS indirect table");
 #endif
 	SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "rndis_agg_size",
 	    CTLFLAG_RD, &sc->hn_rndis_agg_size, 0,
 	    "RNDIS offered packet transmission aggregation size limit");
 	SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "rndis_agg_pkts",
 	    CTLFLAG_RD, &sc->hn_rndis_agg_pkts, 0,
 	    "RNDIS offered packet transmission aggregation count limit");
 	SYSCTL_ADD_UINT(ctx, child, OID_AUTO, "rndis_agg_align",
 	    CTLFLAG_RD, &sc->hn_rndis_agg_align, 0,
 	    "RNDIS packet transmission aggregation alignment");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "agg_size",
 	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, sc, 0,
 	    hn_txagg_size_sysctl, "I",
 	    "Packet transmission aggregation size, 0 -- disable, -1 -- auto");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "agg_pkts",
 	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, sc, 0,
 	    hn_txagg_pkts_sysctl, "I",
 	    "Packet transmission aggregation packets, "
 	    "0 -- disable, -1 -- auto");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "polling",
 	    CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, sc, 0,
 	    hn_polling_sysctl, "I",
 	    "Polling frequency: [100,1000000], 0 disable polling");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "vf",
 	    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0,
 	    hn_vf_sysctl, "A", "Virtual Function's name");
 	if (!hn_xpnt_vf) {
 		SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rxvf",
 		    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0,
 		    hn_rxvf_sysctl, "A", "activated Virtual Function's name");
 	} else {
 		SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "vf_xpnt_enabled",
 		    CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0,
 		    hn_xpnt_vf_enabled_sysctl, "I",
 		    "Transparent VF enabled");
 		SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "vf_xpnt_accbpf",
 		    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, sc, 0,
 		    hn_xpnt_vf_accbpf_sysctl, "I",
 		    "Accurate BPF for transparent VF");
 	}
 
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rsc_switch",
 	    CTLTYPE_UINT | CTLFLAG_RW, sc, 0, hn_rsc_sysctl, "A",
 	    "switch to rsc");
 
 	/*
 	 * Setup the ifmedia, which has been initialized earlier.
 	 */
 	ifmedia_add(&sc->hn_media, IFM_ETHER | IFM_AUTO, 0, NULL);
 	ifmedia_set(&sc->hn_media, IFM_ETHER | IFM_AUTO);
 	/* XXX ifmedia_set really should do this for us */
 	sc->hn_media.ifm_media = sc->hn_media.ifm_cur->ifm_media;
 
 	/*
 	 * Setup the ifnet for this interface.
 	 */
 
 	if_setbaudrate(ifp, IF_Gbps(10));
 	if_setflags(ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);
 	if_setioctlfn(ifp, hn_ioctl);
 	if_setinitfn(ifp, hn_init);
 #ifdef HN_IFSTART_SUPPORT
 	if (hn_use_if_start) {
 		int qdepth = hn_get_txswq_depth(&sc->hn_tx_ring[0]);
 
 		if_setstartfn(ifp, hn_start);
 		if_setsendqlen(ifp, qdepth);
 		if_setsendqready(ifp);
 	} else
 #endif
 	{
 		if_settransmitfn(ifp, hn_transmit);
 		if_setqflushfn(ifp, hn_xmit_qflush);
 	}
 
 	if_setcapabilitiesbit(ifp, IFCAP_RXCSUM | IFCAP_LRO | IFCAP_LINKSTATE, 0);
 #ifdef foo
 	/* We can't diff IPv6 packets from IPv4 packets on RX path. */
 	if_setcapabilitiesbit(ifp, IFCAP_RXCSUM_IPV6, 0);
 #endif
 	if (sc->hn_caps & HN_CAP_VLAN) {
 		/* XXX not sure about VLAN_MTU. */
 		if_setcapabilitiesbit(ifp, IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU, 0);
 	}
 
 	if_sethwassist(ifp, sc->hn_tx_ring[0].hn_csum_assist);
 	if (if_gethwassist(ifp) & HN_CSUM_IP_MASK)
 		if_setcapabilitiesbit(ifp, IFCAP_TXCSUM, 0);
 	if (if_gethwassist(ifp) & HN_CSUM_IP6_MASK)
 		if_setcapabilitiesbit(ifp, IFCAP_TXCSUM_IPV6, 0);
 	if (sc->hn_caps & HN_CAP_TSO4) {
 		if_setcapabilitiesbit(ifp, IFCAP_TSO4, 0);
 		if_sethwassistbits(ifp, CSUM_IP_TSO, 0);
 	}
 	if (sc->hn_caps & HN_CAP_TSO6) {
 		if_setcapabilitiesbit(ifp, IFCAP_TSO6, 0);
 		if_sethwassistbits(ifp, CSUM_IP6_TSO, 0);
 	}
 
 	/* Enable all available capabilities by default. */
 	if_setcapenable(ifp, if_getcapabilities(ifp));
 
 	/*
 	 * Disable IPv6 TSO and TXCSUM by default, they still can
 	 * be enabled through SIOCSIFCAP.
 	 */
 	if_setcapenablebit(ifp, 0, (IFCAP_TXCSUM_IPV6 | IFCAP_TSO6));
 	if_sethwassistbits(ifp, 0, (HN_CSUM_IP6_MASK | CSUM_IP6_TSO));
 
 	if (if_getcapabilities(ifp) & (IFCAP_TSO6 | IFCAP_TSO4)) {
 		/*
 		 * Lock hn_set_tso_maxsize() to simplify its
 		 * internal logic.
 		 */
 		HN_LOCK(sc);
 		hn_set_tso_maxsize(sc, hn_tso_maxlen, ETHERMTU);
 		HN_UNLOCK(sc);
 		if_sethwtsomaxsegcount(ifp, HN_TX_DATA_SEGCNT_MAX);
 		if_sethwtsomaxsegsize(ifp, PAGE_SIZE);
 	}
 
 	ether_ifattach(ifp, eaddr);
 
 	if ((if_getcapabilities(ifp) & (IFCAP_TSO6 | IFCAP_TSO4)) && bootverbose) {
 		if_printf(ifp, "TSO segcnt %u segsz %u\n",
 		    if_gethwtsomaxsegcount(ifp), if_gethwtsomaxsegsize(ifp));
 	}
 	if (mtu < ETHERMTU) {
 
 		if_setmtu(ifp, mtu);
 	}
 
 	/* Inform the upper layer about the long frame support. */
 	if_setifheaderlen(ifp, sizeof(struct ether_vlan_header));
 
 	/*
 	 * Kick off link status check.
 	 */
 	sc->hn_mgmt_taskq = sc->hn_mgmt_taskq0;
 	hn_update_link_status(sc);
 
 	if (!hn_xpnt_vf) {
 		sc->hn_ifnet_evthand = EVENTHANDLER_REGISTER(ifnet_event,
 		    hn_ifnet_event, sc, EVENTHANDLER_PRI_ANY);
 		sc->hn_ifaddr_evthand = EVENTHANDLER_REGISTER(ifaddr_event,
 		    hn_ifaddr_event, sc, EVENTHANDLER_PRI_ANY);
 	} else {
 		sc->hn_ifnet_lnkhand = EVENTHANDLER_REGISTER(ifnet_link_event,
 		    hn_ifnet_lnkevent, sc, EVENTHANDLER_PRI_ANY);
 	}
 
 	/*
 	 * NOTE:
 	 * Subscribe ether_ifattach event, instead of ifnet_arrival event,
 	 * since interface's LLADDR is needed; interface LLADDR is not
 	 * available when ifnet_arrival event is triggered.
 	 */
 	sc->hn_ifnet_atthand = EVENTHANDLER_REGISTER(ether_ifattach_event,
 	    hn_ifnet_attevent, sc, EVENTHANDLER_PRI_ANY);
 	sc->hn_ifnet_dethand = EVENTHANDLER_REGISTER(ifnet_departure_event,
 	    hn_ifnet_detevent, sc, EVENTHANDLER_PRI_ANY);
 
 	return (0);
 failed:
 	if (sc->hn_flags & HN_FLAG_SYNTH_ATTACHED)
 		hn_synth_detach(sc);
 	hn_detach(dev);
 	return (error);
 }
 
 static int
 hn_detach(device_t dev)
 {
 	struct hn_softc *sc = device_get_softc(dev);
 	if_t ifp = sc->hn_ifp, vf_ifp;
 
 	if (sc->hn_xact != NULL && vmbus_chan_is_revoked(sc->hn_prichan)) {
 		/*
 		 * In case that the vmbus missed the orphan handler
 		 * installation.
 		 */
 		vmbus_xact_ctx_orphan(sc->hn_xact);
 	}
 
 	if (sc->hn_ifaddr_evthand != NULL)
 		EVENTHANDLER_DEREGISTER(ifaddr_event, sc->hn_ifaddr_evthand);
 	if (sc->hn_ifnet_evthand != NULL)
 		EVENTHANDLER_DEREGISTER(ifnet_event, sc->hn_ifnet_evthand);
 	if (sc->hn_ifnet_atthand != NULL) {
 		EVENTHANDLER_DEREGISTER(ether_ifattach_event,
 		    sc->hn_ifnet_atthand);
 	}
 	if (sc->hn_ifnet_dethand != NULL) {
 		EVENTHANDLER_DEREGISTER(ifnet_departure_event,
 		    sc->hn_ifnet_dethand);
 	}
 	if (sc->hn_ifnet_lnkhand != NULL)
 		EVENTHANDLER_DEREGISTER(ifnet_link_event, sc->hn_ifnet_lnkhand);
 
 	vf_ifp = sc->hn_vf_ifp;
 	__compiler_membar();
 	if (vf_ifp != NULL)
 		hn_ifnet_detevent(sc, vf_ifp);
 
 	if (device_is_attached(dev)) {
 		HN_LOCK(sc);
 		if (sc->hn_flags & HN_FLAG_SYNTH_ATTACHED) {
 			if (if_getdrvflags(ifp) & IFF_DRV_RUNNING)
 				hn_stop(sc, true);
 			/*
 			 * NOTE:
 			 * hn_stop() only suspends data, so management
 			 * stuffs have to be suspended manually here.
 			 */
 			hn_suspend_mgmt(sc);
 			hn_synth_detach(sc);
 		}
 		HN_UNLOCK(sc);
 		ether_ifdetach(ifp);
 	}
 
 	ifmedia_removeall(&sc->hn_media);
 	hn_destroy_rx_data(sc);
 	hn_destroy_tx_data(sc);
 
 	if (sc->hn_tx_taskqs != NULL && sc->hn_tx_taskqs != hn_tx_taskque) {
 		int i;
 
 		for (i = 0; i < hn_tx_taskq_cnt; ++i)
 			taskqueue_free(sc->hn_tx_taskqs[i]);
 		free(sc->hn_tx_taskqs, M_DEVBUF);
 	}
 	taskqueue_free(sc->hn_mgmt_taskq0);
 	if (sc->hn_vf_taskq != NULL)
 		taskqueue_free(sc->hn_vf_taskq);
 
 	if (sc->hn_xact != NULL) {
 		/*
 		 * Uninstall the orphan handler _before_ the xact is
 		 * destructed.
 		 */
 		vmbus_chan_unset_orphan(sc->hn_prichan);
 		vmbus_xact_ctx_destroy(sc->hn_xact);
 	}
 
 	if_free(ifp);
 
 	HN_LOCK_DESTROY(sc);
 	rm_destroy(&sc->hn_vf_lock);
 	return (0);
 }
 
 static int
 hn_shutdown(device_t dev)
 {
 
 	return (0);
 }
 
 static void
 hn_link_status(struct hn_softc *sc)
 {
 	uint32_t link_status;
 	int error;
 
 	error = hn_rndis_get_linkstatus(sc, &link_status);
 	if (error) {
 		/* XXX what to do? */
 		return;
 	}
 
 	if (link_status == NDIS_MEDIA_STATE_CONNECTED)
 		sc->hn_link_flags |= HN_LINK_FLAG_LINKUP;
 	else
 		sc->hn_link_flags &= ~HN_LINK_FLAG_LINKUP;
 	if_link_state_change(sc->hn_ifp,
 	    (sc->hn_link_flags & HN_LINK_FLAG_LINKUP) ?
 	    LINK_STATE_UP : LINK_STATE_DOWN);
 }
 
 static void
 hn_link_taskfunc(void *xsc, int pending __unused)
 {
 	struct hn_softc *sc = xsc;
 
 	if (sc->hn_link_flags & HN_LINK_FLAG_NETCHG)
 		return;
 	hn_link_status(sc);
 }
 
 static void
 hn_netchg_init_taskfunc(void *xsc, int pending __unused)
 {
 	struct hn_softc *sc = xsc;
 
 	/* Prevent any link status checks from running. */
 	sc->hn_link_flags |= HN_LINK_FLAG_NETCHG;
 
 	/*
 	 * Fake up a [link down --> link up] state change; 5 seconds
 	 * delay is used, which closely simulates miibus reaction
 	 * upon link down event.
 	 */
 	sc->hn_link_flags &= ~HN_LINK_FLAG_LINKUP;
 	if_link_state_change(sc->hn_ifp, LINK_STATE_DOWN);
 	taskqueue_enqueue_timeout(sc->hn_mgmt_taskq0,
 	    &sc->hn_netchg_status, 5 * hz);
 }
 
 static void
 hn_netchg_status_taskfunc(void *xsc, int pending __unused)
 {
 	struct hn_softc *sc = xsc;
 
 	/* Re-allow link status checks. */
 	sc->hn_link_flags &= ~HN_LINK_FLAG_NETCHG;
 	hn_link_status(sc);
 }
 
 static void
 hn_update_link_status(struct hn_softc *sc)
 {
 
 	if (sc->hn_mgmt_taskq != NULL)
 		taskqueue_enqueue(sc->hn_mgmt_taskq, &sc->hn_link_task);
 }
 
 static void
 hn_change_network(struct hn_softc *sc)
 {
 
 	if (sc->hn_mgmt_taskq != NULL)
 		taskqueue_enqueue(sc->hn_mgmt_taskq, &sc->hn_netchg_init);
 }
 
 static __inline int
 hn_txdesc_dmamap_load(struct hn_tx_ring *txr, struct hn_txdesc *txd,
     struct mbuf **m_head, bus_dma_segment_t *segs, int *nsegs)
 {
 	struct mbuf *m = *m_head;
 	int error;
 
 	KASSERT(txd->chim_index == HN_NVS_CHIM_IDX_INVALID, ("txd uses chim"));
 
 	error = bus_dmamap_load_mbuf_sg(txr->hn_tx_data_dtag, txd->data_dmap,
 	    m, segs, nsegs, BUS_DMA_NOWAIT);
 	if (error == EFBIG) {
 		struct mbuf *m_new;
 
 		m_new = m_collapse(m, M_NOWAIT, HN_TX_DATA_SEGCNT_MAX);
 		if (m_new == NULL)
 			return ENOBUFS;
 		else
 			*m_head = m = m_new;
 		txr->hn_tx_collapsed++;
 
 		error = bus_dmamap_load_mbuf_sg(txr->hn_tx_data_dtag,
 		    txd->data_dmap, m, segs, nsegs, BUS_DMA_NOWAIT);
 	}
 	if (!error) {
 		bus_dmamap_sync(txr->hn_tx_data_dtag, txd->data_dmap,
 		    BUS_DMASYNC_PREWRITE);
 		txd->flags |= HN_TXD_FLAG_DMAMAP;
 	}
 	return error;
 }
 
 static __inline int
 hn_txdesc_put(struct hn_tx_ring *txr, struct hn_txdesc *txd)
 {
 
 	KASSERT((txd->flags & HN_TXD_FLAG_ONLIST) == 0,
 	    ("put an onlist txd %#x", txd->flags));
 	KASSERT((txd->flags & HN_TXD_FLAG_ONAGG) == 0,
 	    ("put an onagg txd %#x", txd->flags));
 
 	KASSERT(txd->refs > 0, ("invalid txd refs %d", txd->refs));
 	if (atomic_fetchadd_int(&txd->refs, -1) != 1)
 		return 0;
 
 	if (!STAILQ_EMPTY(&txd->agg_list)) {
 		struct hn_txdesc *tmp_txd;
 
 		while ((tmp_txd = STAILQ_FIRST(&txd->agg_list)) != NULL) {
 			int freed __diagused;
 
 			KASSERT(STAILQ_EMPTY(&tmp_txd->agg_list),
 			    ("resursive aggregation on aggregated txdesc"));
 			KASSERT((tmp_txd->flags & HN_TXD_FLAG_ONAGG),
 			    ("not aggregated txdesc"));
 			KASSERT((tmp_txd->flags & HN_TXD_FLAG_DMAMAP) == 0,
 			    ("aggregated txdesc uses dmamap"));
 			KASSERT(tmp_txd->chim_index == HN_NVS_CHIM_IDX_INVALID,
 			    ("aggregated txdesc consumes "
 			     "chimney sending buffer"));
 			KASSERT(tmp_txd->chim_size == 0,
 			    ("aggregated txdesc has non-zero "
 			     "chimney sending size"));
 
 			STAILQ_REMOVE_HEAD(&txd->agg_list, agg_link);
 			tmp_txd->flags &= ~HN_TXD_FLAG_ONAGG;
 			freed = hn_txdesc_put(txr, tmp_txd);
 			KASSERT(freed, ("failed to free aggregated txdesc"));
 		}
 	}
 
 	if (txd->chim_index != HN_NVS_CHIM_IDX_INVALID) {
 		KASSERT((txd->flags & HN_TXD_FLAG_DMAMAP) == 0,
 		    ("chim txd uses dmamap"));
 		hn_chim_free(txr->hn_sc, txd->chim_index);
 		txd->chim_index = HN_NVS_CHIM_IDX_INVALID;
 		txd->chim_size = 0;
 	} else if (txd->flags & HN_TXD_FLAG_DMAMAP) {
 		bus_dmamap_sync(txr->hn_tx_data_dtag,
 		    txd->data_dmap, BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(txr->hn_tx_data_dtag,
 		    txd->data_dmap);
 		txd->flags &= ~HN_TXD_FLAG_DMAMAP;
 	}
 
 	if (txd->m != NULL) {
 		m_freem(txd->m);
 		txd->m = NULL;
 	}
 
 	txd->flags |= HN_TXD_FLAG_ONLIST;
 #ifndef HN_USE_TXDESC_BUFRING
 	mtx_lock_spin(&txr->hn_txlist_spin);
 	KASSERT(txr->hn_txdesc_avail >= 0 &&
 	    txr->hn_txdesc_avail < txr->hn_txdesc_cnt,
 	    ("txdesc_put: invalid txd avail %d", txr->hn_txdesc_avail));
 	txr->hn_txdesc_avail++;
 	SLIST_INSERT_HEAD(&txr->hn_txlist, txd, link);
 	mtx_unlock_spin(&txr->hn_txlist_spin);
 #else	/* HN_USE_TXDESC_BUFRING */
 #ifdef HN_DEBUG
 	atomic_add_int(&txr->hn_txdesc_avail, 1);
 #endif
 	buf_ring_enqueue(txr->hn_txdesc_br, txd);
 #endif	/* !HN_USE_TXDESC_BUFRING */
 
 	return 1;
 }
 
 static __inline struct hn_txdesc *
 hn_txdesc_get(struct hn_tx_ring *txr)
 {
 	struct hn_txdesc *txd;
 
 #ifndef HN_USE_TXDESC_BUFRING
 	mtx_lock_spin(&txr->hn_txlist_spin);
 	txd = SLIST_FIRST(&txr->hn_txlist);
 	if (txd != NULL) {
 		KASSERT(txr->hn_txdesc_avail > 0,
 		    ("txdesc_get: invalid txd avail %d", txr->hn_txdesc_avail));
 		txr->hn_txdesc_avail--;
 		SLIST_REMOVE_HEAD(&txr->hn_txlist, link);
 	}
 	mtx_unlock_spin(&txr->hn_txlist_spin);
 #else
 	txd = buf_ring_dequeue_sc(txr->hn_txdesc_br);
 #endif
 
 	if (txd != NULL) {
 #ifdef HN_USE_TXDESC_BUFRING
 #ifdef HN_DEBUG
 		atomic_subtract_int(&txr->hn_txdesc_avail, 1);
 #endif
 #endif	/* HN_USE_TXDESC_BUFRING */
 		KASSERT(txd->m == NULL && txd->refs == 0 &&
 		    STAILQ_EMPTY(&txd->agg_list) &&
 		    txd->chim_index == HN_NVS_CHIM_IDX_INVALID &&
 		    txd->chim_size == 0 &&
 		    (txd->flags & HN_TXD_FLAG_ONLIST) &&
 		    (txd->flags & HN_TXD_FLAG_ONAGG) == 0 &&
 		    (txd->flags & HN_TXD_FLAG_DMAMAP) == 0, ("invalid txd"));
 		txd->flags &= ~HN_TXD_FLAG_ONLIST;
 		txd->refs = 1;
 	}
 	return txd;
 }
 
 static __inline void
 hn_txdesc_hold(struct hn_txdesc *txd)
 {
 
 	/* 0->1 transition will never work */
 	KASSERT(txd->refs > 0, ("invalid txd refs %d", txd->refs));
 	atomic_add_int(&txd->refs, 1);
 }
 
 static __inline void
 hn_txdesc_agg(struct hn_txdesc *agg_txd, struct hn_txdesc *txd)
 {
 
 	KASSERT((agg_txd->flags & HN_TXD_FLAG_ONAGG) == 0,
 	    ("recursive aggregation on aggregating txdesc"));
 
 	KASSERT((txd->flags & HN_TXD_FLAG_ONAGG) == 0,
 	    ("already aggregated"));
 	KASSERT(STAILQ_EMPTY(&txd->agg_list),
 	    ("recursive aggregation on to-be-aggregated txdesc"));
 
 	txd->flags |= HN_TXD_FLAG_ONAGG;
 	STAILQ_INSERT_TAIL(&agg_txd->agg_list, txd, agg_link);
 }
 
 static bool
 hn_tx_ring_pending(struct hn_tx_ring *txr)
 {
 	bool pending = false;
 
 #ifndef HN_USE_TXDESC_BUFRING
 	mtx_lock_spin(&txr->hn_txlist_spin);
 	if (txr->hn_txdesc_avail != txr->hn_txdesc_cnt)
 		pending = true;
 	mtx_unlock_spin(&txr->hn_txlist_spin);
 #else
 	if (!buf_ring_full(txr->hn_txdesc_br))
 		pending = true;
 #endif
 	return (pending);
 }
 
 static __inline void
 hn_txeof(struct hn_tx_ring *txr)
 {
 	txr->hn_has_txeof = 0;
 	txr->hn_txeof(txr);
 }
 
 static void
 hn_txpkt_done(struct hn_nvs_sendctx *sndc, struct hn_softc *sc,
     struct vmbus_channel *chan, const void *data __unused, int dlen __unused)
 {
 	struct hn_txdesc *txd = sndc->hn_cbarg;
 	struct hn_tx_ring *txr;
 
 	txr = txd->txr;
 	KASSERT(txr->hn_chan == chan,
 	    ("channel mismatch, on chan%u, should be chan%u",
 	     vmbus_chan_id(chan), vmbus_chan_id(txr->hn_chan)));
 
 	txr->hn_has_txeof = 1;
 	hn_txdesc_put(txr, txd);
 
 	++txr->hn_txdone_cnt;
 	if (txr->hn_txdone_cnt >= HN_EARLY_TXEOF_THRESH) {
 		txr->hn_txdone_cnt = 0;
 		if (txr->hn_oactive)
 			hn_txeof(txr);
 	}
 }
 
 static void
 hn_chan_rollup(struct hn_rx_ring *rxr, struct hn_tx_ring *txr)
 {
 #if defined(INET) || defined(INET6)
 	struct epoch_tracker et;
 
 	NET_EPOCH_ENTER(et);
 	tcp_lro_flush_all(&rxr->hn_lro);
 	NET_EPOCH_EXIT(et);
 #endif
 
 	/*
 	 * NOTE:
 	 * 'txr' could be NULL, if multiple channels and
 	 * ifnet.if_start method are enabled.
 	 */
 	if (txr == NULL || !txr->hn_has_txeof)
 		return;
 
 	txr->hn_txdone_cnt = 0;
 	hn_txeof(txr);
 }
 
 static __inline uint32_t
 hn_rndis_pktmsg_offset(uint32_t ofs)
 {
 
 	KASSERT(ofs >= sizeof(struct rndis_packet_msg),
 	    ("invalid RNDIS packet msg offset %u", ofs));
 	return (ofs - __offsetof(struct rndis_packet_msg, rm_dataoffset));
 }
 
 static __inline void *
 hn_rndis_pktinfo_append(struct rndis_packet_msg *pkt, size_t pktsize,
     size_t pi_dlen, uint32_t pi_type)
 {
 	const size_t pi_size = HN_RNDIS_PKTINFO_SIZE(pi_dlen);
 	struct rndis_pktinfo *pi;
 
 	KASSERT((pi_size & RNDIS_PACKET_MSG_OFFSET_ALIGNMASK) == 0,
 	    ("unaligned pktinfo size %zu, pktinfo dlen %zu", pi_size, pi_dlen));
 
 	/*
 	 * Per-packet-info does not move; it only grows.
 	 *
 	 * NOTE:
 	 * rm_pktinfooffset in this phase counts from the beginning
 	 * of rndis_packet_msg.
 	 */
 	KASSERT(pkt->rm_pktinfooffset + pkt->rm_pktinfolen + pi_size <= pktsize,
 	    ("%u pktinfo overflows RNDIS packet msg", pi_type));
 	pi = (struct rndis_pktinfo *)((uint8_t *)pkt + pkt->rm_pktinfooffset +
 	    pkt->rm_pktinfolen);
 	pkt->rm_pktinfolen += pi_size;
 
 	pi->rm_size = pi_size;
 	pi->rm_type = pi_type;
 	pi->rm_internal = 0;
 	pi->rm_pktinfooffset = RNDIS_PKTINFO_OFFSET;
 
 	return (pi->rm_data);
 }
 
 static __inline int
 hn_flush_txagg(if_t ifp, struct hn_tx_ring *txr)
 {
 	struct hn_txdesc *txd;
 	struct mbuf *m;
 	int error, pkts;
 
 	txd = txr->hn_agg_txd;
 	KASSERT(txd != NULL, ("no aggregate txdesc"));
 
 	/*
 	 * Since hn_txpkt() will reset this temporary stat, save
 	 * it now, so that oerrors can be updated properly, if
 	 * hn_txpkt() ever fails.
 	 */
 	pkts = txr->hn_stat_pkts;
 
 	/*
 	 * Since txd's mbuf will _not_ be freed upon hn_txpkt()
 	 * failure, save it for later freeing, if hn_txpkt() ever
 	 * fails.
 	 */
 	m = txd->m;
 	error = hn_txpkt(ifp, txr, txd);
 	if (__predict_false(error)) {
 		/* txd is freed, but m is not. */
 		m_freem(m);
 
 		txr->hn_flush_failed++;
 		if_inc_counter(ifp, IFCOUNTER_OERRORS, pkts);
 	}
 
 	/* Reset all aggregation states. */
 	txr->hn_agg_txd = NULL;
 	txr->hn_agg_szleft = 0;
 	txr->hn_agg_pktleft = 0;
 	txr->hn_agg_prevpkt = NULL;
 
 	return (error);
 }
 
 static void *
 hn_try_txagg(if_t ifp, struct hn_tx_ring *txr, struct hn_txdesc *txd,
     int pktsize)
 {
 	void *chim;
 
 	if (txr->hn_agg_txd != NULL) {
 		if (txr->hn_agg_pktleft >= 1 && txr->hn_agg_szleft > pktsize) {
 			struct hn_txdesc *agg_txd = txr->hn_agg_txd;
 			struct rndis_packet_msg *pkt = txr->hn_agg_prevpkt;
 			int olen;
 
 			/*
 			 * Update the previous RNDIS packet's total length,
 			 * it can be increased due to the mandatory alignment
 			 * padding for this RNDIS packet.  And update the
 			 * aggregating txdesc's chimney sending buffer size
 			 * accordingly.
 			 *
 			 * XXX
 			 * Zero-out the padding, as required by the RNDIS spec.
 			 */
 			olen = pkt->rm_len;
 			pkt->rm_len = roundup2(olen, txr->hn_agg_align);
 			agg_txd->chim_size += pkt->rm_len - olen;
 
 			/* Link this txdesc to the parent. */
 			hn_txdesc_agg(agg_txd, txd);
 
 			chim = (uint8_t *)pkt + pkt->rm_len;
 			/* Save the current packet for later fixup. */
 			txr->hn_agg_prevpkt = chim;
 
 			txr->hn_agg_pktleft--;
 			txr->hn_agg_szleft -= pktsize;
 			if (txr->hn_agg_szleft <=
 			    HN_PKTSIZE_MIN(txr->hn_agg_align)) {
 				/*
 				 * Probably can't aggregate more packets,
 				 * flush this aggregating txdesc proactively.
 				 */
 				txr->hn_agg_pktleft = 0;
 			}
 			/* Done! */
 			return (chim);
 		}
 		hn_flush_txagg(ifp, txr);
 	}
 	KASSERT(txr->hn_agg_txd == NULL, ("lingering aggregating txdesc"));
 
 	txr->hn_tx_chimney_tried++;
 	txd->chim_index = hn_chim_alloc(txr->hn_sc);
 	if (txd->chim_index == HN_NVS_CHIM_IDX_INVALID)
 		return (NULL);
 	txr->hn_tx_chimney++;
 
 	chim = txr->hn_sc->hn_chim +
 	    (txd->chim_index * txr->hn_sc->hn_chim_szmax);
 
 	if (txr->hn_agg_pktmax > 1 &&
 	    txr->hn_agg_szmax > pktsize + HN_PKTSIZE_MIN(txr->hn_agg_align)) {
 		txr->hn_agg_txd = txd;
 		txr->hn_agg_pktleft = txr->hn_agg_pktmax - 1;
 		txr->hn_agg_szleft = txr->hn_agg_szmax - pktsize;
 		txr->hn_agg_prevpkt = chim;
 	}
 	return (chim);
 }
 
 /*
  * NOTE:
  * If this function fails, then both txd and m_head0 will be freed.
  */
 static int
 hn_encap(if_t ifp, struct hn_tx_ring *txr, struct hn_txdesc *txd,
     struct mbuf **m_head0)
 {
 	bus_dma_segment_t segs[HN_TX_DATA_SEGCNT_MAX];
 	int error, nsegs, i;
 	struct mbuf *m_head = *m_head0;
 	struct rndis_packet_msg *pkt;
 	uint32_t *pi_data;
 	void *chim = NULL;
 	int pkt_hlen, pkt_size;
 
 	pkt = txd->rndis_pkt;
 	pkt_size = HN_PKTSIZE(m_head, txr->hn_agg_align);
 	if (pkt_size < txr->hn_chim_size) {
 		chim = hn_try_txagg(ifp, txr, txd, pkt_size);
 		if (chim != NULL)
 			pkt = chim;
 	} else {
 		if (txr->hn_agg_txd != NULL)
 			hn_flush_txagg(ifp, txr);
 	}
 
 	pkt->rm_type = REMOTE_NDIS_PACKET_MSG;
 	pkt->rm_len = m_head->m_pkthdr.len;
 	pkt->rm_dataoffset = 0;
 	pkt->rm_datalen = m_head->m_pkthdr.len;
 	pkt->rm_oobdataoffset = 0;
 	pkt->rm_oobdatalen = 0;
 	pkt->rm_oobdataelements = 0;
 	pkt->rm_pktinfooffset = sizeof(*pkt);
 	pkt->rm_pktinfolen = 0;
 	pkt->rm_vchandle = 0;
 	pkt->rm_reserved = 0;
 
 	if (txr->hn_tx_flags & HN_TX_FLAG_HASHVAL) {
 		/*
 		 * Set the hash value for this packet.
 		 */
 		pi_data = hn_rndis_pktinfo_append(pkt, HN_RNDIS_PKT_LEN,
 		    HN_NDIS_HASH_VALUE_SIZE, HN_NDIS_PKTINFO_TYPE_HASHVAL);
 
 		if (M_HASHTYPE_ISHASH(m_head))
 			/*
 			 * The flowid field contains the hash value host
 			 * set in the rx queue if it is a ip forwarding pkt.
 			 * Set the same hash value so host can send on the
 			 * cpu it was received.
 			 */
 			*pi_data = m_head->m_pkthdr.flowid;
 		else
 			/*
 			 * Otherwise just put the tx queue index.
 			 */
 			*pi_data = txr->hn_tx_idx;
 	}
 
 	if (m_head->m_flags & M_VLANTAG) {
 		pi_data = hn_rndis_pktinfo_append(pkt, HN_RNDIS_PKT_LEN,
 		    NDIS_VLAN_INFO_SIZE, NDIS_PKTINFO_TYPE_VLAN);
 		*pi_data = NDIS_VLAN_INFO_MAKE(
 		    EVL_VLANOFTAG(m_head->m_pkthdr.ether_vtag),
 		    EVL_PRIOFTAG(m_head->m_pkthdr.ether_vtag),
 		    EVL_CFIOFTAG(m_head->m_pkthdr.ether_vtag));
 	}
 
 	if (m_head->m_pkthdr.csum_flags & CSUM_TSO) {
 #if defined(INET6) || defined(INET)
 		pi_data = hn_rndis_pktinfo_append(pkt, HN_RNDIS_PKT_LEN,
 		    NDIS_LSO2_INFO_SIZE, NDIS_PKTINFO_TYPE_LSO);
 #ifdef INET
 		if (m_head->m_pkthdr.csum_flags & CSUM_IP_TSO) {
 			*pi_data = NDIS_LSO2_INFO_MAKEIPV4(
 			    m_head->m_pkthdr.l2hlen + m_head->m_pkthdr.l3hlen,
 			    m_head->m_pkthdr.tso_segsz);
 		}
 #endif
 #if defined(INET6) && defined(INET)
 		else
 #endif
 #ifdef INET6
 		{
 			*pi_data = NDIS_LSO2_INFO_MAKEIPV6(
 			    m_head->m_pkthdr.l2hlen + m_head->m_pkthdr.l3hlen,
 			    m_head->m_pkthdr.tso_segsz);
 		}
 #endif
 #endif	/* INET6 || INET */
 	} else if (m_head->m_pkthdr.csum_flags & txr->hn_csum_assist) {
 		pi_data = hn_rndis_pktinfo_append(pkt, HN_RNDIS_PKT_LEN,
 		    NDIS_TXCSUM_INFO_SIZE, NDIS_PKTINFO_TYPE_CSUM);
 		if (m_head->m_pkthdr.csum_flags &
 		    (CSUM_IP6_TCP | CSUM_IP6_UDP)) {
 			*pi_data = NDIS_TXCSUM_INFO_IPV6;
 		} else {
 			*pi_data = NDIS_TXCSUM_INFO_IPV4;
 			if (m_head->m_pkthdr.csum_flags & CSUM_IP)
 				*pi_data |= NDIS_TXCSUM_INFO_IPCS;
 		}
 
 		if (m_head->m_pkthdr.csum_flags &
 		    (CSUM_IP_TCP | CSUM_IP6_TCP)) {
 			*pi_data |= NDIS_TXCSUM_INFO_MKTCPCS(
 			    m_head->m_pkthdr.l2hlen + m_head->m_pkthdr.l3hlen);
 		} else if (m_head->m_pkthdr.csum_flags &
 		    (CSUM_IP_UDP | CSUM_IP6_UDP)) {
 			*pi_data |= NDIS_TXCSUM_INFO_MKUDPCS(
 			    m_head->m_pkthdr.l2hlen + m_head->m_pkthdr.l3hlen);
 		}
 	}
 
 	pkt_hlen = pkt->rm_pktinfooffset + pkt->rm_pktinfolen;
 	/* Fixup RNDIS packet message total length */
 	pkt->rm_len += pkt_hlen;
 	/* Convert RNDIS packet message offsets */
 	pkt->rm_dataoffset = hn_rndis_pktmsg_offset(pkt_hlen);
 	pkt->rm_pktinfooffset = hn_rndis_pktmsg_offset(pkt->rm_pktinfooffset);
 
 	/*
 	 * Fast path: Chimney sending.
 	 */
 	if (chim != NULL) {
 		struct hn_txdesc *tgt_txd = txd;
 
 		if (txr->hn_agg_txd != NULL) {
 			tgt_txd = txr->hn_agg_txd;
 #ifdef INVARIANTS
 			*m_head0 = NULL;
 #endif
 		}
 
 		KASSERT(pkt == chim,
 		    ("RNDIS pkt not in chimney sending buffer"));
 		KASSERT(tgt_txd->chim_index != HN_NVS_CHIM_IDX_INVALID,
 		    ("chimney sending buffer is not used"));
 		tgt_txd->chim_size += pkt->rm_len;
 
 		m_copydata(m_head, 0, m_head->m_pkthdr.len,
 		    ((uint8_t *)chim) + pkt_hlen);
 
 		txr->hn_gpa_cnt = 0;
 		txr->hn_sendpkt = hn_txpkt_chim;
 		goto done;
 	}
 
 	KASSERT(txr->hn_agg_txd == NULL, ("aggregating sglist txdesc"));
 	KASSERT(txd->chim_index == HN_NVS_CHIM_IDX_INVALID,
 	    ("chimney buffer is used"));
 	KASSERT(pkt == txd->rndis_pkt, ("RNDIS pkt not in txdesc"));
 
 	error = hn_txdesc_dmamap_load(txr, txd, &m_head, segs, &nsegs);
 	if (__predict_false(error)) {
 		int freed __diagused;
 
 		/*
 		 * This mbuf is not linked w/ the txd yet, so free it now.
 		 */
 		m_freem(m_head);
 		*m_head0 = NULL;
 
 		freed = hn_txdesc_put(txr, txd);
 		KASSERT(freed != 0,
 		    ("fail to free txd upon txdma error"));
 
 		txr->hn_txdma_failed++;
 		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 		return error;
 	}
 	*m_head0 = m_head;
 
 	/* +1 RNDIS packet message */
 	txr->hn_gpa_cnt = nsegs + 1;
 
 	/* send packet with page buffer */
 	txr->hn_gpa[0].gpa_page = atop(txd->rndis_pkt_paddr);
 	txr->hn_gpa[0].gpa_ofs = txd->rndis_pkt_paddr & PAGE_MASK;
 	txr->hn_gpa[0].gpa_len = pkt_hlen;
 
 	/*
 	 * Fill the page buffers with mbuf info after the page
 	 * buffer for RNDIS packet message.
 	 */
 	for (i = 0; i < nsegs; ++i) {
 		struct vmbus_gpa *gpa = &txr->hn_gpa[i + 1];
 
 		gpa->gpa_page = atop(segs[i].ds_addr);
 		gpa->gpa_ofs = segs[i].ds_addr & PAGE_MASK;
 		gpa->gpa_len = segs[i].ds_len;
 	}
 
 	txd->chim_index = HN_NVS_CHIM_IDX_INVALID;
 	txd->chim_size = 0;
 	txr->hn_sendpkt = hn_txpkt_sglist;
 done:
 	txd->m = m_head;
 
 	/* Set the completion routine */
 	hn_nvs_sendctx_init(&txd->send_ctx, hn_txpkt_done, txd);
 
 	/* Update temporary stats for later use. */
 	txr->hn_stat_pkts++;
 	txr->hn_stat_size += m_head->m_pkthdr.len;
 	if (m_head->m_flags & M_MCAST)
 		txr->hn_stat_mcasts++;
 
 	return 0;
 }
 
 /*
  * NOTE:
  * If this function fails, then txd will be freed, but the mbuf
  * associated w/ the txd will _not_ be freed.
  */
 static int
 hn_txpkt(if_t ifp, struct hn_tx_ring *txr, struct hn_txdesc *txd)
 {
 	int error, send_failed = 0, has_bpf;
 
 again:
 	has_bpf = bpf_peers_present_if(ifp);
 	if (has_bpf) {
 		/*
 		 * Make sure that this txd and any aggregated txds are not
 		 * freed before ETHER_BPF_MTAP.
 		 */
 		hn_txdesc_hold(txd);
 	}
 	error = txr->hn_sendpkt(txr, txd);
 	if (!error) {
 		if (has_bpf) {
 			const struct hn_txdesc *tmp_txd;
 
 			ETHER_BPF_MTAP(ifp, txd->m);
 			STAILQ_FOREACH(tmp_txd, &txd->agg_list, agg_link)
 				ETHER_BPF_MTAP(ifp, tmp_txd->m);
 		}
 
 		if_inc_counter(ifp, IFCOUNTER_OPACKETS, txr->hn_stat_pkts);
 #ifdef HN_IFSTART_SUPPORT
 		if (!hn_use_if_start)
 #endif
 		{
 			if_inc_counter(ifp, IFCOUNTER_OBYTES,
 			    txr->hn_stat_size);
 			if (txr->hn_stat_mcasts != 0) {
 				if_inc_counter(ifp, IFCOUNTER_OMCASTS,
 				    txr->hn_stat_mcasts);
 			}
 		}
 		txr->hn_pkts += txr->hn_stat_pkts;
 		txr->hn_sends++;
 	}
 	if (has_bpf)
 		hn_txdesc_put(txr, txd);
 
 	if (__predict_false(error)) {
 		int freed __diagused;
 
 		/*
 		 * This should "really rarely" happen.
 		 *
 		 * XXX Too many RX to be acked or too many sideband
 		 * commands to run?  Ask netvsc_channel_rollup()
 		 * to kick start later.
 		 */
 		txr->hn_has_txeof = 1;
 		if (!send_failed) {
 			txr->hn_send_failed++;
 			send_failed = 1;
 			/*
 			 * Try sending again after set hn_has_txeof;
 			 * in case that we missed the last
 			 * netvsc_channel_rollup().
 			 */
 			goto again;
 		}
 		if_printf(ifp, "send failed\n");
 
 		/*
 		 * Caller will perform further processing on the
 		 * associated mbuf, so don't free it in hn_txdesc_put();
 		 * only unload it from the DMA map in hn_txdesc_put(),
 		 * if it was loaded.
 		 */
 		txd->m = NULL;
 		freed = hn_txdesc_put(txr, txd);
 		KASSERT(freed != 0,
 		    ("fail to free txd upon send error"));
 
 		txr->hn_send_failed++;
 	}
 
 	/* Reset temporary stats, after this sending is done. */
 	txr->hn_stat_size = 0;
 	txr->hn_stat_pkts = 0;
 	txr->hn_stat_mcasts = 0;
 
 	return (error);
 }
 
 /*
  * Append the specified data to the indicated mbuf chain,
  * Extend the mbuf chain if the new data does not fit in
  * existing space.
  *
  * This is a minor rewrite of m_append() from sys/kern/uipc_mbuf.c.
  * There should be an equivalent in the kernel mbuf code,
  * but there does not appear to be one yet.
  *
  * Differs from m_append() in that additional mbufs are
  * allocated with cluster size MJUMPAGESIZE, and filled
  * accordingly.
  *
  * Return the last mbuf in the chain or NULL if failed to
  * allocate new mbuf.
  */
 static struct mbuf *
 hv_m_append(struct mbuf *m0, int len, c_caddr_t cp)
 {
 	struct mbuf *m, *n;
 	int remainder, space;
 
 	for (m = m0; m->m_next != NULL; m = m->m_next)
 		;
 	remainder = len;
 	space = M_TRAILINGSPACE(m);
 	if (space > 0) {
 		/*
 		 * Copy into available space.
 		 */
 		if (space > remainder)
 			space = remainder;
 		bcopy(cp, mtod(m, caddr_t) + m->m_len, space);
 		m->m_len += space;
 		cp += space;
 		remainder -= space;
 	}
 	while (remainder > 0) {
 		/*
 		 * Allocate a new mbuf; could check space
 		 * and allocate a cluster instead.
 		 */
 		n = m_getjcl(M_NOWAIT, m->m_type, 0, MJUMPAGESIZE);
 		if (n == NULL)
 			return NULL;
 		n->m_len = min(MJUMPAGESIZE, remainder);
 		bcopy(cp, mtod(n, caddr_t), n->m_len);
 		cp += n->m_len;
 		remainder -= n->m_len;
 		m->m_next = n;
 		m = n;
 	}
 
 	return m;
 }
 
 #if defined(INET) || defined(INET6)
 static __inline int
 hn_lro_rx(struct lro_ctrl *lc, struct mbuf *m)
 {
 	if (hn_lro_mbufq_depth) {
 		tcp_lro_queue_mbuf(lc, m);
 		return 0;
 	}
 	return tcp_lro_rx(lc, m, 0);
 }
 #endif
 
 static int
 hn_rxpkt(struct hn_rx_ring *rxr)
 {
 	if_t ifp, hn_ifp = rxr->hn_ifp;
 	struct mbuf *m_new, *n;
 	int size, do_lro = 0, do_csum = 1, is_vf = 0;
 	int hash_type = M_HASHTYPE_NONE;
 	int l3proto = ETHERTYPE_MAX, l4proto = IPPROTO_DONE;
 	int i;
 
 	ifp = hn_ifp;
 	if (rxr->hn_rxvf_ifp != NULL) {
 		/*
 		 * Non-transparent mode VF; pretend this packet is from
 		 * the VF.
 		 */
 		ifp = rxr->hn_rxvf_ifp;
 		is_vf = 1;
 	} else if (rxr->hn_rx_flags & HN_RX_FLAG_XPNT_VF) {
 		/* Transparent mode VF. */
 		is_vf = 1;
 	}
 
 	if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0) {
 		/*
 		 * NOTE:
 		 * See the NOTE of hn_rndis_init_fixat().  This
 		 * function can be reached, immediately after the
 		 * RNDIS is initialized but before the ifnet is
 		 * setup on the hn_attach() path; drop the unexpected
 		 * packets.
 		 */
 		return (0);
 	}
 
 	if (__predict_false(rxr->rsc.pktlen < ETHER_HDR_LEN)) {
 		if_inc_counter(hn_ifp, IFCOUNTER_IERRORS, 1);
 		return (0);
 	}
 
 	if (rxr->rsc.cnt == 1 && rxr->rsc.pktlen <= MHLEN) {
 		m_new = m_gethdr(M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			if_inc_counter(hn_ifp, IFCOUNTER_IQDROPS, 1);
 			return (0);
 		}
 		memcpy(mtod(m_new, void *), rxr->rsc.frag_data[0],
 		    rxr->rsc.frag_len[0]);
 		m_new->m_pkthdr.len = m_new->m_len = rxr->rsc.frag_len[0];
 	} else {
 		/*
 		 * Get an mbuf with a cluster.  For packets 2K or less,
 		 * get a standard 2K cluster.  For anything larger, get a
 		 * 4K cluster.  Any buffers larger than 4K can cause problems
 		 * if looped around to the Hyper-V TX channel, so avoid them.
 		 */
 		size = MCLBYTES;
 		if (rxr->rsc.pktlen > MCLBYTES) {
 			/* 4096 */
 			size = MJUMPAGESIZE;
 		}
 
 		m_new = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, size);
 		if (m_new == NULL) {
 			if_inc_counter(hn_ifp, IFCOUNTER_IQDROPS, 1);
 			return (0);
 		}
 
 		n = m_new;
 		for (i = 0; i < rxr->rsc.cnt; i++) {
 			n = hv_m_append(n, rxr->rsc.frag_len[i],
 			    rxr->rsc.frag_data[i]);
 			if (n == NULL) {
 				if_inc_counter(hn_ifp, IFCOUNTER_IQDROPS, 1);
 				return (0);
 			} else {
 				m_new->m_pkthdr.len += rxr->rsc.frag_len[i];
 			}
 		}
 	}
 	if (rxr->rsc.pktlen <= MHLEN)
 		rxr->hn_small_pkts++;
 
 	m_new->m_pkthdr.rcvif = ifp;
 
 	if (__predict_false((if_getcapenable(hn_ifp) & IFCAP_RXCSUM) == 0))
 		do_csum = 0;
 
 	/* receive side checksum offload */
 	if (rxr->rsc.csum_info != NULL) {
 		/* IP csum offload */
 		if ((*(rxr->rsc.csum_info) & NDIS_RXCSUM_INFO_IPCS_OK) && do_csum) {
 			m_new->m_pkthdr.csum_flags |=
 			    (CSUM_IP_CHECKED | CSUM_IP_VALID);
 			rxr->hn_csum_ip++;
 		}
 
 		/* TCP/UDP csum offload */
 		if ((*(rxr->rsc.csum_info) & (NDIS_RXCSUM_INFO_UDPCS_OK |
 		     NDIS_RXCSUM_INFO_TCPCS_OK)) && do_csum) {
 			m_new->m_pkthdr.csum_flags |=
 			    (CSUM_DATA_VALID | CSUM_PSEUDO_HDR);
 			m_new->m_pkthdr.csum_data = 0xffff;
 			if (*(rxr->rsc.csum_info) & NDIS_RXCSUM_INFO_TCPCS_OK)
 				rxr->hn_csum_tcp++;
 			else
 				rxr->hn_csum_udp++;
 		}
 
 		/*
 		 * XXX
 		 * As of this write (Oct 28th, 2016), host side will turn
 		 * on only TCPCS_OK and IPCS_OK even for UDP datagrams, so
 		 * the do_lro setting here is actually _not_ accurate.  We
 		 * depend on the RSS hash type check to reset do_lro.
 		 */
 		if ((*(rxr->rsc.csum_info) &
 		     (NDIS_RXCSUM_INFO_TCPCS_OK | NDIS_RXCSUM_INFO_IPCS_OK)) ==
 		    (NDIS_RXCSUM_INFO_TCPCS_OK | NDIS_RXCSUM_INFO_IPCS_OK))
 			do_lro = 1;
 	} else {
 		hn_rxpkt_proto(m_new, &l3proto, &l4proto);
 		if (l3proto == ETHERTYPE_IP) {
 			if (l4proto == IPPROTO_TCP) {
 				if (do_csum &&
 				    (rxr->hn_trust_hcsum &
 				     HN_TRUST_HCSUM_TCP)) {
 					rxr->hn_csum_trusted++;
 					m_new->m_pkthdr.csum_flags |=
 					   (CSUM_IP_CHECKED | CSUM_IP_VALID |
 					    CSUM_DATA_VALID | CSUM_PSEUDO_HDR);
 					m_new->m_pkthdr.csum_data = 0xffff;
 				}
 				do_lro = 1;
 			} else if (l4proto == IPPROTO_UDP) {
 				if (do_csum &&
 				    (rxr->hn_trust_hcsum &
 				     HN_TRUST_HCSUM_UDP)) {
 					rxr->hn_csum_trusted++;
 					m_new->m_pkthdr.csum_flags |=
 					   (CSUM_IP_CHECKED | CSUM_IP_VALID |
 					    CSUM_DATA_VALID | CSUM_PSEUDO_HDR);
 					m_new->m_pkthdr.csum_data = 0xffff;
 				}
 			} else if (l4proto != IPPROTO_DONE && do_csum &&
 			    (rxr->hn_trust_hcsum & HN_TRUST_HCSUM_IP)) {
 				rxr->hn_csum_trusted++;
 				m_new->m_pkthdr.csum_flags |=
 				    (CSUM_IP_CHECKED | CSUM_IP_VALID);
 			}
 		}
 	}
 
 	if (rxr->rsc.vlan_info != NULL) {
 		m_new->m_pkthdr.ether_vtag = EVL_MAKETAG(
 		    NDIS_VLAN_INFO_ID(*(rxr->rsc.vlan_info)),
 		    NDIS_VLAN_INFO_PRI(*(rxr->rsc.vlan_info)),
 		    NDIS_VLAN_INFO_CFI(*(rxr->rsc.vlan_info)));
 		m_new->m_flags |= M_VLANTAG;
 	}
 
 	/*
 	 * If VF is activated (tranparent/non-transparent mode does not
 	 * matter here).
 	 *
 	 * - Disable LRO
 	 *
 	 *   hn(4) will only receive broadcast packets, multicast packets,
 	 *   TCP SYN and SYN|ACK (in Azure), LRO is useless for these
 	 *   packet types.
 	 *
 	 *   For non-transparent, we definitely _cannot_ enable LRO at
 	 *   all, since the LRO flush will use hn(4) as the receiving
 	 *   interface; i.e. hn_ifp->if_input(hn_ifp, m).
 	 */
 	if (is_vf)
 		do_lro = 0;
 
 	/*
 	 * If VF is activated (tranparent/non-transparent mode does not
 	 * matter here), do _not_ mess with unsupported hash types or
 	 * functions.
 	 */
 	if (rxr->rsc.hash_info != NULL) {
 		rxr->hn_rss_pkts++;
 		m_new->m_pkthdr.flowid = *(rxr->rsc.hash_value);
 		if (!is_vf)
 			hash_type = M_HASHTYPE_OPAQUE_HASH;
 		if ((*(rxr->rsc.hash_info) & NDIS_HASH_FUNCTION_MASK) ==
 		    NDIS_HASH_FUNCTION_TOEPLITZ) {
 			uint32_t type = (*(rxr->rsc.hash_info) & NDIS_HASH_TYPE_MASK &
 			    rxr->hn_mbuf_hash);
 
 			/*
 			 * NOTE:
 			 * do_lro is resetted, if the hash types are not TCP
 			 * related.  See the comment in the above csum_flags
 			 * setup section.
 			 */
 			switch (type) {
 			case NDIS_HASH_IPV4:
 				hash_type = M_HASHTYPE_RSS_IPV4;
 				do_lro = 0;
 				break;
 
 			case NDIS_HASH_TCP_IPV4:
 				hash_type = M_HASHTYPE_RSS_TCP_IPV4;
 				if (rxr->hn_rx_flags & HN_RX_FLAG_UDP_HASH) {
 					int def_htype = M_HASHTYPE_OPAQUE_HASH;
 
 					if (is_vf)
 						def_htype = M_HASHTYPE_NONE;
 
 					/*
 					 * UDP 4-tuple hash is delivered as
 					 * TCP 4-tuple hash.
 					 */
 					if (l3proto == ETHERTYPE_MAX) {
 						hn_rxpkt_proto(m_new,
 						    &l3proto, &l4proto);
 					}
 					if (l3proto == ETHERTYPE_IP) {
 						if (l4proto == IPPROTO_UDP &&
 						    (rxr->hn_mbuf_hash &
 						     NDIS_HASH_UDP_IPV4_X)) {
 							hash_type =
 							M_HASHTYPE_RSS_UDP_IPV4;
 							do_lro = 0;
 						} else if (l4proto !=
 						    IPPROTO_TCP) {
 							hash_type = def_htype;
 							do_lro = 0;
 						}
 					} else {
 						hash_type = def_htype;
 						do_lro = 0;
 					}
 				}
 				break;
 
 			case NDIS_HASH_IPV6:
 				hash_type = M_HASHTYPE_RSS_IPV6;
 				do_lro = 0;
 				break;
 
 			case NDIS_HASH_IPV6_EX:
 				hash_type = M_HASHTYPE_RSS_IPV6_EX;
 				do_lro = 0;
 				break;
 
 			case NDIS_HASH_TCP_IPV6:
 				hash_type = M_HASHTYPE_RSS_TCP_IPV6;
 				break;
 
 			case NDIS_HASH_TCP_IPV6_EX:
 				hash_type = M_HASHTYPE_RSS_TCP_IPV6_EX;
 				break;
 			}
 		}
 	} else if (!is_vf) {
 		m_new->m_pkthdr.flowid = rxr->hn_rx_idx;
 		hash_type = M_HASHTYPE_OPAQUE;
 	}
 	M_HASHTYPE_SET(m_new, hash_type);
 
 	if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 	if (hn_ifp != ifp) {
 		const struct ether_header *eh;
 
 		/*
 		 * Non-transparent mode VF is activated.
 		 */
 
 		/*
 		 * Allow tapping on hn(4).
 		 */
 		ETHER_BPF_MTAP(hn_ifp, m_new);
 
 		/*
 		 * Update hn(4)'s stats.
 		 */
 		if_inc_counter(hn_ifp, IFCOUNTER_IPACKETS, 1);
 		if_inc_counter(hn_ifp, IFCOUNTER_IBYTES, m_new->m_pkthdr.len);
 		/* Checked at the beginning of this function. */
 		KASSERT(m_new->m_len >= ETHER_HDR_LEN, ("not ethernet frame"));
 		eh = mtod(m_new, struct ether_header *);
 		if (ETHER_IS_MULTICAST(eh->ether_dhost))
 			if_inc_counter(hn_ifp, IFCOUNTER_IMCASTS, 1);
 	}
 	rxr->hn_pkts++;
 
 	if ((if_getcapenable(hn_ifp) & IFCAP_LRO) && do_lro) {
 #if defined(INET) || defined(INET6)
 		struct lro_ctrl *lro = &rxr->hn_lro;
 
 		if (lro->lro_cnt) {
 			rxr->hn_lro_tried++;
 			if (hn_lro_rx(lro, m_new) == 0) {
 				/* DONE! */
 				return 0;
 			}
 		}
 #endif
 	}
 	if_input(ifp, m_new);
 
 	return (0);
 }
 
 static int
 hn_ioctl(if_t ifp, u_long cmd, caddr_t data)
 {
 	struct hn_softc *sc = if_getsoftc(ifp);
 	struct ifreq *ifr = (struct ifreq *)data, ifr_vf;
 	if_t vf_ifp;
 	int mask, error = 0;
 	struct ifrsskey *ifrk;
 	struct ifrsshash *ifrh;
 	uint32_t mtu;
 
 	switch (cmd) {
 	case SIOCSIFMTU:
 		if (ifr->ifr_mtu > HN_MTU_MAX) {
 			error = EINVAL;
 			break;
 		}
 
 		HN_LOCK(sc);
 
 		if ((sc->hn_flags & HN_FLAG_SYNTH_ATTACHED) == 0) {
 			HN_UNLOCK(sc);
 			break;
 		}
 
 		if ((sc->hn_caps & HN_CAP_MTU) == 0) {
 			/* Can't change MTU */
 			HN_UNLOCK(sc);
 			error = EOPNOTSUPP;
 			break;
 		}
 
 		if (if_getmtu(ifp) == ifr->ifr_mtu) {
 			HN_UNLOCK(sc);
 			break;
 		}
 
 		if (hn_xpnt_vf_isready(sc)) {
 			vf_ifp = sc->hn_vf_ifp;
 			ifr_vf = *ifr;
 			strlcpy(ifr_vf.ifr_name, if_name(vf_ifp),
 			    sizeof(ifr_vf.ifr_name));
 			error = ifhwioctl(SIOCSIFMTU,vf_ifp, 
 			    (caddr_t)&ifr_vf, curthread);
 			if (error) {
 				HN_UNLOCK(sc);
 				if_printf(ifp, "%s SIOCSIFMTU %d failed: %d\n",
 				    if_name(vf_ifp), ifr->ifr_mtu, error);
 				break;
 			}
 		}
 
 		/*
 		 * Suspend this interface before the synthetic parts
 		 * are ripped.
 		 */
 		hn_suspend(sc);
 
 		/*
 		 * Detach the synthetics parts, i.e. NVS and RNDIS.
 		 */
 		hn_synth_detach(sc);
 
 		/*
 		 * Reattach the synthetic parts, i.e. NVS and RNDIS,
 		 * with the new MTU setting.
 		 */
 		error = hn_synth_attach(sc, ifr->ifr_mtu);
 		if (error) {
 			HN_UNLOCK(sc);
 			break;
 		}
 
 		error = hn_rndis_get_mtu(sc, &mtu);
 		if (error)
 			mtu = ifr->ifr_mtu;
 		else if (bootverbose)
 			if_printf(ifp, "RNDIS mtu %u\n", mtu);
 
 		/*
 		 * Commit the requested MTU, after the synthetic parts
 		 * have been successfully attached.
 		 */
 		if (mtu >= ifr->ifr_mtu) {
 			mtu = ifr->ifr_mtu;
 		} else {
 			if_printf(ifp, "fixup mtu %d -> %u\n",
 			    ifr->ifr_mtu, mtu);
 		}
 		if_setmtu(ifp, mtu);
 
 		/*
 		 * Synthetic parts' reattach may change the chimney
 		 * sending size; update it.
 		 */
 		if (sc->hn_tx_ring[0].hn_chim_size > sc->hn_chim_szmax)
 			hn_set_chim_size(sc, sc->hn_chim_szmax);
 
 		/*
 		 * Make sure that various parameters based on MTU are
 		 * still valid, after the MTU change.
 		 */
 		hn_mtu_change_fixup(sc);
 
 		/*
 		 * All done!  Resume the interface now.
 		 */
 		hn_resume(sc);
 
 		if ((sc->hn_flags & HN_FLAG_RXVF) ||
 		    (sc->hn_xvf_flags & HN_XVFFLAG_ENABLED)) {
 			/*
 			 * Since we have reattached the NVS part,
 			 * change the datapath to VF again; in case
 			 * that it is lost, after the NVS was detached.
 			 */
 			hn_nvs_set_datapath(sc, HN_NVS_DATAPATH_VF);
 		}
 
 		HN_UNLOCK(sc);
 		break;
 
 	case SIOCSIFFLAGS:
 		HN_LOCK(sc);
 
 		if ((sc->hn_flags & HN_FLAG_SYNTH_ATTACHED) == 0) {
 			HN_UNLOCK(sc);
 			break;
 		}
 
 		if (hn_xpnt_vf_isready(sc))
 			hn_xpnt_vf_saveifflags(sc);
 
 		if (if_getflags(ifp) & IFF_UP) {
 			if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
 				/*
 				 * Caller meight hold mutex, e.g.
 				 * bpf; use busy-wait for the RNDIS
 				 * reply.
 				 */
 				HN_NO_SLEEPING(sc);
 				hn_rxfilter_config(sc);
 				HN_SLEEPING_OK(sc);
 
 				if (sc->hn_xvf_flags & HN_XVFFLAG_ENABLED)
 					error = hn_xpnt_vf_iocsetflags(sc);
 			} else {
 				hn_init_locked(sc);
 			}
 		} else {
 			if (if_getdrvflags(ifp) & IFF_DRV_RUNNING)
 				hn_stop(sc, false);
 		}
 		sc->hn_if_flags = if_getflags(ifp);
 
 		HN_UNLOCK(sc);
 		break;
 
 	case SIOCSIFCAP:
 		HN_LOCK(sc);
 
 		if (hn_xpnt_vf_isready(sc)) {
 			ifr_vf = *ifr;
 			strlcpy(ifr_vf.ifr_name, if_name(sc->hn_vf_ifp),
 			    sizeof(ifr_vf.ifr_name));
 			error = hn_xpnt_vf_iocsetcaps(sc, &ifr_vf);
 			HN_UNLOCK(sc);
 			break;
 		}
 
 		/*
 		 * Fix up requested capabilities w/ supported capabilities,
 		 * since the supported capabilities could have been changed.
 		 */
 		mask = (ifr->ifr_reqcap & if_getcapabilities(ifp)) ^
 		    if_getcapenable(ifp);
 
 		if (mask & IFCAP_TXCSUM) {
 			if_togglecapenable(ifp, IFCAP_TXCSUM);
 			if (if_getcapenable(ifp) & IFCAP_TXCSUM)
 				if_sethwassistbits(ifp, HN_CSUM_IP_HWASSIST(sc), 0);
 			else
 				if_sethwassistbits(ifp, 0, HN_CSUM_IP_HWASSIST(sc));
 		}
 		if (mask & IFCAP_TXCSUM_IPV6) {
 			if_togglecapenable(ifp, IFCAP_TXCSUM_IPV6);
 			if (if_getcapenable(ifp) & IFCAP_TXCSUM_IPV6)
 				if_sethwassistbits(ifp, HN_CSUM_IP6_HWASSIST(sc), 0);
 			else
 				if_sethwassistbits(ifp, 0, HN_CSUM_IP6_HWASSIST(sc));
 		}
 
 		/* TODO: flip RNDIS offload parameters for RXCSUM. */
 		if (mask & IFCAP_RXCSUM)
 			if_togglecapenable(ifp, IFCAP_RXCSUM);
 #ifdef foo
 		/* We can't diff IPv6 packets from IPv4 packets on RX path. */
 		if (mask & IFCAP_RXCSUM_IPV6)
 			if_togglecapenable(ifp, IFCAP_RXCSUM_IPV6);
 #endif
 
 		if (mask & IFCAP_LRO)
 			if_togglecapenable(ifp, IFCAP_LRO);
 
 		if (mask & IFCAP_TSO4) {
 			if_togglecapenable(ifp, IFCAP_TSO4);
 			if (if_getcapenable(ifp) & IFCAP_TSO4)
 				if_sethwassistbits(ifp, CSUM_IP_TSO, 0);
 			else
 				if_sethwassistbits(ifp, 0, CSUM_IP_TSO);
 		}
 		if (mask & IFCAP_TSO6) {
 			if_togglecapenable(ifp, IFCAP_TSO6);
 			if (if_getcapenable(ifp) & IFCAP_TSO6)
 				if_sethwassistbits(ifp, CSUM_IP6_TSO, 0);
 			else
 				if_sethwassistbits(ifp, 0, CSUM_IP6_TSO);
 		}
 
 		HN_UNLOCK(sc);
 		break;
 
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
 		HN_LOCK(sc);
 
 		if ((sc->hn_flags & HN_FLAG_SYNTH_ATTACHED) == 0) {
 			HN_UNLOCK(sc);
 			break;
 		}
 		if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
 			/*
 			 * Multicast uses mutex; use busy-wait for
 			 * the RNDIS reply.
 			 */
 			HN_NO_SLEEPING(sc);
 			hn_rxfilter_config(sc);
 			HN_SLEEPING_OK(sc);
 		}
 
 		/* XXX vlan(4) style mcast addr maintenance */
 		if (hn_xpnt_vf_isready(sc)) {
 			int old_if_flags;
 
 			old_if_flags = if_getflags(sc->hn_vf_ifp);
 			hn_xpnt_vf_saveifflags(sc);
 
 			if ((sc->hn_xvf_flags & HN_XVFFLAG_ENABLED) &&
 			    ((old_if_flags ^ if_getflags(sc->hn_vf_ifp)) &
 			     IFF_ALLMULTI))
 				error = hn_xpnt_vf_iocsetflags(sc);
 		}
 
 		HN_UNLOCK(sc);
 		break;
 
 	case SIOCSIFMEDIA:
 	case SIOCGIFMEDIA:
 		HN_LOCK(sc);
 		if (hn_xpnt_vf_isready(sc)) {
 			/*
 			 * SIOCGIFMEDIA expects ifmediareq, so don't
 			 * create and pass ifr_vf to the VF here; just
 			 * replace the ifr_name.
 			 */
 			vf_ifp = sc->hn_vf_ifp;
 			strlcpy(ifr->ifr_name, if_name(vf_ifp),
 			    sizeof(ifr->ifr_name));
 			error = ifhwioctl(cmd, vf_ifp, data, curthread);
 			/* Restore the ifr_name. */
 			strlcpy(ifr->ifr_name, if_name(ifp),
 			    sizeof(ifr->ifr_name));
 			HN_UNLOCK(sc);
 			break;
 		}
 		HN_UNLOCK(sc);
 		error = ifmedia_ioctl(ifp, ifr, &sc->hn_media, cmd);
 		break;
 
 	case SIOCGIFRSSHASH:
 		ifrh = (struct ifrsshash *)data;
 		HN_LOCK(sc);
 		if (sc->hn_rx_ring_inuse == 1) {
 			HN_UNLOCK(sc);
 			ifrh->ifrh_func = RSS_FUNC_NONE;
 			ifrh->ifrh_types = 0;
 			break;
 		}
 
 		if (sc->hn_rss_hash & NDIS_HASH_FUNCTION_TOEPLITZ)
 			ifrh->ifrh_func = RSS_FUNC_TOEPLITZ;
 		else
 			ifrh->ifrh_func = RSS_FUNC_PRIVATE;
 		ifrh->ifrh_types = hn_rss_type_fromndis(sc->hn_rss_hash);
 		HN_UNLOCK(sc);
 		break;
 
 	case SIOCGIFRSSKEY:
 		ifrk = (struct ifrsskey *)data;
 		HN_LOCK(sc);
 		if (sc->hn_rx_ring_inuse == 1) {
 			HN_UNLOCK(sc);
 			ifrk->ifrk_func = RSS_FUNC_NONE;
 			ifrk->ifrk_keylen = 0;
 			break;
 		}
 		if (sc->hn_rss_hash & NDIS_HASH_FUNCTION_TOEPLITZ)
 			ifrk->ifrk_func = RSS_FUNC_TOEPLITZ;
 		else
 			ifrk->ifrk_func = RSS_FUNC_PRIVATE;
 		ifrk->ifrk_keylen = NDIS_HASH_KEYSIZE_TOEPLITZ;
 		memcpy(ifrk->ifrk_key, sc->hn_rss.rss_key,
 		    NDIS_HASH_KEYSIZE_TOEPLITZ);
 		HN_UNLOCK(sc);
 		break;
 
 	default:
 		error = ether_ioctl(ifp, cmd, data);
 		break;
 	}
 	return (error);
 }
 
 static void
 hn_stop(struct hn_softc *sc, bool detaching)
 {
 	if_t ifp = sc->hn_ifp;
 	int i;
 
 	HN_LOCK_ASSERT(sc);
 
 	KASSERT(sc->hn_flags & HN_FLAG_SYNTH_ATTACHED,
 	    ("synthetic parts were not attached"));
 
 	/* Clear RUNNING bit ASAP. */
 	if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING);
 
 	/* Disable polling. */
 	hn_polling(sc, 0);
 
 	if (sc->hn_xvf_flags & HN_XVFFLAG_ENABLED) {
 		KASSERT(sc->hn_vf_ifp != NULL,
 		    ("%s: VF is not attached", if_name(ifp)));
 
 		/* Mark transparent mode VF as disabled. */
 		hn_xpnt_vf_setdisable(sc, false /* keep hn_vf_ifp */);
 
 		/*
 		 * NOTE:
 		 * Datapath setting must happen _before_ bringing
 		 * the VF down.
 		 */
 		hn_nvs_set_datapath(sc, HN_NVS_DATAPATH_SYNTH);
 
 		/*
 		 * Bring the VF down.
 		 */
 		hn_xpnt_vf_saveifflags(sc);
 		if_setflagbits(ifp, 0, IFF_UP);
 		hn_xpnt_vf_iocsetflags(sc);
 	}
 
 	/* Suspend data transfers. */
 	hn_suspend_data(sc);
 
 	/* Clear OACTIVE bit. */
 	if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE);
 	for (i = 0; i < sc->hn_tx_ring_inuse; ++i)
 		sc->hn_tx_ring[i].hn_oactive = 0;
 
 	/*
 	 * If the non-transparent mode VF is active, make sure
 	 * that the RX filter still allows packet reception.
 	 */
 	if (!detaching && (sc->hn_flags & HN_FLAG_RXVF))
 		hn_rxfilter_config(sc);
 }
 
 static void
 hn_init_locked(struct hn_softc *sc)
 {
 	if_t ifp = sc->hn_ifp;
 	int i;
 
 	HN_LOCK_ASSERT(sc);
 
 	if ((sc->hn_flags & HN_FLAG_SYNTH_ATTACHED) == 0)
 		return;
 
 	if (if_getdrvflags(ifp) & IFF_DRV_RUNNING)
 		return;
 
 	/* Configure RX filter */
 	hn_rxfilter_config(sc);
 
 	/* Clear OACTIVE bit. */
 	if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE);
 	for (i = 0; i < sc->hn_tx_ring_inuse; ++i)
 		sc->hn_tx_ring[i].hn_oactive = 0;
 
 	/* Clear TX 'suspended' bit. */
 	hn_resume_tx(sc, sc->hn_tx_ring_inuse);
 
 	if (hn_xpnt_vf_isready(sc)) {
 		/* Initialize transparent VF. */
 		hn_xpnt_vf_init(sc);
 	}
 
 	/* Everything is ready; unleash! */
 	if_setdrvflagbits(ifp, IFF_DRV_RUNNING, 0);
 
 	/* Re-enable polling if requested. */
 	if (sc->hn_pollhz > 0)
 		hn_polling(sc, sc->hn_pollhz);
 }
 
 static void
 hn_init(void *xsc)
 {
 	struct hn_softc *sc = xsc;
 
 	HN_LOCK(sc);
 	hn_init_locked(sc);
 	HN_UNLOCK(sc);
 }
 
 static int
 hn_lro_lenlim_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	unsigned int lenlim;
 	int error;
 
 	lenlim = sc->hn_rx_ring[0].hn_lro.lro_length_lim;
 	error = sysctl_handle_int(oidp, &lenlim, 0, req);
 	if (error || req->newptr == NULL)
 		return error;
 
 	HN_LOCK(sc);
 	if (lenlim < HN_LRO_LENLIM_MIN(sc->hn_ifp) ||
 	    lenlim > TCP_LRO_LENGTH_MAX) {
 		HN_UNLOCK(sc);
 		return EINVAL;
 	}
 	hn_set_lro_lenlim(sc, lenlim);
 	HN_UNLOCK(sc);
 
 	return 0;
 }
 
 static int
 hn_lro_ackcnt_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int ackcnt, error, i;
 
 	/*
 	 * lro_ackcnt_lim is append count limit,
 	 * +1 to turn it into aggregation limit.
 	 */
 	ackcnt = sc->hn_rx_ring[0].hn_lro.lro_ackcnt_lim + 1;
 	error = sysctl_handle_int(oidp, &ackcnt, 0, req);
 	if (error || req->newptr == NULL)
 		return error;
 
 	if (ackcnt < 2 || ackcnt > (TCP_LRO_ACKCNT_MAX + 1))
 		return EINVAL;
 
 	/*
 	 * Convert aggregation limit back to append
 	 * count limit.
 	 */
 	--ackcnt;
 	HN_LOCK(sc);
 	for (i = 0; i < sc->hn_rx_ring_cnt; ++i)
 		sc->hn_rx_ring[i].hn_lro.lro_ackcnt_lim = ackcnt;
 	HN_UNLOCK(sc);
 	return 0;
 }
 
 static int
 hn_trust_hcsum_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int hcsum = arg2;
 	int on, error, i;
 
 	on = 0;
 	if (sc->hn_rx_ring[0].hn_trust_hcsum & hcsum)
 		on = 1;
 
 	error = sysctl_handle_int(oidp, &on, 0, req);
 	if (error || req->newptr == NULL)
 		return error;
 
 	HN_LOCK(sc);
 	for (i = 0; i < sc->hn_rx_ring_cnt; ++i) {
 		struct hn_rx_ring *rxr = &sc->hn_rx_ring[i];
 
 		if (on)
 			rxr->hn_trust_hcsum |= hcsum;
 		else
 			rxr->hn_trust_hcsum &= ~hcsum;
 	}
 	HN_UNLOCK(sc);
 	return 0;
 }
 
 static int
 hn_chim_size_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int chim_size, error;
 
 	chim_size = sc->hn_tx_ring[0].hn_chim_size;
 	error = sysctl_handle_int(oidp, &chim_size, 0, req);
 	if (error || req->newptr == NULL)
 		return error;
 
 	if (chim_size > sc->hn_chim_szmax || chim_size <= 0)
 		return EINVAL;
 
 	HN_LOCK(sc);
 	hn_set_chim_size(sc, chim_size);
 	HN_UNLOCK(sc);
 	return 0;
 }
 
 static int
 hn_rx_stat_u64_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int ofs = arg2, i, error;
 	struct hn_rx_ring *rxr;
 	uint64_t stat;
 
 	stat = 0;
 	for (i = 0; i < sc->hn_rx_ring_cnt; ++i) {
 		rxr = &sc->hn_rx_ring[i];
 		stat += *((uint64_t *)((uint8_t *)rxr + ofs));
 	}
 
 	error = sysctl_handle_64(oidp, &stat, 0, req);
 	if (error || req->newptr == NULL)
 		return error;
 
 	/* Zero out this stat. */
 	for (i = 0; i < sc->hn_rx_ring_cnt; ++i) {
 		rxr = &sc->hn_rx_ring[i];
 		*((uint64_t *)((uint8_t *)rxr + ofs)) = 0;
 	}
 	return 0;
 }
 
 static int
 hn_rx_stat_ulong_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int ofs = arg2, i, error;
 	struct hn_rx_ring *rxr;
 	u_long stat;
 
 	stat = 0;
 	for (i = 0; i < sc->hn_rx_ring_cnt; ++i) {
 		rxr = &sc->hn_rx_ring[i];
 		stat += *((u_long *)((uint8_t *)rxr + ofs));
 	}
 
 	error = sysctl_handle_long(oidp, &stat, 0, req);
 	if (error || req->newptr == NULL)
 		return error;
 
 	/* Zero out this stat. */
 	for (i = 0; i < sc->hn_rx_ring_cnt; ++i) {
 		rxr = &sc->hn_rx_ring[i];
 		*((u_long *)((uint8_t *)rxr + ofs)) = 0;
 	}
 	return 0;
 }
 
 static int
 hn_tx_stat_ulong_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int ofs = arg2, i, error;
 	struct hn_tx_ring *txr;
 	u_long stat;
 
 	stat = 0;
 	for (i = 0; i < sc->hn_tx_ring_cnt; ++i) {
 		txr = &sc->hn_tx_ring[i];
 		stat += *((u_long *)((uint8_t *)txr + ofs));
 	}
 
 	error = sysctl_handle_long(oidp, &stat, 0, req);
 	if (error || req->newptr == NULL)
 		return error;
 
 	/* Zero out this stat. */
 	for (i = 0; i < sc->hn_tx_ring_cnt; ++i) {
 		txr = &sc->hn_tx_ring[i];
 		*((u_long *)((uint8_t *)txr + ofs)) = 0;
 	}
 	return 0;
 }
 
 static int
 hn_tx_conf_int_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int ofs = arg2, i, error, conf;
 	struct hn_tx_ring *txr;
 
 	txr = &sc->hn_tx_ring[0];
 	conf = *((int *)((uint8_t *)txr + ofs));
 
 	error = sysctl_handle_int(oidp, &conf, 0, req);
 	if (error || req->newptr == NULL)
 		return error;
 
 	HN_LOCK(sc);
 	for (i = 0; i < sc->hn_tx_ring_cnt; ++i) {
 		txr = &sc->hn_tx_ring[i];
 		*((int *)((uint8_t *)txr + ofs)) = conf;
 	}
 	HN_UNLOCK(sc);
 
 	return 0;
 }
 
 static int
 hn_txagg_size_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int error, size;
 
 	size = sc->hn_agg_size;
 	error = sysctl_handle_int(oidp, &size, 0, req);
 	if (error || req->newptr == NULL)
 		return (error);
 
 	HN_LOCK(sc);
 	sc->hn_agg_size = size;
 	hn_set_txagg(sc);
 	HN_UNLOCK(sc);
 
 	return (0);
 }
 
 static int
 hn_txagg_pkts_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int error, pkts;
 
 	pkts = sc->hn_agg_pkts;
 	error = sysctl_handle_int(oidp, &pkts, 0, req);
 	if (error || req->newptr == NULL)
 		return (error);
 
 	HN_LOCK(sc);
 	sc->hn_agg_pkts = pkts;
 	hn_set_txagg(sc);
 	HN_UNLOCK(sc);
 
 	return (0);
 }
 
 static int
 hn_txagg_pktmax_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int pkts;
 
 	pkts = sc->hn_tx_ring[0].hn_agg_pktmax;
 	return (sysctl_handle_int(oidp, &pkts, 0, req));
 }
 
 static int
 hn_txagg_align_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int align;
 
 	align = sc->hn_tx_ring[0].hn_agg_align;
 	return (sysctl_handle_int(oidp, &align, 0, req));
 }
 
 static void
 hn_chan_polling(struct vmbus_channel *chan, u_int pollhz)
 {
 	if (pollhz == 0)
 		vmbus_chan_poll_disable(chan);
 	else
 		vmbus_chan_poll_enable(chan, pollhz);
 }
 
 static void
 hn_polling(struct hn_softc *sc, u_int pollhz)
 {
 	int nsubch = sc->hn_rx_ring_inuse - 1;
 
 	HN_LOCK_ASSERT(sc);
 
 	if (nsubch > 0) {
 		struct vmbus_channel **subch;
 		int i;
 
 		subch = vmbus_subchan_get(sc->hn_prichan, nsubch);
 		for (i = 0; i < nsubch; ++i)
 			hn_chan_polling(subch[i], pollhz);
 		vmbus_subchan_rel(subch, nsubch);
 	}
 	hn_chan_polling(sc->hn_prichan, pollhz);
 }
 
 static int
 hn_polling_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int pollhz, error;
 
 	pollhz = sc->hn_pollhz;
 	error = sysctl_handle_int(oidp, &pollhz, 0, req);
 	if (error || req->newptr == NULL)
 		return (error);
 
 	if (pollhz != 0 &&
 	    (pollhz < VMBUS_CHAN_POLLHZ_MIN || pollhz > VMBUS_CHAN_POLLHZ_MAX))
 		return (EINVAL);
 
 	HN_LOCK(sc);
 	if (sc->hn_pollhz != pollhz) {
 		sc->hn_pollhz = pollhz;
 		if ((if_getdrvflags(sc->hn_ifp) & IFF_DRV_RUNNING) &&
 		    (sc->hn_flags & HN_FLAG_SYNTH_ATTACHED))
 			hn_polling(sc, sc->hn_pollhz);
 	}
 	HN_UNLOCK(sc);
 
 	return (0);
 }
 
 static int
 hn_ndis_version_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	char verstr[16];
 
 	snprintf(verstr, sizeof(verstr), "%u.%u",
 	    HN_NDIS_VERSION_MAJOR(sc->hn_ndis_ver),
 	    HN_NDIS_VERSION_MINOR(sc->hn_ndis_ver));
 	return sysctl_handle_string(oidp, verstr, sizeof(verstr), req);
 }
 
 static int
 hn_caps_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	char caps_str[128];
 	uint32_t caps;
 
 	HN_LOCK(sc);
 	caps = sc->hn_caps;
 	HN_UNLOCK(sc);
 	snprintf(caps_str, sizeof(caps_str), "%b", caps, HN_CAP_BITS);
 	return sysctl_handle_string(oidp, caps_str, sizeof(caps_str), req);
 }
 
 static int
 hn_hwassist_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	char assist_str[128];
 	uint32_t hwassist;
 
 	HN_LOCK(sc);
 	hwassist = if_gethwassist(sc->hn_ifp);
 	HN_UNLOCK(sc);
 	snprintf(assist_str, sizeof(assist_str), "%b", hwassist, CSUM_BITS);
 	return sysctl_handle_string(oidp, assist_str, sizeof(assist_str), req);
 }
 
 static int
 hn_rxfilter_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	char filter_str[128];
 	uint32_t filter;
 
 	HN_LOCK(sc);
 	filter = sc->hn_rx_filter;
 	HN_UNLOCK(sc);
 	snprintf(filter_str, sizeof(filter_str), "%b", filter,
 	    NDIS_PACKET_TYPES);
 	return sysctl_handle_string(oidp, filter_str, sizeof(filter_str), req);
 }
 
 static int
 hn_rsc_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	uint32_t mtu;
 	int error;
 	HN_LOCK(sc);
 	error = hn_rndis_get_mtu(sc, &mtu);
 	if (error) {
 		if_printf(sc->hn_ifp, "failed to get mtu\n");
 		goto back;
 	}
 	error = SYSCTL_OUT(req, &(sc->hn_rsc_ctrl), sizeof(sc->hn_rsc_ctrl));
 	if (error || req->newptr == NULL)
 		goto back;
 
 	error = SYSCTL_IN(req, &(sc->hn_rsc_ctrl), sizeof(sc->hn_rsc_ctrl));
 	if (error)
 		goto back;
 	error = hn_rndis_reconf_offload(sc, mtu);
 back:
 	HN_UNLOCK(sc);
 	return (error);
 }
 #ifndef RSS
 
 static int
 hn_rss_key_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int error;
 
 	HN_LOCK(sc);
 
 	error = SYSCTL_OUT(req, sc->hn_rss.rss_key, sizeof(sc->hn_rss.rss_key));
 	if (error || req->newptr == NULL)
 		goto back;
 
 	if ((sc->hn_flags & HN_FLAG_RXVF) ||
 	    (hn_xpnt_vf && sc->hn_vf_ifp != NULL)) {
 		/*
 		 * RSS key is synchronized w/ VF's, don't allow users
 		 * to change it.
 		 */
 		error = EBUSY;
 		goto back;
 	}
 
 	error = SYSCTL_IN(req, sc->hn_rss.rss_key, sizeof(sc->hn_rss.rss_key));
 	if (error)
 		goto back;
 	sc->hn_flags |= HN_FLAG_HAS_RSSKEY;
 
 	if (sc->hn_rx_ring_inuse > 1) {
 		error = hn_rss_reconfig(sc);
 	} else {
 		/* Not RSS capable, at least for now; just save the RSS key. */
 		error = 0;
 	}
 back:
 	HN_UNLOCK(sc);
 	return (error);
 }
 
 static int
 hn_rss_ind_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int error;
 
 	HN_LOCK(sc);
 
 	error = SYSCTL_OUT(req, sc->hn_rss.rss_ind, sizeof(sc->hn_rss.rss_ind));
 	if (error || req->newptr == NULL)
 		goto back;
 
 	/*
 	 * Don't allow RSS indirect table change, if this interface is not
 	 * RSS capable currently.
 	 */
 	if (sc->hn_rx_ring_inuse == 1) {
 		error = EOPNOTSUPP;
 		goto back;
 	}
 
 	error = SYSCTL_IN(req, sc->hn_rss.rss_ind, sizeof(sc->hn_rss.rss_ind));
 	if (error)
 		goto back;
 	sc->hn_flags |= HN_FLAG_HAS_RSSIND;
 
 	hn_rss_ind_fixup(sc);
 	error = hn_rss_reconfig(sc);
 back:
 	HN_UNLOCK(sc);
 	return (error);
 }
 
 #endif	/* !RSS */
 
 static int
 hn_rss_hash_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	char hash_str[128];
 	uint32_t hash;
 
 	HN_LOCK(sc);
 	hash = sc->hn_rss_hash;
 	HN_UNLOCK(sc);
 	snprintf(hash_str, sizeof(hash_str), "%b", hash, NDIS_HASH_BITS);
 	return sysctl_handle_string(oidp, hash_str, sizeof(hash_str), req);
 }
 
 static int
 hn_rss_hcap_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	char hash_str[128];
 	uint32_t hash;
 
 	HN_LOCK(sc);
 	hash = sc->hn_rss_hcap;
 	HN_UNLOCK(sc);
 	snprintf(hash_str, sizeof(hash_str), "%b", hash, NDIS_HASH_BITS);
 	return sysctl_handle_string(oidp, hash_str, sizeof(hash_str), req);
 }
 
 static int
 hn_rss_mbuf_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	char hash_str[128];
 	uint32_t hash;
 
 	HN_LOCK(sc);
 	hash = sc->hn_rx_ring[0].hn_mbuf_hash;
 	HN_UNLOCK(sc);
 	snprintf(hash_str, sizeof(hash_str), "%b", hash, NDIS_HASH_BITS);
 	return sysctl_handle_string(oidp, hash_str, sizeof(hash_str), req);
 }
 
 static int
 hn_vf_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	char vf_name[IFNAMSIZ + 1];
 	if_t vf_ifp;
 
 	HN_LOCK(sc);
 	vf_name[0] = '\0';
 	vf_ifp = sc->hn_vf_ifp;
 	if (vf_ifp != NULL)
 		snprintf(vf_name, sizeof(vf_name), "%s", if_name(vf_ifp));
 	HN_UNLOCK(sc);
 	return sysctl_handle_string(oidp, vf_name, sizeof(vf_name), req);
 }
 
 static int
 hn_rxvf_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	char vf_name[IFNAMSIZ + 1];
 	if_t vf_ifp;
 
 	HN_LOCK(sc);
 	vf_name[0] = '\0';
 	vf_ifp = sc->hn_rx_ring[0].hn_rxvf_ifp;
 	if (vf_ifp != NULL)
 		snprintf(vf_name, sizeof(vf_name), "%s", if_name(vf_ifp));
 	HN_UNLOCK(sc);
 	return sysctl_handle_string(oidp, vf_name, sizeof(vf_name), req);
 }
 
 static int
 hn_vflist_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct rm_priotracker pt;
 	struct sbuf *sb;
 	int error, i;
 	bool first;
 
 	error = sysctl_wire_old_buffer(req, 0);
 	if (error != 0)
 		return (error);
 
 	sb = sbuf_new_for_sysctl(NULL, NULL, 128, req);
 	if (sb == NULL)
 		return (ENOMEM);
 
 	rm_rlock(&hn_vfmap_lock, &pt);
 
 	first = true;
 	for (i = 0; i < hn_vfmap_size; ++i) {
 		struct epoch_tracker et;
 		if_t ifp;
 
 		if (hn_vfmap[i] == NULL)
 			continue;
 
 		NET_EPOCH_ENTER(et);
 		ifp = ifnet_byindex(i);
 		if (ifp != NULL) {
 			if (first)
 				sbuf_printf(sb, "%s", if_name(ifp));
 			else
 				sbuf_printf(sb, " %s", if_name(ifp));
 			first = false;
 		}
 		NET_EPOCH_EXIT(et);
 	}
 
 	rm_runlock(&hn_vfmap_lock, &pt);
 
 	error = sbuf_finish(sb);
 	sbuf_delete(sb);
 	return (error);
 }
 
 static int
 hn_vfmap_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct rm_priotracker pt;
 	struct sbuf *sb;
 	int error, i;
 	bool first;
 
 	error = sysctl_wire_old_buffer(req, 0);
 	if (error != 0)
 		return (error);
 
 	sb = sbuf_new_for_sysctl(NULL, NULL, 128, req);
 	if (sb == NULL)
 		return (ENOMEM);
 
 	rm_rlock(&hn_vfmap_lock, &pt);
 
 	first = true;
 	for (i = 0; i < hn_vfmap_size; ++i) {
 		struct epoch_tracker et;
 		if_t ifp, hn_ifp;
 
 		hn_ifp = hn_vfmap[i];
 		if (hn_ifp == NULL)
 			continue;
 
 		NET_EPOCH_ENTER(et);
 		ifp = ifnet_byindex(i);
 		if (ifp != NULL) {
 			if (first) {
 				sbuf_printf(sb, "%s:%s", if_name(ifp),
 				    if_name(hn_ifp));
 			} else {
 				sbuf_printf(sb, " %s:%s", if_name(ifp),
 				    if_name(hn_ifp));
 			}
 			first = false;
 		}
 		NET_EPOCH_EXIT(et);
 	}
 
 	rm_runlock(&hn_vfmap_lock, &pt);
 
 	error = sbuf_finish(sb);
 	sbuf_delete(sb);
 	return (error);
 }
 
 static int
 hn_xpnt_vf_accbpf_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int error, onoff = 0;
 
 	if (sc->hn_xvf_flags & HN_XVFFLAG_ACCBPF)
 		onoff = 1;
 	error = sysctl_handle_int(oidp, &onoff, 0, req);
 	if (error || req->newptr == NULL)
 		return (error);
 
 	HN_LOCK(sc);
 	/* NOTE: hn_vf_lock for hn_transmit() */
 	rm_wlock(&sc->hn_vf_lock);
 	if (onoff)
 		sc->hn_xvf_flags |= HN_XVFFLAG_ACCBPF;
 	else
 		sc->hn_xvf_flags &= ~HN_XVFFLAG_ACCBPF;
 	rm_wunlock(&sc->hn_vf_lock);
 	HN_UNLOCK(sc);
 
 	return (0);
 }
 
 static int
 hn_xpnt_vf_enabled_sysctl(SYSCTL_HANDLER_ARGS)
 {
 	struct hn_softc *sc = arg1;
 	int enabled = 0;
 
 	if (sc->hn_xvf_flags & HN_XVFFLAG_ENABLED)
 		enabled = 1;
 	return (sysctl_handle_int(oidp, &enabled, 0, req));
 }
 
 static int
 hn_check_iplen(const struct mbuf *m, int hoff)
 {
 	const struct ip *ip;
 	int len, iphlen, iplen;
 	const struct tcphdr *th;
 	int thoff;				/* TCP data offset */
 
 	len = hoff + sizeof(struct ip);
 
 	/* The packet must be at least the size of an IP header. */
 	if (m->m_pkthdr.len < len)
 		return IPPROTO_DONE;
 
 	/* The fixed IP header must reside completely in the first mbuf. */
 	if (m->m_len < len)
 		return IPPROTO_DONE;
 
 	ip = mtodo(m, hoff);
 
 	/* Bound check the packet's stated IP header length. */
 	iphlen = ip->ip_hl << 2;
 	if (iphlen < sizeof(struct ip))		/* minimum header length */
 		return IPPROTO_DONE;
 
 	/* The full IP header must reside completely in the one mbuf. */
 	if (m->m_len < hoff + iphlen)
 		return IPPROTO_DONE;
 
 	iplen = ntohs(ip->ip_len);
 
 	/*
 	 * Check that the amount of data in the buffers is as
 	 * at least much as the IP header would have us expect.
 	 */
 	if (m->m_pkthdr.len < hoff + iplen)
 		return IPPROTO_DONE;
 
 	/*
 	 * Ignore IP fragments.
 	 */
 	if (ntohs(ip->ip_off) & (IP_OFFMASK | IP_MF))
 		return IPPROTO_DONE;
 
 	/*
 	 * The TCP/IP or UDP/IP header must be entirely contained within
 	 * the first fragment of a packet.
 	 */
 	switch (ip->ip_p) {
 	case IPPROTO_TCP:
 		if (iplen < iphlen + sizeof(struct tcphdr))
 			return IPPROTO_DONE;
 		if (m->m_len < hoff + iphlen + sizeof(struct tcphdr))
 			return IPPROTO_DONE;
 		th = (const struct tcphdr *)((const uint8_t *)ip + iphlen);
 		thoff = th->th_off << 2;
 		if (thoff < sizeof(struct tcphdr) || thoff + iphlen > iplen)
 			return IPPROTO_DONE;
 		if (m->m_len < hoff + iphlen + thoff)
 			return IPPROTO_DONE;
 		break;
 	case IPPROTO_UDP:
 		if (iplen < iphlen + sizeof(struct udphdr))
 			return IPPROTO_DONE;
 		if (m->m_len < hoff + iphlen + sizeof(struct udphdr))
 			return IPPROTO_DONE;
 		break;
 	default:
 		if (iplen < iphlen)
 			return IPPROTO_DONE;
 		break;
 	}
 	return ip->ip_p;
 }
 
 static void
 hn_rxpkt_proto(const struct mbuf *m_new, int *l3proto, int *l4proto)
 {
 	const struct ether_header *eh;
 	uint16_t etype;
 	int hoff;
 
 	hoff = sizeof(*eh);
 	/* Checked at the beginning of this function. */
 	KASSERT(m_new->m_len >= hoff, ("not ethernet frame"));
 
 	eh = mtod(m_new, const struct ether_header *);
 	etype = ntohs(eh->ether_type);
 	if (etype == ETHERTYPE_VLAN) {
 		const struct ether_vlan_header *evl;
 
 		hoff = sizeof(*evl);
 		if (m_new->m_len < hoff)
 			return;
 		evl = mtod(m_new, const struct ether_vlan_header *);
 		etype = ntohs(evl->evl_proto);
 	}
 	*l3proto = etype;
 
 	if (etype == ETHERTYPE_IP)
 		*l4proto = hn_check_iplen(m_new, hoff);
 	else
 		*l4proto = IPPROTO_DONE;
 }
 
 static int
 hn_create_rx_data(struct hn_softc *sc, int ring_cnt)
 {
 	struct sysctl_oid_list *child;
 	struct sysctl_ctx_list *ctx;
 	device_t dev = sc->hn_dev;
 #if defined(INET) || defined(INET6)
 	int lroent_cnt;
 #endif
 	int i;
 
 	/*
 	 * Create RXBUF for reception.
 	 *
 	 * NOTE:
 	 * - It is shared by all channels.
 	 * - A large enough buffer is allocated, certain version of NVSes
 	 *   may further limit the usable space.
 	 */
 	sc->hn_rxbuf = contigmalloc(HN_RXBUF_SIZE, M_DEVBUF, M_WAITOK | M_ZERO,
 	    0ul, ~0ul, PAGE_SIZE, 0);
 	if (sc->hn_rxbuf == NULL) {
 		device_printf(sc->hn_dev, "allocate rxbuf failed\n");
 		return (ENOMEM);
 	}
 
 	sc->hn_rx_ring_cnt = ring_cnt;
 	sc->hn_rx_ring_inuse = sc->hn_rx_ring_cnt;
 
 	sc->hn_rx_ring = malloc(sizeof(struct hn_rx_ring) * sc->hn_rx_ring_cnt,
 	    M_DEVBUF, M_WAITOK | M_ZERO);
 
 #if defined(INET) || defined(INET6)
 	lroent_cnt = hn_lro_entry_count;
 	if (lroent_cnt < TCP_LRO_ENTRIES)
 		lroent_cnt = TCP_LRO_ENTRIES;
 	if (bootverbose)
 		device_printf(dev, "LRO: entry count %d\n", lroent_cnt);
 #endif	/* INET || INET6 */
 
 	ctx = device_get_sysctl_ctx(dev);
 	child = SYSCTL_CHILDREN(device_get_sysctl_tree(dev));
 
 	/* Create dev.hn.UNIT.rx sysctl tree */
 	sc->hn_rx_sysctl_tree = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "rx",
 	    CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "");
 
 	for (i = 0; i < sc->hn_rx_ring_cnt; ++i) {
 		struct hn_rx_ring *rxr = &sc->hn_rx_ring[i];
 
 		rxr->hn_br = contigmalloc(HN_TXBR_SIZE + HN_RXBR_SIZE, M_DEVBUF,
 		    M_WAITOK | M_ZERO, 0ul, ~0ul, PAGE_SIZE, 0);
 		if (rxr->hn_br == NULL) {
 			device_printf(dev, "allocate bufring failed\n");
 			return (ENOMEM);
 		}
 
 		if (hn_trust_hosttcp)
 			rxr->hn_trust_hcsum |= HN_TRUST_HCSUM_TCP;
 		if (hn_trust_hostudp)
 			rxr->hn_trust_hcsum |= HN_TRUST_HCSUM_UDP;
 		if (hn_trust_hostip)
 			rxr->hn_trust_hcsum |= HN_TRUST_HCSUM_IP;
 		rxr->hn_mbuf_hash = NDIS_HASH_ALL;
 		rxr->hn_ifp = sc->hn_ifp;
 		if (i < sc->hn_tx_ring_cnt)
 			rxr->hn_txr = &sc->hn_tx_ring[i];
 		rxr->hn_pktbuf_len = HN_PKTBUF_LEN_DEF;
 		rxr->hn_pktbuf = malloc(rxr->hn_pktbuf_len, M_DEVBUF, M_WAITOK);
 		rxr->hn_rx_idx = i;
 		rxr->hn_rxbuf = sc->hn_rxbuf;
 
 		/*
 		 * Initialize LRO.
 		 */
 #if defined(INET) || defined(INET6)
 		tcp_lro_init_args(&rxr->hn_lro, sc->hn_ifp, lroent_cnt,
 		    hn_lro_mbufq_depth);
 		rxr->hn_lro.lro_length_lim = HN_LRO_LENLIM_DEF;
 		rxr->hn_lro.lro_ackcnt_lim = HN_LRO_ACKCNT_DEF;
 #endif	/* INET || INET6 */
 
 		if (sc->hn_rx_sysctl_tree != NULL) {
 			char name[16];
 
 			/*
 			 * Create per RX ring sysctl tree:
 			 * dev.hn.UNIT.rx.RINGID
 			 */
 			snprintf(name, sizeof(name), "%d", i);
 			rxr->hn_rx_sysctl_tree = SYSCTL_ADD_NODE(ctx,
 			    SYSCTL_CHILDREN(sc->hn_rx_sysctl_tree),
 			    OID_AUTO, name, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "");
 
 			if (rxr->hn_rx_sysctl_tree != NULL) {
 				SYSCTL_ADD_ULONG(ctx,
 				    SYSCTL_CHILDREN(rxr->hn_rx_sysctl_tree),
 				    OID_AUTO, "packets",
 				    CTLFLAG_RW | CTLFLAG_STATS, &rxr->hn_pkts,
 				    "# of packets received");
 				SYSCTL_ADD_ULONG(ctx,
 				    SYSCTL_CHILDREN(rxr->hn_rx_sysctl_tree),
 				    OID_AUTO, "rss_pkts",
 				    CTLFLAG_RW | CTLFLAG_STATS,
 				    &rxr->hn_rss_pkts,
 				    "# of packets w/ RSS info received");
 				SYSCTL_ADD_ULONG(ctx,
 				    SYSCTL_CHILDREN(rxr->hn_rx_sysctl_tree),
 				    OID_AUTO, "rsc_pkts",
 				    CTLFLAG_RW | CTLFLAG_STATS,
 				    &rxr->hn_rsc_pkts,
 				    "# of RSC packets received");
 				SYSCTL_ADD_ULONG(ctx,
 				    SYSCTL_CHILDREN(rxr->hn_rx_sysctl_tree),
 				    OID_AUTO, "rsc_drop",
 				    CTLFLAG_RW | CTLFLAG_STATS,
 				    &rxr->hn_rsc_drop,
 				    "# of RSC fragments dropped");
 				SYSCTL_ADD_INT(ctx,
 				    SYSCTL_CHILDREN(rxr->hn_rx_sysctl_tree),
 				    OID_AUTO, "pktbuf_len", CTLFLAG_RD,
 				    &rxr->hn_pktbuf_len, 0,
 				    "Temporary channel packet buffer length");
 			}
 		}
 	}
 
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "lro_queued",
 	    CTLTYPE_U64 | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_STATS , sc,
 	    __offsetof(struct hn_rx_ring, hn_lro.lro_queued),
 	    hn_rx_stat_u64_sysctl,
 	    "LU", "LRO queued");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "lro_flushed",
 	    CTLTYPE_U64 | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_STATS , sc,
 	    __offsetof(struct hn_rx_ring, hn_lro.lro_flushed),
 	    hn_rx_stat_u64_sysctl,
 	    "LU", "LRO flushed");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "lro_tried",
 	    CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_STATS , sc,
 	    __offsetof(struct hn_rx_ring, hn_lro_tried),
 	    hn_rx_stat_ulong_sysctl, "LU", "# of LRO tries");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "lro_length_lim",
 	    CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, sc, 0,
 	    hn_lro_lenlim_sysctl, "IU",
 	    "Max # of data bytes to be aggregated by LRO");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "lro_ackcnt_lim",
 	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, sc, 0,
 	    hn_lro_ackcnt_sysctl, "I",
 	    "Max # of ACKs to be aggregated by LRO");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "trust_hosttcp",
 	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, sc, HN_TRUST_HCSUM_TCP,
 	    hn_trust_hcsum_sysctl, "I",
 	    "Trust tcp segment verification on host side, "
 	    "when csum info is missing");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "trust_hostudp",
 	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, sc, HN_TRUST_HCSUM_UDP,
 	    hn_trust_hcsum_sysctl, "I",
 	    "Trust udp datagram verification on host side, "
 	    "when csum info is missing");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "trust_hostip",
 	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, sc, HN_TRUST_HCSUM_IP,
 	    hn_trust_hcsum_sysctl, "I",
 	    "Trust ip packet verification on host side, "
 	    "when csum info is missing");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "csum_ip",
 	    CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_STATS , sc,
 	    __offsetof(struct hn_rx_ring, hn_csum_ip),
 	    hn_rx_stat_ulong_sysctl, "LU", "RXCSUM IP");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "csum_tcp",
 	    CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_STATS , sc,
 	    __offsetof(struct hn_rx_ring, hn_csum_tcp),
 	    hn_rx_stat_ulong_sysctl, "LU", "RXCSUM TCP");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "csum_udp",
 	    CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_STATS , sc,
 	    __offsetof(struct hn_rx_ring, hn_csum_udp),
 	    hn_rx_stat_ulong_sysctl, "LU", "RXCSUM UDP");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "csum_trusted",
 	    CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE, sc,
 	    __offsetof(struct hn_rx_ring, hn_csum_trusted),
 	    hn_rx_stat_ulong_sysctl, "LU",
 	    "# of packets that we trust host's csum verification");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "small_pkts",
 	    CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_STATS , sc,
 	    __offsetof(struct hn_rx_ring, hn_small_pkts),
 	    hn_rx_stat_ulong_sysctl, "LU", "# of small packets received");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rx_ack_failed",
 	    CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_STATS , sc,
 	    __offsetof(struct hn_rx_ring, hn_ack_failed),
 	    hn_rx_stat_ulong_sysctl, "LU", "# of RXBUF ack failures");
 	SYSCTL_ADD_INT(ctx, child, OID_AUTO, "rx_ring_cnt",
 	    CTLFLAG_RD, &sc->hn_rx_ring_cnt, 0, "# created RX rings");
 	SYSCTL_ADD_INT(ctx, child, OID_AUTO, "rx_ring_inuse",
 	    CTLFLAG_RD, &sc->hn_rx_ring_inuse, 0, "# used RX rings");
 
 	return (0);
 }
 
 static void
 hn_destroy_rx_data(struct hn_softc *sc)
 {
 	int i;
 
 	if (sc->hn_rxbuf != NULL) {
 		if ((sc->hn_flags & HN_FLAG_RXBUF_REF) == 0)
-			contigfree(sc->hn_rxbuf, HN_RXBUF_SIZE, M_DEVBUF);
+			free(sc->hn_rxbuf, M_DEVBUF);
 		else
 			device_printf(sc->hn_dev, "RXBUF is referenced\n");
 		sc->hn_rxbuf = NULL;
 	}
 
 	if (sc->hn_rx_ring_cnt == 0)
 		return;
 
 	for (i = 0; i < sc->hn_rx_ring_cnt; ++i) {
 		struct hn_rx_ring *rxr = &sc->hn_rx_ring[i];
 
 		if (rxr->hn_br == NULL)
 			continue;
 		if ((rxr->hn_rx_flags & HN_RX_FLAG_BR_REF) == 0) {
-			contigfree(rxr->hn_br, HN_TXBR_SIZE + HN_RXBR_SIZE,
-			    M_DEVBUF);
+			free(rxr->hn_br, M_DEVBUF);
 		} else {
 			device_printf(sc->hn_dev,
 			    "%dth channel bufring is referenced", i);
 		}
 		rxr->hn_br = NULL;
 
 #if defined(INET) || defined(INET6)
 		tcp_lro_free(&rxr->hn_lro);
 #endif
 		free(rxr->hn_pktbuf, M_DEVBUF);
 	}
 	free(sc->hn_rx_ring, M_DEVBUF);
 	sc->hn_rx_ring = NULL;
 
 	sc->hn_rx_ring_cnt = 0;
 	sc->hn_rx_ring_inuse = 0;
 }
 
 static int
 hn_tx_ring_create(struct hn_softc *sc, int id)
 {
 	struct hn_tx_ring *txr = &sc->hn_tx_ring[id];
 	device_t dev = sc->hn_dev;
 	bus_dma_tag_t parent_dtag;
 	int error, i;
 
 	txr->hn_sc = sc;
 	txr->hn_tx_idx = id;
 
 #ifndef HN_USE_TXDESC_BUFRING
 	mtx_init(&txr->hn_txlist_spin, "hn txlist", NULL, MTX_SPIN);
 #endif
 	mtx_init(&txr->hn_tx_lock, "hn tx", NULL, MTX_DEF);
 
 	txr->hn_txdesc_cnt = HN_TX_DESC_CNT;
 	txr->hn_txdesc = malloc(sizeof(struct hn_txdesc) * txr->hn_txdesc_cnt,
 	    M_DEVBUF, M_WAITOK | M_ZERO);
 #ifndef HN_USE_TXDESC_BUFRING
 	SLIST_INIT(&txr->hn_txlist);
 #else
 	txr->hn_txdesc_br = buf_ring_alloc(txr->hn_txdesc_cnt, M_DEVBUF,
 	    M_WAITOK, &txr->hn_tx_lock);
 #endif
 
 	if (hn_tx_taskq_mode == HN_TX_TASKQ_M_EVTTQ) {
 		txr->hn_tx_taskq = VMBUS_GET_EVENT_TASKQ(
 		    device_get_parent(dev), dev, HN_RING_IDX2CPU(sc, id));
 	} else {
 		txr->hn_tx_taskq = sc->hn_tx_taskqs[id % hn_tx_taskq_cnt];
 	}
 
 #ifdef HN_IFSTART_SUPPORT
 	if (hn_use_if_start) {
 		txr->hn_txeof = hn_start_txeof;
 		TASK_INIT(&txr->hn_tx_task, 0, hn_start_taskfunc, txr);
 		TASK_INIT(&txr->hn_txeof_task, 0, hn_start_txeof_taskfunc, txr);
 	} else
 #endif
 	{
 		int br_depth;
 
 		txr->hn_txeof = hn_xmit_txeof;
 		TASK_INIT(&txr->hn_tx_task, 0, hn_xmit_taskfunc, txr);
 		TASK_INIT(&txr->hn_txeof_task, 0, hn_xmit_txeof_taskfunc, txr);
 
 		br_depth = hn_get_txswq_depth(txr);
 		txr->hn_mbuf_br = buf_ring_alloc(br_depth, M_DEVBUF,
 		    M_WAITOK, &txr->hn_tx_lock);
 	}
 
 	txr->hn_direct_tx_size = hn_direct_tx_size;
 
 	/*
 	 * Always schedule transmission instead of trying to do direct
 	 * transmission.  This one gives the best performance so far.
 	 */
 	txr->hn_sched_tx = 1;
 
 	parent_dtag = bus_get_dma_tag(dev);
 
 	/* DMA tag for RNDIS packet messages. */
 	error = bus_dma_tag_create(parent_dtag, /* parent */
 	    HN_RNDIS_PKT_ALIGN,		/* alignment */
 	    HN_RNDIS_PKT_BOUNDARY,	/* boundary */
 	    BUS_SPACE_MAXADDR,		/* lowaddr */
 	    BUS_SPACE_MAXADDR,		/* highaddr */
 	    NULL, NULL,			/* filter, filterarg */
 	    HN_RNDIS_PKT_LEN,		/* maxsize */
 	    1,				/* nsegments */
 	    HN_RNDIS_PKT_LEN,		/* maxsegsize */
 	    0,				/* flags */
 	    NULL,			/* lockfunc */
 	    NULL,			/* lockfuncarg */
 	    &txr->hn_tx_rndis_dtag);
 	if (error) {
 		device_printf(dev, "failed to create rndis dmatag\n");
 		return error;
 	}
 
 	/* DMA tag for data. */
 	error = bus_dma_tag_create(parent_dtag, /* parent */
 	    1,				/* alignment */
 	    HN_TX_DATA_BOUNDARY,	/* boundary */
 	    BUS_SPACE_MAXADDR,		/* lowaddr */
 	    BUS_SPACE_MAXADDR,		/* highaddr */
 	    NULL, NULL,			/* filter, filterarg */
 	    HN_TX_DATA_MAXSIZE,		/* maxsize */
 	    HN_TX_DATA_SEGCNT_MAX,	/* nsegments */
 	    HN_TX_DATA_SEGSIZE,		/* maxsegsize */
 	    0,				/* flags */
 	    NULL,			/* lockfunc */
 	    NULL,			/* lockfuncarg */
 	    &txr->hn_tx_data_dtag);
 	if (error) {
 		device_printf(dev, "failed to create data dmatag\n");
 		return error;
 	}
 
 	for (i = 0; i < txr->hn_txdesc_cnt; ++i) {
 		struct hn_txdesc *txd = &txr->hn_txdesc[i];
 
 		txd->txr = txr;
 		txd->chim_index = HN_NVS_CHIM_IDX_INVALID;
 		STAILQ_INIT(&txd->agg_list);
 
 		/*
 		 * Allocate and load RNDIS packet message.
 		 */
         	error = bus_dmamem_alloc(txr->hn_tx_rndis_dtag,
 		    (void **)&txd->rndis_pkt,
 		    BUS_DMA_WAITOK | BUS_DMA_COHERENT | BUS_DMA_ZERO,
 		    &txd->rndis_pkt_dmap);
 		if (error) {
 			device_printf(dev,
 			    "failed to allocate rndis_packet_msg, %d\n", i);
 			return error;
 		}
 
 		error = bus_dmamap_load(txr->hn_tx_rndis_dtag,
 		    txd->rndis_pkt_dmap,
 		    txd->rndis_pkt, HN_RNDIS_PKT_LEN,
 		    hyperv_dma_map_paddr, &txd->rndis_pkt_paddr,
 		    BUS_DMA_NOWAIT);
 		if (error) {
 			device_printf(dev,
 			    "failed to load rndis_packet_msg, %d\n", i);
 			bus_dmamem_free(txr->hn_tx_rndis_dtag,
 			    txd->rndis_pkt, txd->rndis_pkt_dmap);
 			return error;
 		}
 
 		/* DMA map for TX data. */
 		error = bus_dmamap_create(txr->hn_tx_data_dtag, 0,
 		    &txd->data_dmap);
 		if (error) {
 			device_printf(dev,
 			    "failed to allocate tx data dmamap\n");
 			bus_dmamap_unload(txr->hn_tx_rndis_dtag,
 			    txd->rndis_pkt_dmap);
 			bus_dmamem_free(txr->hn_tx_rndis_dtag,
 			    txd->rndis_pkt, txd->rndis_pkt_dmap);
 			return error;
 		}
 
 		/* All set, put it to list */
 		txd->flags |= HN_TXD_FLAG_ONLIST;
 #ifndef HN_USE_TXDESC_BUFRING
 		SLIST_INSERT_HEAD(&txr->hn_txlist, txd, link);
 #else
 		buf_ring_enqueue(txr->hn_txdesc_br, txd);
 #endif
 	}
 	txr->hn_txdesc_avail = txr->hn_txdesc_cnt;
 
 	if (sc->hn_tx_sysctl_tree != NULL) {
 		struct sysctl_oid_list *child;
 		struct sysctl_ctx_list *ctx;
 		char name[16];
 
 		/*
 		 * Create per TX ring sysctl tree:
 		 * dev.hn.UNIT.tx.RINGID
 		 */
 		ctx = device_get_sysctl_ctx(dev);
 		child = SYSCTL_CHILDREN(sc->hn_tx_sysctl_tree);
 
 		snprintf(name, sizeof(name), "%d", id);
 		txr->hn_tx_sysctl_tree = SYSCTL_ADD_NODE(ctx, child, OID_AUTO,
 		    name, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "");
 
 		if (txr->hn_tx_sysctl_tree != NULL) {
 			child = SYSCTL_CHILDREN(txr->hn_tx_sysctl_tree);
 
 #ifdef HN_DEBUG
 			SYSCTL_ADD_INT(ctx, child, OID_AUTO, "txdesc_avail",
 			    CTLFLAG_RD, &txr->hn_txdesc_avail, 0,
 			    "# of available TX descs");
 #endif
 #ifdef HN_IFSTART_SUPPORT
 			if (!hn_use_if_start)
 #endif
 			{
 				SYSCTL_ADD_INT(ctx, child, OID_AUTO, "oactive",
 				    CTLFLAG_RD, &txr->hn_oactive, 0,
 				    "over active");
 			}
 			SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "packets",
 			    CTLFLAG_RW | CTLFLAG_STATS, &txr->hn_pkts,
 			    "# of packets transmitted");
 			SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "sends",
 			    CTLFLAG_RW | CTLFLAG_STATS, &txr->hn_sends,
 			    "# of sends");
 		}
 	}
 
 	return 0;
 }
 
 static void
 hn_txdesc_dmamap_destroy(struct hn_txdesc *txd)
 {
 	struct hn_tx_ring *txr = txd->txr;
 
 	KASSERT(txd->m == NULL, ("still has mbuf installed"));
 	KASSERT((txd->flags & HN_TXD_FLAG_DMAMAP) == 0, ("still dma mapped"));
 
 	bus_dmamap_unload(txr->hn_tx_rndis_dtag, txd->rndis_pkt_dmap);
 	bus_dmamem_free(txr->hn_tx_rndis_dtag, txd->rndis_pkt,
 	    txd->rndis_pkt_dmap);
 	bus_dmamap_destroy(txr->hn_tx_data_dtag, txd->data_dmap);
 }
 
 static void
 hn_txdesc_gc(struct hn_tx_ring *txr, struct hn_txdesc *txd)
 {
 
 	KASSERT(txd->refs == 0 || txd->refs == 1,
 	    ("invalid txd refs %d", txd->refs));
 
 	/* Aggregated txds will be freed by their aggregating txd. */
 	if (txd->refs > 0 && (txd->flags & HN_TXD_FLAG_ONAGG) == 0) {
 		int freed __diagused;
 
 		freed = hn_txdesc_put(txr, txd);
 		KASSERT(freed, ("can't free txdesc"));
 	}
 }
 
 static void
 hn_tx_ring_destroy(struct hn_tx_ring *txr)
 {
 	int i;
 
 	if (txr->hn_txdesc == NULL)
 		return;
 
 	/*
 	 * NOTE:
 	 * Because the freeing of aggregated txds will be deferred
 	 * to the aggregating txd, two passes are used here:
 	 * - The first pass GCes any pending txds.  This GC is necessary,
 	 *   since if the channels are revoked, hypervisor will not
 	 *   deliver send-done for all pending txds.
 	 * - The second pass frees the busdma stuffs, i.e. after all txds
 	 *   were freed.
 	 */
 	for (i = 0; i < txr->hn_txdesc_cnt; ++i)
 		hn_txdesc_gc(txr, &txr->hn_txdesc[i]);
 	for (i = 0; i < txr->hn_txdesc_cnt; ++i)
 		hn_txdesc_dmamap_destroy(&txr->hn_txdesc[i]);
 
 	if (txr->hn_tx_data_dtag != NULL)
 		bus_dma_tag_destroy(txr->hn_tx_data_dtag);
 	if (txr->hn_tx_rndis_dtag != NULL)
 		bus_dma_tag_destroy(txr->hn_tx_rndis_dtag);
 
 #ifdef HN_USE_TXDESC_BUFRING
 	buf_ring_free(txr->hn_txdesc_br, M_DEVBUF);
 #endif
 
 	free(txr->hn_txdesc, M_DEVBUF);
 	txr->hn_txdesc = NULL;
 
 	if (txr->hn_mbuf_br != NULL)
 		buf_ring_free(txr->hn_mbuf_br, M_DEVBUF);
 
 #ifndef HN_USE_TXDESC_BUFRING
 	mtx_destroy(&txr->hn_txlist_spin);
 #endif
 	mtx_destroy(&txr->hn_tx_lock);
 }
 
 static int
 hn_create_tx_data(struct hn_softc *sc, int ring_cnt)
 {
 	struct sysctl_oid_list *child;
 	struct sysctl_ctx_list *ctx;
 	int i;
 
 	/*
 	 * Create TXBUF for chimney sending.
 	 *
 	 * NOTE: It is shared by all channels.
 	 */
 	sc->hn_chim = contigmalloc(HN_CHIM_SIZE, M_DEVBUF, M_WAITOK | M_ZERO,
 	    0ul, ~0ul, PAGE_SIZE, 0);
 	if (sc->hn_chim == NULL) {
 		device_printf(sc->hn_dev, "allocate txbuf failed\n");
 		return (ENOMEM);
 	}
 
 	sc->hn_tx_ring_cnt = ring_cnt;
 	sc->hn_tx_ring_inuse = sc->hn_tx_ring_cnt;
 
 	sc->hn_tx_ring = malloc(sizeof(struct hn_tx_ring) * sc->hn_tx_ring_cnt,
 	    M_DEVBUF, M_WAITOK | M_ZERO);
 
 	ctx = device_get_sysctl_ctx(sc->hn_dev);
 	child = SYSCTL_CHILDREN(device_get_sysctl_tree(sc->hn_dev));
 
 	/* Create dev.hn.UNIT.tx sysctl tree */
 	sc->hn_tx_sysctl_tree = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "tx",
 	    CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "");
 
 	for (i = 0; i < sc->hn_tx_ring_cnt; ++i) {
 		int error;
 
 		error = hn_tx_ring_create(sc, i);
 		if (error)
 			return error;
 	}
 
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "no_txdescs",
 	    CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_STATS, sc,
 	    __offsetof(struct hn_tx_ring, hn_no_txdescs),
 	    hn_tx_stat_ulong_sysctl, "LU", "# of times short of TX descs");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "send_failed",
 	    CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_STATS, sc,
 	    __offsetof(struct hn_tx_ring, hn_send_failed),
 	    hn_tx_stat_ulong_sysctl, "LU", "# of hyper-v sending failure");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "txdma_failed",
 	    CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_STATS, sc,
 	    __offsetof(struct hn_tx_ring, hn_txdma_failed),
 	    hn_tx_stat_ulong_sysctl, "LU", "# of TX DMA failure");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "agg_flush_failed",
 	    CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_STATS, sc,
 	    __offsetof(struct hn_tx_ring, hn_flush_failed),
 	    hn_tx_stat_ulong_sysctl, "LU",
 	    "# of packet transmission aggregation flush failure");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "tx_collapsed",
 	    CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_STATS, sc,
 	    __offsetof(struct hn_tx_ring, hn_tx_collapsed),
 	    hn_tx_stat_ulong_sysctl, "LU", "# of TX mbuf collapsed");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "tx_chimney",
 	    CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_STATS, sc,
 	    __offsetof(struct hn_tx_ring, hn_tx_chimney),
 	    hn_tx_stat_ulong_sysctl, "LU", "# of chimney send");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "tx_chimney_tried",
 	    CTLTYPE_ULONG | CTLFLAG_RW | CTLFLAG_MPSAFE | CTLFLAG_STATS, sc,
 	    __offsetof(struct hn_tx_ring, hn_tx_chimney_tried),
 	    hn_tx_stat_ulong_sysctl, "LU", "# of chimney send tries");
 	SYSCTL_ADD_INT(ctx, child, OID_AUTO, "txdesc_cnt",
 	    CTLFLAG_RD, &sc->hn_tx_ring[0].hn_txdesc_cnt, 0,
 	    "# of total TX descs");
 	SYSCTL_ADD_INT(ctx, child, OID_AUTO, "tx_chimney_max",
 	    CTLFLAG_RD, &sc->hn_chim_szmax, 0,
 	    "Chimney send packet size upper boundary");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "tx_chimney_size",
 	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, sc, 0,
 	    hn_chim_size_sysctl, "I", "Chimney send packet size limit");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "direct_tx_size",
 	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, sc,
 	    __offsetof(struct hn_tx_ring, hn_direct_tx_size),
 	    hn_tx_conf_int_sysctl, "I",
 	    "Size of the packet for direct transmission");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "sched_tx",
 	    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, sc,
 	    __offsetof(struct hn_tx_ring, hn_sched_tx),
 	    hn_tx_conf_int_sysctl, "I",
 	    "Always schedule transmission "
 	    "instead of doing direct transmission");
 	SYSCTL_ADD_INT(ctx, child, OID_AUTO, "tx_ring_cnt",
 	    CTLFLAG_RD, &sc->hn_tx_ring_cnt, 0, "# created TX rings");
 	SYSCTL_ADD_INT(ctx, child, OID_AUTO, "tx_ring_inuse",
 	    CTLFLAG_RD, &sc->hn_tx_ring_inuse, 0, "# used TX rings");
 	SYSCTL_ADD_INT(ctx, child, OID_AUTO, "agg_szmax",
 	    CTLFLAG_RD, &sc->hn_tx_ring[0].hn_agg_szmax, 0,
 	    "Applied packet transmission aggregation size");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "agg_pktmax",
 	    CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0,
 	    hn_txagg_pktmax_sysctl, "I",
 	    "Applied packet transmission aggregation packets");
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "agg_align",
 	    CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0,
 	    hn_txagg_align_sysctl, "I",
 	    "Applied packet transmission aggregation alignment");
 
 	return 0;
 }
 
 static void
 hn_set_chim_size(struct hn_softc *sc, int chim_size)
 {
 	int i;
 
 	for (i = 0; i < sc->hn_tx_ring_cnt; ++i)
 		sc->hn_tx_ring[i].hn_chim_size = chim_size;
 }
 
 static void
 hn_set_tso_maxsize(struct hn_softc *sc, int tso_maxlen, int mtu)
 {
 	if_t ifp = sc->hn_ifp;
 	u_int hw_tsomax;
 	int tso_minlen;
 
 	HN_LOCK_ASSERT(sc);
 
 	if ((if_getcapabilities(ifp) & (IFCAP_TSO4 | IFCAP_TSO6)) == 0)
 		return;
 
 	KASSERT(sc->hn_ndis_tso_sgmin >= 2,
 	    ("invalid NDIS tso sgmin %d", sc->hn_ndis_tso_sgmin));
 	tso_minlen = sc->hn_ndis_tso_sgmin * mtu;
 
 	KASSERT(sc->hn_ndis_tso_szmax >= tso_minlen &&
 	    sc->hn_ndis_tso_szmax <= IP_MAXPACKET,
 	    ("invalid NDIS tso szmax %d", sc->hn_ndis_tso_szmax));
 
 	if (tso_maxlen < tso_minlen)
 		tso_maxlen = tso_minlen;
 	else if (tso_maxlen > IP_MAXPACKET)
 		tso_maxlen = IP_MAXPACKET;
 	if (tso_maxlen > sc->hn_ndis_tso_szmax)
 		tso_maxlen = sc->hn_ndis_tso_szmax;
 	hw_tsomax = tso_maxlen - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN);
 
 	if (hn_xpnt_vf_isready(sc)) {
 		if (hw_tsomax > if_gethwtsomax(sc->hn_vf_ifp))
 			hw_tsomax = if_gethwtsomax(sc->hn_vf_ifp);
 	}
 	if_sethwtsomax(ifp, hw_tsomax);
 	if (bootverbose)
 		if_printf(ifp, "TSO size max %u\n", if_gethwtsomax(ifp));
 }
 
 static void
 hn_fixup_tx_data(struct hn_softc *sc)
 {
 	uint64_t csum_assist;
 	int i;
 
 	hn_set_chim_size(sc, sc->hn_chim_szmax);
 	if (hn_tx_chimney_size > 0 &&
 	    hn_tx_chimney_size < sc->hn_chim_szmax)
 		hn_set_chim_size(sc, hn_tx_chimney_size);
 
 	csum_assist = 0;
 	if (sc->hn_caps & HN_CAP_IPCS)
 		csum_assist |= CSUM_IP;
 	if (sc->hn_caps & HN_CAP_TCP4CS)
 		csum_assist |= CSUM_IP_TCP;
 	if ((sc->hn_caps & HN_CAP_UDP4CS) && hn_enable_udp4cs)
 		csum_assist |= CSUM_IP_UDP;
 	if (sc->hn_caps & HN_CAP_TCP6CS)
 		csum_assist |= CSUM_IP6_TCP;
 	if ((sc->hn_caps & HN_CAP_UDP6CS) && hn_enable_udp6cs)
 		csum_assist |= CSUM_IP6_UDP;
 	for (i = 0; i < sc->hn_tx_ring_cnt; ++i)
 		sc->hn_tx_ring[i].hn_csum_assist = csum_assist;
 
 	if (sc->hn_caps & HN_CAP_HASHVAL) {
 		/*
 		 * Support HASHVAL pktinfo on TX path.
 		 */
 		if (bootverbose)
 			if_printf(sc->hn_ifp, "support HASHVAL pktinfo\n");
 		for (i = 0; i < sc->hn_tx_ring_cnt; ++i)
 			sc->hn_tx_ring[i].hn_tx_flags |= HN_TX_FLAG_HASHVAL;
 	}
 }
 
 static void
 hn_fixup_rx_data(struct hn_softc *sc)
 {
 
 	if (sc->hn_caps & HN_CAP_UDPHASH) {
 		int i;
 
 		for (i = 0; i < sc->hn_rx_ring_cnt; ++i)
 			sc->hn_rx_ring[i].hn_rx_flags |= HN_RX_FLAG_UDP_HASH;
 	}
 }
 
 static void
 hn_destroy_tx_data(struct hn_softc *sc)
 {
 	int i;
 
 	if (sc->hn_chim != NULL) {
 		if ((sc->hn_flags & HN_FLAG_CHIM_REF) == 0) {
-			contigfree(sc->hn_chim, HN_CHIM_SIZE, M_DEVBUF);
+			free(sc->hn_chim, M_DEVBUF);
 		} else {
 			device_printf(sc->hn_dev,
 			    "chimney sending buffer is referenced");
 		}
 		sc->hn_chim = NULL;
 	}
 
 	if (sc->hn_tx_ring_cnt == 0)
 		return;
 
 	for (i = 0; i < sc->hn_tx_ring_cnt; ++i)
 		hn_tx_ring_destroy(&sc->hn_tx_ring[i]);
 
 	free(sc->hn_tx_ring, M_DEVBUF);
 	sc->hn_tx_ring = NULL;
 
 	sc->hn_tx_ring_cnt = 0;
 	sc->hn_tx_ring_inuse = 0;
 }
 
 #ifdef HN_IFSTART_SUPPORT
 
 static void
 hn_start_taskfunc(void *xtxr, int pending __unused)
 {
 	struct hn_tx_ring *txr = xtxr;
 
 	mtx_lock(&txr->hn_tx_lock);
 	hn_start_locked(txr, 0);
 	mtx_unlock(&txr->hn_tx_lock);
 }
 
 static int
 hn_start_locked(struct hn_tx_ring *txr, int len)
 {
 	struct hn_softc *sc = txr->hn_sc;
 	if_t ifp = sc->hn_ifp;
 	int sched = 0;
 
 	KASSERT(hn_use_if_start,
 	    ("hn_start_locked is called, when if_start is disabled"));
 	KASSERT(txr == &sc->hn_tx_ring[0], ("not the first TX ring"));
 	mtx_assert(&txr->hn_tx_lock, MA_OWNED);
 	KASSERT(txr->hn_agg_txd == NULL, ("lingering aggregating txdesc"));
 
 	if (__predict_false(txr->hn_suspended))
 		return (0);
 
 	if ((if_getdrvflags(ifp) & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) !=
 	    IFF_DRV_RUNNING)
 		return (0);
 
 	while (!if_sendq_empty(ifp)) {
 		struct hn_txdesc *txd;
 		struct mbuf *m_head;
 		int error;
 
 		m_head = if_dequeue(ifp);
 		if (m_head == NULL)
 			break;
 
 		if (len > 0 && m_head->m_pkthdr.len > len) {
 			/*
 			 * This sending could be time consuming; let callers
 			 * dispatch this packet sending (and sending of any
 			 * following up packets) to tx taskqueue.
 			 */
 			if_sendq_prepend(ifp, m_head);
 			sched = 1;
 			break;
 		}
 
 #if defined(INET6) || defined(INET)
 		if (m_head->m_pkthdr.csum_flags & CSUM_TSO) {
 			m_head = hn_tso_fixup(m_head);
 			if (__predict_false(m_head == NULL)) {
 				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 				continue;
 			}
 		} else if (m_head->m_pkthdr.csum_flags &
 		    (CSUM_IP_UDP | CSUM_IP_TCP | CSUM_IP6_UDP | CSUM_IP6_TCP)) {
 			m_head = hn_set_hlen(m_head);
 			if (__predict_false(m_head == NULL)) {
 				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 				continue;
 			}
 		}
 #endif
 
 		txd = hn_txdesc_get(txr);
 		if (txd == NULL) {
 			txr->hn_no_txdescs++;
 			if_sendq_prepend(ifp, m_head);
 			if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0);
 			break;
 		}
 
 		error = hn_encap(ifp, txr, txd, &m_head);
 		if (error) {
 			/* Both txd and m_head are freed */
 			KASSERT(txr->hn_agg_txd == NULL,
 			    ("encap failed w/ pending aggregating txdesc"));
 			continue;
 		}
 
 		if (txr->hn_agg_pktleft == 0) {
 			if (txr->hn_agg_txd != NULL) {
 				KASSERT(m_head == NULL,
 				    ("pending mbuf for aggregating txdesc"));
 				error = hn_flush_txagg(ifp, txr);
 				if (__predict_false(error)) {
 					if_setdrvflagbits(ifp,
 					    IFF_DRV_OACTIVE, 0);
 					break;
 				}
 			} else {
 				KASSERT(m_head != NULL, ("mbuf was freed"));
 				error = hn_txpkt(ifp, txr, txd);
 				if (__predict_false(error)) {
 					/* txd is freed, but m_head is not */
 					if_sendq_prepend(ifp, m_head);
 					if_setdrvflagbits(ifp,
 					    IFF_DRV_OACTIVE, 0);
 					break;
 				}
 			}
 		}
 #ifdef INVARIANTS
 		else {
 			KASSERT(txr->hn_agg_txd != NULL,
 			    ("no aggregating txdesc"));
 			KASSERT(m_head == NULL,
 			    ("pending mbuf for aggregating txdesc"));
 		}
 #endif
 	}
 
 	/* Flush pending aggerated transmission. */
 	if (txr->hn_agg_txd != NULL)
 		hn_flush_txagg(ifp, txr);
 	return (sched);
 }
 
 static void
 hn_start(if_t ifp)
 {
 	struct hn_softc *sc = if_getsoftc(ifp);
 	struct hn_tx_ring *txr = &sc->hn_tx_ring[0];
 
 	if (txr->hn_sched_tx)
 		goto do_sched;
 
 	if (mtx_trylock(&txr->hn_tx_lock)) {
 		int sched;
 
 		sched = hn_start_locked(txr, txr->hn_direct_tx_size);
 		mtx_unlock(&txr->hn_tx_lock);
 		if (!sched)
 			return;
 	}
 do_sched:
 	taskqueue_enqueue(txr->hn_tx_taskq, &txr->hn_tx_task);
 }
 
 static void
 hn_start_txeof_taskfunc(void *xtxr, int pending __unused)
 {
 	struct hn_tx_ring *txr = xtxr;
 
 	mtx_lock(&txr->hn_tx_lock);
 	if_setdrvflagbits(txr->hn_sc->hn_ifp, 0, IFF_DRV_OACTIVE);
 	hn_start_locked(txr, 0);
 	mtx_unlock(&txr->hn_tx_lock);
 }
 
 static void
 hn_start_txeof(struct hn_tx_ring *txr)
 {
 	struct hn_softc *sc = txr->hn_sc;
 	if_t ifp = sc->hn_ifp;
 
 	KASSERT(txr == &sc->hn_tx_ring[0], ("not the first TX ring"));
 
 	if (txr->hn_sched_tx)
 		goto do_sched;
 
 	if (mtx_trylock(&txr->hn_tx_lock)) {
 		int sched;
 
 		if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE);
 		sched = hn_start_locked(txr, txr->hn_direct_tx_size);
 		mtx_unlock(&txr->hn_tx_lock);
 		if (sched) {
 			taskqueue_enqueue(txr->hn_tx_taskq,
 			    &txr->hn_tx_task);
 		}
 	} else {
 do_sched:
 		/*
 		 * Release the OACTIVE earlier, with the hope, that
 		 * others could catch up.  The task will clear the
 		 * flag again with the hn_tx_lock to avoid possible
 		 * races.
 		 */
 		if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE);
 		taskqueue_enqueue(txr->hn_tx_taskq, &txr->hn_txeof_task);
 	}
 }
 
 #endif	/* HN_IFSTART_SUPPORT */
 
 static int
 hn_xmit(struct hn_tx_ring *txr, int len)
 {
 	struct hn_softc *sc = txr->hn_sc;
 	if_t ifp = sc->hn_ifp;
 	struct mbuf *m_head;
 	int sched = 0;
 
 	mtx_assert(&txr->hn_tx_lock, MA_OWNED);
 #ifdef HN_IFSTART_SUPPORT
 	KASSERT(hn_use_if_start == 0,
 	    ("hn_xmit is called, when if_start is enabled"));
 #endif
 	KASSERT(txr->hn_agg_txd == NULL, ("lingering aggregating txdesc"));
 
 	if (__predict_false(txr->hn_suspended))
 		return (0);
 
 	if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0 || txr->hn_oactive)
 		return (0);
 
 	while ((m_head = drbr_peek(ifp, txr->hn_mbuf_br)) != NULL) {
 		struct hn_txdesc *txd;
 		int error;
 
 		if (len > 0 && m_head->m_pkthdr.len > len) {
 			/*
 			 * This sending could be time consuming; let callers
 			 * dispatch this packet sending (and sending of any
 			 * following up packets) to tx taskqueue.
 			 */
 			drbr_putback(ifp, txr->hn_mbuf_br, m_head);
 			sched = 1;
 			break;
 		}
 
 		txd = hn_txdesc_get(txr);
 		if (txd == NULL) {
 			txr->hn_no_txdescs++;
 			drbr_putback(ifp, txr->hn_mbuf_br, m_head);
 			txr->hn_oactive = 1;
 			break;
 		}
 
 		error = hn_encap(ifp, txr, txd, &m_head);
 		if (error) {
 			/* Both txd and m_head are freed; discard */
 			KASSERT(txr->hn_agg_txd == NULL,
 			    ("encap failed w/ pending aggregating txdesc"));
 			drbr_advance(ifp, txr->hn_mbuf_br);
 			continue;
 		}
 
 		if (txr->hn_agg_pktleft == 0) {
 			if (txr->hn_agg_txd != NULL) {
 				KASSERT(m_head == NULL,
 				    ("pending mbuf for aggregating txdesc"));
 				error = hn_flush_txagg(ifp, txr);
 				if (__predict_false(error)) {
 					txr->hn_oactive = 1;
 					break;
 				}
 			} else {
 				KASSERT(m_head != NULL, ("mbuf was freed"));
 				error = hn_txpkt(ifp, txr, txd);
 				if (__predict_false(error)) {
 					/* txd is freed, but m_head is not */
 					drbr_putback(ifp, txr->hn_mbuf_br,
 					    m_head);
 					txr->hn_oactive = 1;
 					break;
 				}
 			}
 		}
 #ifdef INVARIANTS
 		else {
 			KASSERT(txr->hn_agg_txd != NULL,
 			    ("no aggregating txdesc"));
 			KASSERT(m_head == NULL,
 			    ("pending mbuf for aggregating txdesc"));
 		}
 #endif
 
 		/* Sent */
 		drbr_advance(ifp, txr->hn_mbuf_br);
 	}
 
 	/* Flush pending aggerated transmission. */
 	if (txr->hn_agg_txd != NULL)
 		hn_flush_txagg(ifp, txr);
 	return (sched);
 }
 
 static int
 hn_transmit(if_t ifp, struct mbuf *m)
 {
 	struct hn_softc *sc = if_getsoftc(ifp);
 	struct hn_tx_ring *txr;
 	int error, idx = 0;
 
 	if (sc->hn_xvf_flags & HN_XVFFLAG_ENABLED) {
 		struct rm_priotracker pt;
 
 		rm_rlock(&sc->hn_vf_lock, &pt);
 		if (__predict_true(sc->hn_xvf_flags & HN_XVFFLAG_ENABLED)) {
 			struct mbuf *m_bpf = NULL;
 			int obytes, omcast;
 
 			obytes = m->m_pkthdr.len;
 			omcast = (m->m_flags & M_MCAST) != 0;
 
 			if (sc->hn_xvf_flags & HN_XVFFLAG_ACCBPF) {
 				if (bpf_peers_present_if(ifp)) {
 					m_bpf = m_copypacket(m, M_NOWAIT);
 					if (m_bpf == NULL) {
 						/*
 						 * Failed to grab a shallow
 						 * copy; tap now.
 						 */
 						ETHER_BPF_MTAP(ifp, m);
 					}
 				}
 			} else {
 				ETHER_BPF_MTAP(ifp, m);
 			}
 
 			error = if_transmit(sc->hn_vf_ifp, m);
 			rm_runlock(&sc->hn_vf_lock, &pt);
 
 			if (m_bpf != NULL) {
 				if (!error)
 					ETHER_BPF_MTAP(ifp, m_bpf);
 				m_freem(m_bpf);
 			}
 
 			if (error == ENOBUFS) {
 				if_inc_counter(ifp, IFCOUNTER_OQDROPS, 1);
 			} else if (error) {
 				if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			} else {
 				if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 				if_inc_counter(ifp, IFCOUNTER_OBYTES, obytes);
 				if (omcast) {
 					if_inc_counter(ifp, IFCOUNTER_OMCASTS,
 					    omcast);
 				}
 			}
 			return (error);
 		}
 		rm_runlock(&sc->hn_vf_lock, &pt);
 	}
 
 #if defined(INET6) || defined(INET)
 	/*
 	 * Perform TSO packet header fixup or get l2/l3 header length now,
 	 * since packet headers should be cache-hot.
 	 */
 	if (m->m_pkthdr.csum_flags & CSUM_TSO) {
 		m = hn_tso_fixup(m);
 		if (__predict_false(m == NULL)) {
 			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			return EIO;
 		}
 	} else if (m->m_pkthdr.csum_flags &
 	    (CSUM_IP_UDP | CSUM_IP_TCP | CSUM_IP6_UDP | CSUM_IP6_TCP)) {
 		m = hn_set_hlen(m);
 		if (__predict_false(m == NULL)) {
 			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 			return EIO;
 		}
 	}
 #endif
 
 	/*
 	 * Select the TX ring based on flowid
 	 */
 	if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) {
 #ifdef RSS
 		uint32_t bid;
 
 		if (rss_hash2bucket(m->m_pkthdr.flowid, M_HASHTYPE_GET(m),
 		    &bid) == 0)
 			idx = bid % sc->hn_tx_ring_inuse;
 		else
 #endif
 		{
 #if defined(INET6) || defined(INET)
 			int tcpsyn = 0;
 
 			if (m->m_pkthdr.len < 128 &&
 			    (m->m_pkthdr.csum_flags &
 			     (CSUM_IP_TCP | CSUM_IP6_TCP)) &&
 			    (m->m_pkthdr.csum_flags & CSUM_TSO) == 0) {
 				m = hn_check_tcpsyn(m, &tcpsyn);
 				if (__predict_false(m == NULL)) {
 					if_inc_counter(ifp,
 					    IFCOUNTER_OERRORS, 1);
 					return (EIO);
 				}
 			}
 #else
 			const int tcpsyn = 0;
 #endif
 			if (tcpsyn)
 				idx = 0;
 			else
 				idx = m->m_pkthdr.flowid % sc->hn_tx_ring_inuse;
 		}
 	}
 	txr = &sc->hn_tx_ring[idx];
 
 	error = drbr_enqueue(ifp, txr->hn_mbuf_br, m);
 	if (error) {
 		if_inc_counter(ifp, IFCOUNTER_OQDROPS, 1);
 		return error;
 	}
 
 	if (txr->hn_oactive)
 		return 0;
 
 	if (txr->hn_sched_tx)
 		goto do_sched;
 
 	if (mtx_trylock(&txr->hn_tx_lock)) {
 		int sched;
 
 		sched = hn_xmit(txr, txr->hn_direct_tx_size);
 		mtx_unlock(&txr->hn_tx_lock);
 		if (!sched)
 			return 0;
 	}
 do_sched:
 	taskqueue_enqueue(txr->hn_tx_taskq, &txr->hn_tx_task);
 	return 0;
 }
 
 static void
 hn_tx_ring_qflush(struct hn_tx_ring *txr)
 {
 	struct mbuf *m;
 
 	mtx_lock(&txr->hn_tx_lock);
 	while ((m = buf_ring_dequeue_sc(txr->hn_mbuf_br)) != NULL)
 		m_freem(m);
 	mtx_unlock(&txr->hn_tx_lock);
 }
 
 static void
 hn_xmit_qflush(if_t ifp)
 {
 	struct hn_softc *sc = if_getsoftc(ifp);
 	struct rm_priotracker pt;
 	int i;
 
 	for (i = 0; i < sc->hn_tx_ring_inuse; ++i)
 		hn_tx_ring_qflush(&sc->hn_tx_ring[i]);
 	if_qflush(ifp);
 
 	rm_rlock(&sc->hn_vf_lock, &pt);
 	if (sc->hn_xvf_flags & HN_XVFFLAG_ENABLED)
 		if_qflush(sc->hn_vf_ifp);
 	rm_runlock(&sc->hn_vf_lock, &pt);
 }
 
 static void
 hn_xmit_txeof(struct hn_tx_ring *txr)
 {
 
 	if (txr->hn_sched_tx)
 		goto do_sched;
 
 	if (mtx_trylock(&txr->hn_tx_lock)) {
 		int sched;
 
 		txr->hn_oactive = 0;
 		sched = hn_xmit(txr, txr->hn_direct_tx_size);
 		mtx_unlock(&txr->hn_tx_lock);
 		if (sched) {
 			taskqueue_enqueue(txr->hn_tx_taskq,
 			    &txr->hn_tx_task);
 		}
 	} else {
 do_sched:
 		/*
 		 * Release the oactive earlier, with the hope, that
 		 * others could catch up.  The task will clear the
 		 * oactive again with the hn_tx_lock to avoid possible
 		 * races.
 		 */
 		txr->hn_oactive = 0;
 		taskqueue_enqueue(txr->hn_tx_taskq, &txr->hn_txeof_task);
 	}
 }
 
 static void
 hn_xmit_taskfunc(void *xtxr, int pending __unused)
 {
 	struct hn_tx_ring *txr = xtxr;
 
 	mtx_lock(&txr->hn_tx_lock);
 	hn_xmit(txr, 0);
 	mtx_unlock(&txr->hn_tx_lock);
 }
 
 static void
 hn_xmit_txeof_taskfunc(void *xtxr, int pending __unused)
 {
 	struct hn_tx_ring *txr = xtxr;
 
 	mtx_lock(&txr->hn_tx_lock);
 	txr->hn_oactive = 0;
 	hn_xmit(txr, 0);
 	mtx_unlock(&txr->hn_tx_lock);
 }
 
 static int
 hn_chan_attach(struct hn_softc *sc, struct vmbus_channel *chan)
 {
 	struct vmbus_chan_br cbr;
 	struct hn_rx_ring *rxr;
 	struct hn_tx_ring *txr = NULL;
 	int idx, error;
 
 	idx = vmbus_chan_subidx(chan);
 
 	/*
 	 * Link this channel to RX/TX ring.
 	 */
 	KASSERT(idx >= 0 && idx < sc->hn_rx_ring_inuse,
 	    ("invalid channel index %d, should > 0 && < %d",
 	     idx, sc->hn_rx_ring_inuse));
 	rxr = &sc->hn_rx_ring[idx];
 	KASSERT((rxr->hn_rx_flags & HN_RX_FLAG_ATTACHED) == 0,
 	    ("RX ring %d already attached", idx));
 	rxr->hn_rx_flags |= HN_RX_FLAG_ATTACHED;
 	rxr->hn_chan = chan;
 
 	if (bootverbose) {
 		if_printf(sc->hn_ifp, "link RX ring %d to chan%u\n",
 		    idx, vmbus_chan_id(chan));
 	}
 
 	if (idx < sc->hn_tx_ring_inuse) {
 		txr = &sc->hn_tx_ring[idx];
 		KASSERT((txr->hn_tx_flags & HN_TX_FLAG_ATTACHED) == 0,
 		    ("TX ring %d already attached", idx));
 		txr->hn_tx_flags |= HN_TX_FLAG_ATTACHED;
 
 		txr->hn_chan = chan;
 		if (bootverbose) {
 			if_printf(sc->hn_ifp, "link TX ring %d to chan%u\n",
 			    idx, vmbus_chan_id(chan));
 		}
 	}
 
 	/* Bind this channel to a proper CPU. */
 	vmbus_chan_cpu_set(chan, HN_RING_IDX2CPU(sc, idx));
 
 	/*
 	 * Open this channel
 	 */
 	cbr.cbr = rxr->hn_br;
 	cbr.cbr_paddr = pmap_kextract((vm_offset_t)rxr->hn_br);
 	cbr.cbr_txsz = HN_TXBR_SIZE;
 	cbr.cbr_rxsz = HN_RXBR_SIZE;
 	error = vmbus_chan_open_br(chan, &cbr, NULL, 0, hn_chan_callback, rxr);
 	if (error) {
 		if (error == EISCONN) {
 			if_printf(sc->hn_ifp, "bufring is connected after "
 			    "chan%u open failure\n", vmbus_chan_id(chan));
 			rxr->hn_rx_flags |= HN_RX_FLAG_BR_REF;
 		} else {
 			if_printf(sc->hn_ifp, "open chan%u failed: %d\n",
 			    vmbus_chan_id(chan), error);
 		}
 	}
 	return (error);
 }
 
 static void
 hn_chan_detach(struct hn_softc *sc, struct vmbus_channel *chan)
 {
 	struct hn_rx_ring *rxr;
 	int idx, error;
 
 	idx = vmbus_chan_subidx(chan);
 
 	/*
 	 * Link this channel to RX/TX ring.
 	 */
 	KASSERT(idx >= 0 && idx < sc->hn_rx_ring_inuse,
 	    ("invalid channel index %d, should > 0 && < %d",
 	     idx, sc->hn_rx_ring_inuse));
 	rxr = &sc->hn_rx_ring[idx];
 	KASSERT((rxr->hn_rx_flags & HN_RX_FLAG_ATTACHED),
 	    ("RX ring %d is not attached", idx));
 	rxr->hn_rx_flags &= ~HN_RX_FLAG_ATTACHED;
 
 	if (idx < sc->hn_tx_ring_inuse) {
 		struct hn_tx_ring *txr = &sc->hn_tx_ring[idx];
 
 		KASSERT((txr->hn_tx_flags & HN_TX_FLAG_ATTACHED),
 		    ("TX ring %d is not attached attached", idx));
 		txr->hn_tx_flags &= ~HN_TX_FLAG_ATTACHED;
 	}
 
 	/*
 	 * Close this channel.
 	 *
 	 * NOTE:
 	 * Channel closing does _not_ destroy the target channel.
 	 */
 	error = vmbus_chan_close_direct(chan);
 	if (error == EISCONN) {
 		if_printf(sc->hn_ifp, "chan%u bufring is connected "
 		    "after being closed\n", vmbus_chan_id(chan));
 		rxr->hn_rx_flags |= HN_RX_FLAG_BR_REF;
 	} else if (error) {
 		if_printf(sc->hn_ifp, "chan%u close failed: %d\n",
 		    vmbus_chan_id(chan), error);
 	}
 }
 
 static int
 hn_attach_subchans(struct hn_softc *sc)
 {
 	struct vmbus_channel **subchans;
 	int subchan_cnt = sc->hn_rx_ring_inuse - 1;
 	int i, error = 0;
 
 	KASSERT(subchan_cnt > 0, ("no sub-channels"));
 
 	/* Attach the sub-channels. */
 	subchans = vmbus_subchan_get(sc->hn_prichan, subchan_cnt);
 	for (i = 0; i < subchan_cnt; ++i) {
 		int error1;
 
 		error1 = hn_chan_attach(sc, subchans[i]);
 		if (error1) {
 			error = error1;
 			/* Move on; all channels will be detached later. */
 		}
 	}
 	vmbus_subchan_rel(subchans, subchan_cnt);
 
 	if (error) {
 		if_printf(sc->hn_ifp, "sub-channels attach failed: %d\n", error);
 	} else {
 		if (bootverbose) {
 			if_printf(sc->hn_ifp, "%d sub-channels attached\n",
 			    subchan_cnt);
 		}
 	}
 	return (error);
 }
 
 static void
 hn_detach_allchans(struct hn_softc *sc)
 {
 	struct vmbus_channel **subchans;
 	int subchan_cnt = sc->hn_rx_ring_inuse - 1;
 	int i;
 
 	if (subchan_cnt == 0)
 		goto back;
 
 	/* Detach the sub-channels. */
 	subchans = vmbus_subchan_get(sc->hn_prichan, subchan_cnt);
 	for (i = 0; i < subchan_cnt; ++i)
 		hn_chan_detach(sc, subchans[i]);
 	vmbus_subchan_rel(subchans, subchan_cnt);
 
 back:
 	/*
 	 * Detach the primary channel, _after_ all sub-channels
 	 * are detached.
 	 */
 	hn_chan_detach(sc, sc->hn_prichan);
 
 	/* Wait for sub-channels to be destroyed, if any. */
 	vmbus_subchan_drain(sc->hn_prichan);
 
 #ifdef INVARIANTS
 	for (i = 0; i < sc->hn_rx_ring_cnt; ++i) {
 		KASSERT((sc->hn_rx_ring[i].hn_rx_flags &
 		    HN_RX_FLAG_ATTACHED) == 0,
 		    ("%dth RX ring is still attached", i));
 	}
 	for (i = 0; i < sc->hn_tx_ring_cnt; ++i) {
 		KASSERT((sc->hn_tx_ring[i].hn_tx_flags &
 		    HN_TX_FLAG_ATTACHED) == 0,
 		    ("%dth TX ring is still attached", i));
 	}
 #endif
 }
 
 static int
 hn_synth_alloc_subchans(struct hn_softc *sc, int *nsubch)
 {
 	struct vmbus_channel **subchans;
 	int nchan, rxr_cnt, error;
 
 	nchan = *nsubch + 1;
 	if (nchan == 1) {
 		/*
 		 * Multiple RX/TX rings are not requested.
 		 */
 		*nsubch = 0;
 		return (0);
 	}
 
 	/*
 	 * Query RSS capabilities, e.g. # of RX rings, and # of indirect
 	 * table entries.
 	 */
 	error = hn_rndis_query_rsscaps(sc, &rxr_cnt);
 	if (error) {
 		/* No RSS; this is benign. */
 		*nsubch = 0;
 		return (0);
 	}
 	if (bootverbose) {
 		if_printf(sc->hn_ifp, "RX rings offered %u, requested %d\n",
 		    rxr_cnt, nchan);
 	}
 
 	if (nchan > rxr_cnt)
 		nchan = rxr_cnt;
 	if (nchan == 1) {
 		if_printf(sc->hn_ifp, "only 1 channel is supported, no vRSS\n");
 		*nsubch = 0;
 		return (0);
 	}
 
 	/*
 	 * Allocate sub-channels from NVS.
 	 */
 	*nsubch = nchan - 1;
 	error = hn_nvs_alloc_subchans(sc, nsubch);
 	if (error || *nsubch == 0) {
 		/* Failed to allocate sub-channels. */
 		*nsubch = 0;
 		return (0);
 	}
 
 	/*
 	 * Wait for all sub-channels to become ready before moving on.
 	 */
 	subchans = vmbus_subchan_get(sc->hn_prichan, *nsubch);
 	vmbus_subchan_rel(subchans, *nsubch);
 	return (0);
 }
 
 static bool
 hn_synth_attachable(const struct hn_softc *sc)
 {
 	int i;
 
 	if (sc->hn_flags & HN_FLAG_ERRORS)
 		return (false);
 
 	for (i = 0; i < sc->hn_rx_ring_cnt; ++i) {
 		const struct hn_rx_ring *rxr = &sc->hn_rx_ring[i];
 
 		if (rxr->hn_rx_flags & HN_RX_FLAG_BR_REF)
 			return (false);
 	}
 	return (true);
 }
 
 /*
  * Make sure that the RX filter is zero after the successful
  * RNDIS initialization.
  *
  * NOTE:
  * Under certain conditions on certain versions of Hyper-V,
  * the RNDIS rxfilter is _not_ zero on the hypervisor side
  * after the successful RNDIS initialization, which breaks
  * the assumption of any following code (well, it breaks the
  * RNDIS API contract actually).  Clear the RNDIS rxfilter
  * explicitly, drain packets sneaking through, and drain the
  * interrupt taskqueues scheduled due to the stealth packets.
  */
 static void
 hn_rndis_init_fixat(struct hn_softc *sc, int nchan)
 {
 
 	hn_disable_rx(sc);
 	hn_drain_rxtx(sc, nchan);
 }
 
 static int
 hn_synth_attach(struct hn_softc *sc, int mtu)
 {
 #define ATTACHED_NVS		0x0002
 #define ATTACHED_RNDIS		0x0004
 
 	struct ndis_rssprm_toeplitz *rss = &sc->hn_rss;
 	int error, nsubch, nchan = 1, i, rndis_inited;
 	uint32_t old_caps, attached = 0;
 
 	KASSERT((sc->hn_flags & HN_FLAG_SYNTH_ATTACHED) == 0,
 	    ("synthetic parts were attached"));
 
 	if (!hn_synth_attachable(sc))
 		return (ENXIO);
 
 	/* Save capabilities for later verification. */
 	old_caps = sc->hn_caps;
 	sc->hn_caps = 0;
 
 	/* Clear RSS stuffs. */
 	sc->hn_rss_ind_size = 0;
 	sc->hn_rss_hash = 0;
 	sc->hn_rss_hcap = 0;
 
 	/*
 	 * Attach the primary channel _before_ attaching NVS and RNDIS.
 	 */
 	error = hn_chan_attach(sc, sc->hn_prichan);
 	if (error)
 		goto failed;
 
 	/*
 	 * Attach NVS.
 	 */
 	error = hn_nvs_attach(sc, mtu);
 	if (error)
 		goto failed;
 	attached |= ATTACHED_NVS;
 
 	/*
 	 * Attach RNDIS _after_ NVS is attached.
 	 */
 	error = hn_rndis_attach(sc, mtu, &rndis_inited);
 	if (rndis_inited)
 		attached |= ATTACHED_RNDIS;
 	if (error)
 		goto failed;
 
 	/*
 	 * Make sure capabilities are not changed.
 	 */
 	if (device_is_attached(sc->hn_dev) && old_caps != sc->hn_caps) {
 		if_printf(sc->hn_ifp, "caps mismatch old 0x%08x, new 0x%08x\n",
 		    old_caps, sc->hn_caps);
 		error = ENXIO;
 		goto failed;
 	}
 
 	/*
 	 * Allocate sub-channels for multi-TX/RX rings.
 	 *
 	 * NOTE:
 	 * The # of RX rings that can be used is equivalent to the # of
 	 * channels to be requested.
 	 */
 	nsubch = sc->hn_rx_ring_cnt - 1;
 	error = hn_synth_alloc_subchans(sc, &nsubch);
 	if (error)
 		goto failed;
 	/* NOTE: _Full_ synthetic parts detach is required now. */
 	sc->hn_flags |= HN_FLAG_SYNTH_ATTACHED;
 
 	/*
 	 * Set the # of TX/RX rings that could be used according to
 	 * the # of channels that NVS offered.
 	 */
 	nchan = nsubch + 1;
 	hn_set_ring_inuse(sc, nchan);
 	if (nchan == 1) {
 		/* Only the primary channel can be used; done */
 		goto back;
 	}
 
 	/*
 	 * Attach the sub-channels.
 	 *
 	 * NOTE: hn_set_ring_inuse() _must_ have been called.
 	 */
 	error = hn_attach_subchans(sc);
 	if (error)
 		goto failed;
 
 	/*
 	 * Configure RSS key and indirect table _after_ all sub-channels
 	 * are attached.
 	 */
 	if ((sc->hn_flags & HN_FLAG_HAS_RSSKEY) == 0) {
 		/*
 		 * RSS key is not set yet; set it to the default RSS key.
 		 */
 		if (bootverbose)
 			if_printf(sc->hn_ifp, "setup default RSS key\n");
 #ifdef RSS
 		rss_getkey(rss->rss_key);
 #else
 		memcpy(rss->rss_key, hn_rss_key_default, sizeof(rss->rss_key));
 #endif
 		sc->hn_flags |= HN_FLAG_HAS_RSSKEY;
 	}
 
 	if ((sc->hn_flags & HN_FLAG_HAS_RSSIND) == 0) {
 		/*
 		 * RSS indirect table is not set yet; set it up in round-
 		 * robin fashion.
 		 */
 		if (bootverbose) {
 			if_printf(sc->hn_ifp, "setup default RSS indirect "
 			    "table\n");
 		}
 		for (i = 0; i < NDIS_HASH_INDCNT; ++i) {
 			uint32_t subidx;
 
 #ifdef RSS
 			subidx = rss_get_indirection_to_bucket(i);
 #else
 			subidx = i;
 #endif
 			rss->rss_ind[i] = subidx % nchan;
 		}
 		sc->hn_flags |= HN_FLAG_HAS_RSSIND;
 	} else {
 		/*
 		 * # of usable channels may be changed, so we have to
 		 * make sure that all entries in RSS indirect table
 		 * are valid.
 		 *
 		 * NOTE: hn_set_ring_inuse() _must_ have been called.
 		 */
 		hn_rss_ind_fixup(sc);
 	}
 
 	sc->hn_rss_hash = sc->hn_rss_hcap;
 	if ((sc->hn_flags & HN_FLAG_RXVF) ||
 	    (sc->hn_xvf_flags & HN_XVFFLAG_ENABLED)) {
 		/* NOTE: Don't reconfigure RSS; will do immediately. */
 		hn_vf_rss_fixup(sc, false);
 	}
 	error = hn_rndis_conf_rss(sc, NDIS_RSS_FLAG_NONE);
 	if (error)
 		goto failed;
 back:
 	/*
 	 * Fixup transmission aggregation setup.
 	 */
 	hn_set_txagg(sc);
 	hn_rndis_init_fixat(sc, nchan);
 	return (0);
 
 failed:
 	if (sc->hn_flags & HN_FLAG_SYNTH_ATTACHED) {
 		hn_rndis_init_fixat(sc, nchan);
 		hn_synth_detach(sc);
 	} else {
 		if (attached & ATTACHED_RNDIS) {
 			hn_rndis_init_fixat(sc, nchan);
 			hn_rndis_detach(sc);
 		}
 		if (attached & ATTACHED_NVS)
 			hn_nvs_detach(sc);
 		hn_chan_detach(sc, sc->hn_prichan);
 		/* Restore old capabilities. */
 		sc->hn_caps = old_caps;
 	}
 	return (error);
 
 #undef ATTACHED_RNDIS
 #undef ATTACHED_NVS
 }
 
 /*
  * NOTE:
  * The interface must have been suspended though hn_suspend(), before
  * this function get called.
  */
 static void
 hn_synth_detach(struct hn_softc *sc)
 {
 
 	KASSERT(sc->hn_flags & HN_FLAG_SYNTH_ATTACHED,
 	    ("synthetic parts were not attached"));
 
 	/* Detach the RNDIS first. */
 	hn_rndis_detach(sc);
 
 	/* Detach NVS. */
 	hn_nvs_detach(sc);
 
 	/* Detach all of the channels. */
 	hn_detach_allchans(sc);
 
 	if (vmbus_current_version >= VMBUS_VERSION_WIN10 && sc->hn_rxbuf_gpadl != 0) {
 		/*
 		 * Host is post-Win2016, disconnect RXBUF from primary channel here.
 		 */
 		int error;
 
 		error = vmbus_chan_gpadl_disconnect(sc->hn_prichan,
 		    sc->hn_rxbuf_gpadl);
 		if (error) {
 			if_printf(sc->hn_ifp,
 			    "rxbuf gpadl disconn failed: %d\n", error);
 			sc->hn_flags |= HN_FLAG_RXBUF_REF;
 		}
 		sc->hn_rxbuf_gpadl = 0;
 	}
 
 	if (vmbus_current_version >= VMBUS_VERSION_WIN10 && sc->hn_chim_gpadl != 0) {
 		/*
 		 * Host is post-Win2016, disconnect chimney sending buffer from
 		 * primary channel here.
 		 */
 		int error;
 
 		error = vmbus_chan_gpadl_disconnect(sc->hn_prichan,
 		    sc->hn_chim_gpadl);
 		if (error) {
 			if_printf(sc->hn_ifp,
 			    "chim gpadl disconn failed: %d\n", error);
 			sc->hn_flags |= HN_FLAG_CHIM_REF;
 		}
 		sc->hn_chim_gpadl = 0;
 	}
 	sc->hn_flags &= ~HN_FLAG_SYNTH_ATTACHED;
 }
 
 static void
 hn_set_ring_inuse(struct hn_softc *sc, int ring_cnt)
 {
 	KASSERT(ring_cnt > 0 && ring_cnt <= sc->hn_rx_ring_cnt,
 	    ("invalid ring count %d", ring_cnt));
 
 	if (sc->hn_tx_ring_cnt > ring_cnt)
 		sc->hn_tx_ring_inuse = ring_cnt;
 	else
 		sc->hn_tx_ring_inuse = sc->hn_tx_ring_cnt;
 	sc->hn_rx_ring_inuse = ring_cnt;
 
 #ifdef RSS
 	if (sc->hn_rx_ring_inuse != rss_getnumbuckets()) {
 		if_printf(sc->hn_ifp, "# of RX rings (%d) does not match "
 		    "# of RSS buckets (%d)\n", sc->hn_rx_ring_inuse,
 		    rss_getnumbuckets());
 	}
 #endif
 
 	if (bootverbose) {
 		if_printf(sc->hn_ifp, "%d TX ring, %d RX ring\n",
 		    sc->hn_tx_ring_inuse, sc->hn_rx_ring_inuse);
 	}
 }
 
 static void
 hn_chan_drain(struct hn_softc *sc, struct vmbus_channel *chan)
 {
 
 	/*
 	 * NOTE:
 	 * The TX bufring will not be drained by the hypervisor,
 	 * if the primary channel is revoked.
 	 */
 	while (!vmbus_chan_rx_empty(chan) ||
 	    (!vmbus_chan_is_revoked(sc->hn_prichan) &&
 	     !vmbus_chan_tx_empty(chan)))
 		pause("waitch", 1);
 	vmbus_chan_intr_drain(chan);
 }
 
 static void
 hn_disable_rx(struct hn_softc *sc)
 {
 
 	/*
 	 * Disable RX by clearing RX filter forcefully.
 	 */
 	sc->hn_rx_filter = NDIS_PACKET_TYPE_NONE;
 	hn_rndis_set_rxfilter(sc, sc->hn_rx_filter); /* ignore error */
 
 	/*
 	 * Give RNDIS enough time to flush all pending data packets.
 	 */
 	pause("waitrx", (200 * hz) / 1000);
 }
 
 /*
  * NOTE:
  * RX/TX _must_ have been suspended/disabled, before this function
  * is called.
  */
 static void
 hn_drain_rxtx(struct hn_softc *sc, int nchan)
 {
 	struct vmbus_channel **subch = NULL;
 	int nsubch;
 
 	/*
 	 * Drain RX/TX bufrings and interrupts.
 	 */
 	nsubch = nchan - 1;
 	if (nsubch > 0)
 		subch = vmbus_subchan_get(sc->hn_prichan, nsubch);
 
 	if (subch != NULL) {
 		int i;
 
 		for (i = 0; i < nsubch; ++i)
 			hn_chan_drain(sc, subch[i]);
 	}
 	hn_chan_drain(sc, sc->hn_prichan);
 
 	if (subch != NULL)
 		vmbus_subchan_rel(subch, nsubch);
 }
 
 static void
 hn_suspend_data(struct hn_softc *sc)
 {
 	struct hn_tx_ring *txr;
 	int i;
 
 	HN_LOCK_ASSERT(sc);
 
 	/*
 	 * Suspend TX.
 	 */
 	for (i = 0; i < sc->hn_tx_ring_inuse; ++i) {
 		txr = &sc->hn_tx_ring[i];
 
 		mtx_lock(&txr->hn_tx_lock);
 		txr->hn_suspended = 1;
 		mtx_unlock(&txr->hn_tx_lock);
 		/* No one is able send more packets now. */
 
 		/*
 		 * Wait for all pending sends to finish.
 		 *
 		 * NOTE:
 		 * We will _not_ receive all pending send-done, if the
 		 * primary channel is revoked.
 		 */
 		while (hn_tx_ring_pending(txr) &&
 		    !vmbus_chan_is_revoked(sc->hn_prichan))
 			pause("hnwtx", 1 /* 1 tick */);
 	}
 
 	/*
 	 * Disable RX.
 	 */
 	hn_disable_rx(sc);
 
 	/*
 	 * Drain RX/TX.
 	 */
 	hn_drain_rxtx(sc, sc->hn_rx_ring_inuse);
 
 	/*
 	 * Drain any pending TX tasks.
 	 *
 	 * NOTE:
 	 * The above hn_drain_rxtx() can dispatch TX tasks, so the TX
 	 * tasks will have to be drained _after_ the above hn_drain_rxtx().
 	 */
 	for (i = 0; i < sc->hn_tx_ring_inuse; ++i) {
 		txr = &sc->hn_tx_ring[i];
 
 		taskqueue_drain(txr->hn_tx_taskq, &txr->hn_tx_task);
 		taskqueue_drain(txr->hn_tx_taskq, &txr->hn_txeof_task);
 	}
 }
 
 static void
 hn_suspend_mgmt_taskfunc(void *xsc, int pending __unused)
 {
 
 	((struct hn_softc *)xsc)->hn_mgmt_taskq = NULL;
 }
 
 static void
 hn_suspend_mgmt(struct hn_softc *sc)
 {
 	struct task task;
 
 	HN_LOCK_ASSERT(sc);
 
 	/*
 	 * Make sure that hn_mgmt_taskq0 can nolonger be accessed
 	 * through hn_mgmt_taskq.
 	 */
 	TASK_INIT(&task, 0, hn_suspend_mgmt_taskfunc, sc);
 	vmbus_chan_run_task(sc->hn_prichan, &task);
 
 	/*
 	 * Make sure that all pending management tasks are completed.
 	 */
 	taskqueue_drain(sc->hn_mgmt_taskq0, &sc->hn_netchg_init);
 	taskqueue_drain_timeout(sc->hn_mgmt_taskq0, &sc->hn_netchg_status);
 	taskqueue_drain_all(sc->hn_mgmt_taskq0);
 }
 
 static void
 hn_suspend(struct hn_softc *sc)
 {
 
 	/* Disable polling. */
 	hn_polling(sc, 0);
 
 	/*
 	 * If the non-transparent mode VF is activated, the synthetic
 	 * device is receiving packets, so the data path of the
 	 * synthetic device must be suspended.
 	 */
 	if ((if_getdrvflags(sc->hn_ifp) & IFF_DRV_RUNNING) ||
 	    (sc->hn_flags & HN_FLAG_RXVF))
 		hn_suspend_data(sc);
 	hn_suspend_mgmt(sc);
 }
 
 static void
 hn_resume_tx(struct hn_softc *sc, int tx_ring_cnt)
 {
 	int i;
 
 	KASSERT(tx_ring_cnt <= sc->hn_tx_ring_cnt,
 	    ("invalid TX ring count %d", tx_ring_cnt));
 
 	for (i = 0; i < tx_ring_cnt; ++i) {
 		struct hn_tx_ring *txr = &sc->hn_tx_ring[i];
 
 		mtx_lock(&txr->hn_tx_lock);
 		txr->hn_suspended = 0;
 		mtx_unlock(&txr->hn_tx_lock);
 	}
 }
 
 static void
 hn_resume_data(struct hn_softc *sc)
 {
 	int i;
 
 	HN_LOCK_ASSERT(sc);
 
 	/*
 	 * Re-enable RX.
 	 */
 	hn_rxfilter_config(sc);
 
 	/*
 	 * Make sure to clear suspend status on "all" TX rings,
 	 * since hn_tx_ring_inuse can be changed after
 	 * hn_suspend_data().
 	 */
 	hn_resume_tx(sc, sc->hn_tx_ring_cnt);
 
 #ifdef HN_IFSTART_SUPPORT
 	if (!hn_use_if_start)
 #endif
 	{
 		/*
 		 * Flush unused drbrs, since hn_tx_ring_inuse may be
 		 * reduced.
 		 */
 		for (i = sc->hn_tx_ring_inuse; i < sc->hn_tx_ring_cnt; ++i)
 			hn_tx_ring_qflush(&sc->hn_tx_ring[i]);
 	}
 
 	/*
 	 * Kick start TX.
 	 */
 	for (i = 0; i < sc->hn_tx_ring_inuse; ++i) {
 		struct hn_tx_ring *txr = &sc->hn_tx_ring[i];
 
 		/*
 		 * Use txeof task, so that any pending oactive can be
 		 * cleared properly.
 		 */
 		taskqueue_enqueue(txr->hn_tx_taskq, &txr->hn_txeof_task);
 	}
 }
 
 static void
 hn_resume_mgmt(struct hn_softc *sc)
 {
 
 	sc->hn_mgmt_taskq = sc->hn_mgmt_taskq0;
 
 	/*
 	 * Kick off network change detection, if it was pending.
 	 * If no network change was pending, start link status
 	 * checks, which is more lightweight than network change
 	 * detection.
 	 */
 	if (sc->hn_link_flags & HN_LINK_FLAG_NETCHG)
 		hn_change_network(sc);
 	else
 		hn_update_link_status(sc);
 }
 
 static void
 hn_resume(struct hn_softc *sc)
 {
 
 	/*
 	 * If the non-transparent mode VF is activated, the synthetic
 	 * device have to receive packets, so the data path of the
 	 * synthetic device must be resumed.
 	 */
 	if ((if_getdrvflags(sc->hn_ifp) & IFF_DRV_RUNNING) ||
 	    (sc->hn_flags & HN_FLAG_RXVF))
 		hn_resume_data(sc);
 
 	/*
 	 * Don't resume link status change if VF is attached/activated.
 	 * - In the non-transparent VF mode, the synthetic device marks
 	 *   link down until the VF is deactivated; i.e. VF is down.
 	 * - In transparent VF mode, VF's media status is used until
 	 *   the VF is detached.
 	 */
 	if ((sc->hn_flags & HN_FLAG_RXVF) == 0 &&
 	    !(hn_xpnt_vf && sc->hn_vf_ifp != NULL))
 		hn_resume_mgmt(sc);
 
 	/*
 	 * Re-enable polling if this interface is running and
 	 * the polling is requested.
 	 */
 	if ((if_getdrvflags(sc->hn_ifp) & IFF_DRV_RUNNING) && sc->hn_pollhz > 0)
 		hn_polling(sc, sc->hn_pollhz);
 }
 
 static void 
 hn_rndis_rx_status(struct hn_softc *sc, const void *data, int dlen)
 {
 	const struct rndis_status_msg *msg;
 	int ofs;
 
 	if (dlen < sizeof(*msg)) {
 		if_printf(sc->hn_ifp, "invalid RNDIS status\n");
 		return;
 	}
 	msg = data;
 
 	switch (msg->rm_status) {
 	case RNDIS_STATUS_MEDIA_CONNECT:
 	case RNDIS_STATUS_MEDIA_DISCONNECT:
 		hn_update_link_status(sc);
 		break;
 
 	case RNDIS_STATUS_TASK_OFFLOAD_CURRENT_CONFIG:
 	case RNDIS_STATUS_LINK_SPEED_CHANGE:
 		/* Not really useful; ignore. */
 		break;
 
 	case RNDIS_STATUS_NETWORK_CHANGE:
 		ofs = RNDIS_STBUFOFFSET_ABS(msg->rm_stbufoffset);
 		if (dlen < ofs + msg->rm_stbuflen ||
 		    msg->rm_stbuflen < sizeof(uint32_t)) {
 			if_printf(sc->hn_ifp, "network changed\n");
 		} else {
 			uint32_t change;
 
 			memcpy(&change, ((const uint8_t *)msg) + ofs,
 			    sizeof(change));
 			if_printf(sc->hn_ifp, "network changed, change %u\n",
 			    change);
 		}
 		hn_change_network(sc);
 		break;
 
 	default:
 		if_printf(sc->hn_ifp, "unknown RNDIS status 0x%08x\n",
 		    msg->rm_status);
 		break;
 	}
 }
 
 static int
 hn_rndis_rxinfo(const void *info_data, int info_dlen, struct hn_rxinfo *info)
 {
 	const struct rndis_pktinfo *pi = info_data;
 	uint32_t mask = 0;
 
 	while (info_dlen != 0) {
 		const void *data;
 		uint32_t dlen;
 
 		if (__predict_false(info_dlen < sizeof(*pi)))
 			return (EINVAL);
 		if (__predict_false(info_dlen < pi->rm_size))
 			return (EINVAL);
 		info_dlen -= pi->rm_size;
 
 		if (__predict_false(pi->rm_size & RNDIS_PKTINFO_SIZE_ALIGNMASK))
 			return (EINVAL);
 		if (__predict_false(pi->rm_size < pi->rm_pktinfooffset))
 			return (EINVAL);
 		dlen = pi->rm_size - pi->rm_pktinfooffset;
 		data = pi->rm_data;
 
 		if (pi->rm_internal == 1) {
 			switch (pi->rm_type) {
 			case NDIS_PKTINFO_IT_PKTINFO_ID:
 				if (__predict_false(dlen < NDIS_PKTINFOID_SZ))
 					return (EINVAL);
 				info->pktinfo_id =
 				    (const struct packet_info_id *)data;
 				mask |= HN_RXINFO_PKTINFO_ID;
 				break;
 
 			default:
 				goto next;
 			}
 		} else {
 			switch (pi->rm_type) {
 			case NDIS_PKTINFO_TYPE_VLAN:
 				if (__predict_false(dlen
 				    < NDIS_VLAN_INFO_SIZE))
 					return (EINVAL);
 				info->vlan_info = (const uint32_t *)data;
 				mask |= HN_RXINFO_VLAN;
 				break;
 
 			case NDIS_PKTINFO_TYPE_CSUM:
 				if (__predict_false(dlen
 				    < NDIS_RXCSUM_INFO_SIZE))
 					return (EINVAL);
 				info->csum_info = (const uint32_t *)data;
 				mask |= HN_RXINFO_CSUM;
 				break;
 
 			case HN_NDIS_PKTINFO_TYPE_HASHVAL:
 				if (__predict_false(dlen
 				    < HN_NDIS_HASH_VALUE_SIZE))
 					return (EINVAL);
 				info->hash_value = (const uint32_t *)data;
 				mask |= HN_RXINFO_HASHVAL;
 				break;
 
 			case HN_NDIS_PKTINFO_TYPE_HASHINF:
 				if (__predict_false(dlen
 				    < HN_NDIS_HASH_INFO_SIZE))
 					return (EINVAL);
 				info->hash_info = (const uint32_t *)data;
 				mask |= HN_RXINFO_HASHINF;
 				break;
 
 			default:
 				goto next;
 			}
 		}
 
 		if (mask == HN_RXINFO_ALL) {
 			/* All found; done */
 			break;
 		}
 next:
 		pi = (const struct rndis_pktinfo *)
 		    ((const uint8_t *)pi + pi->rm_size);
 	}
 
 	/*
 	 * Final fixup.
 	 * - If there is no hash value, invalidate the hash info.
 	 */
 	if ((mask & HN_RXINFO_HASHVAL) == 0)
 		info->hash_info = NULL;
 	return (0);
 }
 
 static __inline bool
 hn_rndis_check_overlap(int off, int len, int check_off, int check_len)
 {
 
 	if (off < check_off) {
 		if (__predict_true(off + len <= check_off))
 			return (false);
 	} else if (off > check_off) {
 		if (__predict_true(check_off + check_len <= off))
 			return (false);
 	}
 	return (true);
 }
 
 static __inline void
 hn_rsc_add_data(struct hn_rx_ring *rxr, const void *data,
 		uint32_t len, struct hn_rxinfo *info)
 {
 	uint32_t cnt = rxr->rsc.cnt;
 
 	if (cnt) {
 		rxr->rsc.pktlen += len;
 	} else {
 		rxr->rsc.vlan_info = info->vlan_info;
 		rxr->rsc.csum_info = info->csum_info;
 		rxr->rsc.hash_info = info->hash_info;
 		rxr->rsc.hash_value = info->hash_value;
 		rxr->rsc.pktlen = len;
 	}
 
 	rxr->rsc.frag_data[cnt] = data;
 	rxr->rsc.frag_len[cnt] = len;
 	rxr->rsc.cnt++;
 }
 
 static void
 hn_rndis_rx_data(struct hn_rx_ring *rxr, const void *data, int dlen)
 {
 	const struct rndis_packet_msg *pkt;
 	struct hn_rxinfo info;
 	int data_off, pktinfo_off, data_len, pktinfo_len;
 	bool rsc_more= false;
 
 	/*
 	 * Check length.
 	 */
 	if (__predict_false(dlen < sizeof(*pkt))) {
 		if_printf(rxr->hn_ifp, "invalid RNDIS packet msg\n");
 		return;
 	}
 	pkt = data;
 
 	if (__predict_false(dlen < pkt->rm_len)) {
 		if_printf(rxr->hn_ifp, "truncated RNDIS packet msg, "
 		    "dlen %d, msglen %u\n", dlen, pkt->rm_len);
 		return;
 	}
 	if (__predict_false(pkt->rm_len <
 	    pkt->rm_datalen + pkt->rm_oobdatalen + pkt->rm_pktinfolen)) {
 		if_printf(rxr->hn_ifp, "invalid RNDIS packet msglen, "
 		    "msglen %u, data %u, oob %u, pktinfo %u\n",
 		    pkt->rm_len, pkt->rm_datalen, pkt->rm_oobdatalen,
 		    pkt->rm_pktinfolen);
 		return;
 	}
 	if (__predict_false(pkt->rm_datalen == 0)) {
 		if_printf(rxr->hn_ifp, "invalid RNDIS packet msg, no data\n");
 		return;
 	}
 
 	/*
 	 * Check offests.
 	 */
 #define IS_OFFSET_INVALID(ofs)			\
 	((ofs) < RNDIS_PACKET_MSG_OFFSET_MIN ||	\
 	 ((ofs) & RNDIS_PACKET_MSG_OFFSET_ALIGNMASK))
 
 	/* XXX Hyper-V does not meet data offset alignment requirement */
 	if (__predict_false(pkt->rm_dataoffset < RNDIS_PACKET_MSG_OFFSET_MIN)) {
 		if_printf(rxr->hn_ifp, "invalid RNDIS packet msg, "
 		    "data offset %u\n", pkt->rm_dataoffset);
 		return;
 	}
 	if (__predict_false(pkt->rm_oobdataoffset > 0 &&
 	    IS_OFFSET_INVALID(pkt->rm_oobdataoffset))) {
 		if_printf(rxr->hn_ifp, "invalid RNDIS packet msg, "
 		    "oob offset %u\n", pkt->rm_oobdataoffset);
 		return;
 	}
 	if (__predict_true(pkt->rm_pktinfooffset > 0) &&
 	    __predict_false(IS_OFFSET_INVALID(pkt->rm_pktinfooffset))) {
 		if_printf(rxr->hn_ifp, "invalid RNDIS packet msg, "
 		    "pktinfo offset %u\n", pkt->rm_pktinfooffset);
 		return;
 	}
 
 #undef IS_OFFSET_INVALID
 
 	data_off = RNDIS_PACKET_MSG_OFFSET_ABS(pkt->rm_dataoffset);
 	data_len = pkt->rm_datalen;
 	pktinfo_off = RNDIS_PACKET_MSG_OFFSET_ABS(pkt->rm_pktinfooffset);
 	pktinfo_len = pkt->rm_pktinfolen;
 
 	/*
 	 * Check OOB coverage.
 	 */
 	if (__predict_false(pkt->rm_oobdatalen != 0)) {
 		int oob_off, oob_len;
 
 		if_printf(rxr->hn_ifp, "got oobdata\n");
 		oob_off = RNDIS_PACKET_MSG_OFFSET_ABS(pkt->rm_oobdataoffset);
 		oob_len = pkt->rm_oobdatalen;
 
 		if (__predict_false(oob_off + oob_len > pkt->rm_len)) {
 			if_printf(rxr->hn_ifp, "invalid RNDIS packet msg, "
 			    "oob overflow, msglen %u, oob abs %d len %d\n",
 			    pkt->rm_len, oob_off, oob_len);
 			return;
 		}
 
 		/*
 		 * Check against data.
 		 */
 		if (hn_rndis_check_overlap(oob_off, oob_len,
 		    data_off, data_len)) {
 			if_printf(rxr->hn_ifp, "invalid RNDIS packet msg, "
 			    "oob overlaps data, oob abs %d len %d, "
 			    "data abs %d len %d\n",
 			    oob_off, oob_len, data_off, data_len);
 			return;
 		}
 
 		/*
 		 * Check against pktinfo.
 		 */
 		if (pktinfo_len != 0 &&
 		    hn_rndis_check_overlap(oob_off, oob_len,
 		    pktinfo_off, pktinfo_len)) {
 			if_printf(rxr->hn_ifp, "invalid RNDIS packet msg, "
 			    "oob overlaps pktinfo, oob abs %d len %d, "
 			    "pktinfo abs %d len %d\n",
 			    oob_off, oob_len, pktinfo_off, pktinfo_len);
 			return;
 		}
 	}
 
 	/*
 	 * Check per-packet-info coverage and find useful per-packet-info.
 	 */
 	info.vlan_info = NULL;
 	info.csum_info = NULL;
 	info.hash_info = NULL;
 	info.pktinfo_id = NULL;
 
 	if (__predict_true(pktinfo_len != 0)) {
 		bool overlap;
 		int error;
 
 		if (__predict_false(pktinfo_off + pktinfo_len > pkt->rm_len)) {
 			if_printf(rxr->hn_ifp, "invalid RNDIS packet msg, "
 			    "pktinfo overflow, msglen %u, "
 			    "pktinfo abs %d len %d\n",
 			    pkt->rm_len, pktinfo_off, pktinfo_len);
 			return;
 		}
 
 		/*
 		 * Check packet info coverage.
 		 */
 		overlap = hn_rndis_check_overlap(pktinfo_off, pktinfo_len,
 		    data_off, data_len);
 		if (__predict_false(overlap)) {
 			if_printf(rxr->hn_ifp, "invalid RNDIS packet msg, "
 			    "pktinfo overlap data, pktinfo abs %d len %d, "
 			    "data abs %d len %d\n",
 			    pktinfo_off, pktinfo_len, data_off, data_len);
 			return;
 		}
 
 		/*
 		 * Find useful per-packet-info.
 		 */
 		error = hn_rndis_rxinfo(((const uint8_t *)pkt) + pktinfo_off,
 		    pktinfo_len, &info);
 		if (__predict_false(error)) {
 			if_printf(rxr->hn_ifp, "invalid RNDIS packet msg "
 			    "pktinfo\n");
 			return;
 		}
 	}
 
 	if (__predict_false(data_off + data_len > pkt->rm_len)) {
 		if_printf(rxr->hn_ifp, "invalid RNDIS packet msg, "
 		    "data overflow, msglen %u, data abs %d len %d\n",
 		    pkt->rm_len, data_off, data_len);
 		return;
 	}
 
 	/* Identify RSC fragments, drop invalid packets */
 	if ((info.pktinfo_id != NULL) &&
 	    (info.pktinfo_id->flag & HN_NDIS_PKTINFO_SUBALLOC)) {
 		if (info.pktinfo_id->flag & HN_NDIS_PKTINFO_1ST_FRAG) {
 			rxr->rsc.cnt = 0;
 			rxr->hn_rsc_pkts++;
 		} else if (rxr->rsc.cnt == 0)
 			goto drop;
 
 		rsc_more = true;
 
 		if (info.pktinfo_id->flag & HN_NDIS_PKTINFO_LAST_FRAG)
 			rsc_more = false;
 
 		if (rsc_more && rxr->rsc.is_last)
 			goto drop;
 	} else {
 		rxr->rsc.cnt = 0;
 	}
 
 	if (__predict_false(rxr->rsc.cnt >= HN_NVS_RSC_MAX))
 		goto drop;
 
 	/* Store data in per rx ring structure */
 	hn_rsc_add_data(rxr,((const uint8_t *)pkt) + data_off,
 	    data_len, &info);
 
 	if (rsc_more)
 		return;
 
 	hn_rxpkt(rxr);
 	rxr->rsc.cnt = 0;
 	return;
 drop:
 	rxr->hn_rsc_drop++;
 	return;
 }
 
 static __inline void
 hn_rndis_rxpkt(struct hn_rx_ring *rxr, const void *data, int dlen)
 {
 	const struct rndis_msghdr *hdr;
 
 	if (__predict_false(dlen < sizeof(*hdr))) {
 		if_printf(rxr->hn_ifp, "invalid RNDIS msg\n");
 		return;
 	}
 	hdr = data;
 
 	if (__predict_true(hdr->rm_type == REMOTE_NDIS_PACKET_MSG)) {
 		/* Hot data path. */
 		hn_rndis_rx_data(rxr, data, dlen);
 		/* Done! */
 		return;
 	}
 
 	if (hdr->rm_type == REMOTE_NDIS_INDICATE_STATUS_MSG)
 		hn_rndis_rx_status(if_getsoftc(rxr->hn_ifp), data, dlen);
 	else
 		hn_rndis_rx_ctrl(if_getsoftc(rxr->hn_ifp), data, dlen);
 }
 
 static void
 hn_nvs_handle_notify(struct hn_softc *sc, const struct vmbus_chanpkt_hdr *pkt)
 {
 	const struct hn_nvs_hdr *hdr;
 
 	if (VMBUS_CHANPKT_DATALEN(pkt) < sizeof(*hdr)) {
 		if_printf(sc->hn_ifp, "invalid nvs notify\n");
 		return;
 	}
 	hdr = VMBUS_CHANPKT_CONST_DATA(pkt);
 
 	if (hdr->nvs_type == HN_NVS_TYPE_TXTBL_NOTE) {
 		/* Useless; ignore */
 		return;
 	}
 	if_printf(sc->hn_ifp, "got notify, nvs type %u\n", hdr->nvs_type);
 }
 
 static void
 hn_nvs_handle_comp(struct hn_softc *sc, struct vmbus_channel *chan,
     const struct vmbus_chanpkt_hdr *pkt)
 {
 	struct hn_nvs_sendctx *sndc;
 
 	sndc = (struct hn_nvs_sendctx *)(uintptr_t)pkt->cph_xactid;
 	sndc->hn_cb(sndc, sc, chan, VMBUS_CHANPKT_CONST_DATA(pkt),
 	    VMBUS_CHANPKT_DATALEN(pkt));
 	/*
 	 * NOTE:
 	 * 'sndc' CAN NOT be accessed anymore, since it can be freed by
 	 * its callback.
 	 */
 }
 
 static void
 hn_nvs_handle_rxbuf(struct hn_rx_ring *rxr, struct vmbus_channel *chan,
     const struct vmbus_chanpkt_hdr *pkthdr)
 {
 	struct epoch_tracker et;
 	const struct vmbus_chanpkt_rxbuf *pkt;
 	const struct hn_nvs_hdr *nvs_hdr;
 	int count, i, hlen;
 
 	if (__predict_false(VMBUS_CHANPKT_DATALEN(pkthdr) < sizeof(*nvs_hdr))) {
 		if_printf(rxr->hn_ifp, "invalid nvs RNDIS\n");
 		return;
 	}
 	nvs_hdr = VMBUS_CHANPKT_CONST_DATA(pkthdr);
 
 	/* Make sure that this is a RNDIS message. */
 	if (__predict_false(nvs_hdr->nvs_type != HN_NVS_TYPE_RNDIS)) {
 		if_printf(rxr->hn_ifp, "nvs type %u, not RNDIS\n",
 		    nvs_hdr->nvs_type);
 		return;
 	}
 
 	hlen = VMBUS_CHANPKT_GETLEN(pkthdr->cph_hlen);
 	if (__predict_false(hlen < sizeof(*pkt))) {
 		if_printf(rxr->hn_ifp, "invalid rxbuf chanpkt\n");
 		return;
 	}
 	pkt = (const struct vmbus_chanpkt_rxbuf *)pkthdr;
 
 	if (__predict_false(pkt->cp_rxbuf_id != HN_NVS_RXBUF_SIG)) {
 		if_printf(rxr->hn_ifp, "invalid rxbuf_id 0x%08x\n",
 		    pkt->cp_rxbuf_id);
 		return;
 	}
 
 	count = pkt->cp_rxbuf_cnt;
 	if (__predict_false(hlen <
 	    __offsetof(struct vmbus_chanpkt_rxbuf, cp_rxbuf[count]))) {
 		if_printf(rxr->hn_ifp, "invalid rxbuf_cnt %d\n", count);
 		return;
 	}
 
 	NET_EPOCH_ENTER(et);
 	/* Each range represents 1 RNDIS pkt that contains 1 Ethernet frame */
 	for (i = 0; i < count; ++i) {
 		int ofs, len;
 
 		ofs = pkt->cp_rxbuf[i].rb_ofs;
 		len = pkt->cp_rxbuf[i].rb_len;
 		if (__predict_false(ofs + len > HN_RXBUF_SIZE)) {
 			if_printf(rxr->hn_ifp, "%dth RNDIS msg overflow rxbuf, "
 			    "ofs %d, len %d\n", i, ofs, len);
 			continue;
 		}
 
 		rxr->rsc.is_last = (i == (count - 1));
 		hn_rndis_rxpkt(rxr, rxr->hn_rxbuf + ofs, len);
 	}
 	NET_EPOCH_EXIT(et);
 
 	/*
 	 * Ack the consumed RXBUF associated w/ this channel packet,
 	 * so that this RXBUF can be recycled by the hypervisor.
 	 */
 	hn_nvs_ack_rxbuf(rxr, chan, pkt->cp_hdr.cph_xactid);
 }
 
 static void
 hn_nvs_ack_rxbuf(struct hn_rx_ring *rxr, struct vmbus_channel *chan,
     uint64_t tid)
 {
 	struct hn_nvs_rndis_ack ack;
 	int retries, error;
 	
 	ack.nvs_type = HN_NVS_TYPE_RNDIS_ACK;
 	ack.nvs_status = HN_NVS_STATUS_OK;
 
 	retries = 0;
 again:
 	error = vmbus_chan_send(chan, VMBUS_CHANPKT_TYPE_COMP,
 	    VMBUS_CHANPKT_FLAG_NONE, &ack, sizeof(ack), tid);
 	if (__predict_false(error == EAGAIN)) {
 		/*
 		 * NOTE:
 		 * This should _not_ happen in real world, since the
 		 * consumption of the TX bufring from the TX path is
 		 * controlled.
 		 */
 		if (rxr->hn_ack_failed == 0)
 			if_printf(rxr->hn_ifp, "RXBUF ack retry\n");
 		rxr->hn_ack_failed++;
 		retries++;
 		if (retries < 10) {
 			DELAY(100);
 			goto again;
 		}
 		/* RXBUF leaks! */
 		if_printf(rxr->hn_ifp, "RXBUF ack failed\n");
 	}
 }
 
 static void
 hn_chan_callback(struct vmbus_channel *chan, void *xrxr)
 {
 	struct hn_rx_ring *rxr = xrxr;
 	struct hn_softc *sc = if_getsoftc(rxr->hn_ifp);
 
 	for (;;) {
 		struct vmbus_chanpkt_hdr *pkt = rxr->hn_pktbuf;
 		int error, pktlen;
 
 		pktlen = rxr->hn_pktbuf_len;
 		error = vmbus_chan_recv_pkt(chan, pkt, &pktlen);
 		if (__predict_false(error == ENOBUFS)) {
 			void *nbuf;
 			int nlen;
 
 			/*
 			 * Expand channel packet buffer.
 			 *
 			 * XXX
 			 * Use M_WAITOK here, since allocation failure
 			 * is fatal.
 			 */
 			nlen = rxr->hn_pktbuf_len * 2;
 			while (nlen < pktlen)
 				nlen *= 2;
 			nbuf = malloc(nlen, M_DEVBUF, M_WAITOK);
 
 			if_printf(rxr->hn_ifp, "expand pktbuf %d -> %d\n",
 			    rxr->hn_pktbuf_len, nlen);
 
 			free(rxr->hn_pktbuf, M_DEVBUF);
 			rxr->hn_pktbuf = nbuf;
 			rxr->hn_pktbuf_len = nlen;
 			/* Retry! */
 			continue;
 		} else if (__predict_false(error == EAGAIN)) {
 			/* No more channel packets; done! */
 			break;
 		}
 		KASSERT(!error, ("vmbus_chan_recv_pkt failed: %d", error));
 
 		switch (pkt->cph_type) {
 		case VMBUS_CHANPKT_TYPE_COMP:
 			hn_nvs_handle_comp(sc, chan, pkt);
 			break;
 
 		case VMBUS_CHANPKT_TYPE_RXBUF:
 			hn_nvs_handle_rxbuf(rxr, chan, pkt);
 			break;
 
 		case VMBUS_CHANPKT_TYPE_INBAND:
 			hn_nvs_handle_notify(sc, pkt);
 			break;
 
 		default:
 			if_printf(rxr->hn_ifp, "unknown chan pkt %u\n",
 			    pkt->cph_type);
 			break;
 		}
 	}
 	hn_chan_rollup(rxr, rxr->hn_txr);
 }
 
 static void
 hn_sysinit(void *arg __unused)
 {
 	int i;
 
 	hn_udpcs_fixup = counter_u64_alloc(M_WAITOK);
 
 #ifdef HN_IFSTART_SUPPORT
 	/*
 	 * Don't use ifnet.if_start if transparent VF mode is requested;
 	 * mainly due to the IFF_DRV_OACTIVE flag.
 	 */
 	if (hn_xpnt_vf && hn_use_if_start) {
 		hn_use_if_start = 0;
 		printf("hn: tranparent VF mode, if_transmit will be used, "
 		    "instead of if_start\n");
 	}
 #endif
 	if (hn_xpnt_vf_attwait < HN_XPNT_VF_ATTWAIT_MIN) {
 		printf("hn: invalid transparent VF attach routing "
 		    "wait timeout %d, reset to %d\n",
 		    hn_xpnt_vf_attwait, HN_XPNT_VF_ATTWAIT_MIN);
 		hn_xpnt_vf_attwait = HN_XPNT_VF_ATTWAIT_MIN;
 	}
 
 	/*
 	 * Initialize VF map.
 	 */
 	rm_init_flags(&hn_vfmap_lock, "hn_vfmap", RM_SLEEPABLE);
 	hn_vfmap_size = HN_VFMAP_SIZE_DEF;
 	hn_vfmap = malloc(sizeof(if_t) * hn_vfmap_size, M_DEVBUF,
 	    M_WAITOK | M_ZERO);
 
 	/*
 	 * Fix the # of TX taskqueues.
 	 */
 	if (hn_tx_taskq_cnt <= 0)
 		hn_tx_taskq_cnt = 1;
 	else if (hn_tx_taskq_cnt > mp_ncpus)
 		hn_tx_taskq_cnt = mp_ncpus;
 
 	/*
 	 * Fix the TX taskqueue mode.
 	 */
 	switch (hn_tx_taskq_mode) {
 	case HN_TX_TASKQ_M_INDEP:
 	case HN_TX_TASKQ_M_GLOBAL:
 	case HN_TX_TASKQ_M_EVTTQ:
 		break;
 	default:
 		hn_tx_taskq_mode = HN_TX_TASKQ_M_INDEP;
 		break;
 	}
 
 	if (vm_guest != VM_GUEST_HV)
 		return;
 
 	if (hn_tx_taskq_mode != HN_TX_TASKQ_M_GLOBAL)
 		return;
 
 	hn_tx_taskque = malloc(hn_tx_taskq_cnt * sizeof(struct taskqueue *),
 	    M_DEVBUF, M_WAITOK);
 	for (i = 0; i < hn_tx_taskq_cnt; ++i) {
 		hn_tx_taskque[i] = taskqueue_create("hn_tx", M_WAITOK,
 		    taskqueue_thread_enqueue, &hn_tx_taskque[i]);
 		taskqueue_start_threads(&hn_tx_taskque[i], 1, PI_NET,
 		    "hn tx%d", i);
 	}
 }
 SYSINIT(hn_sysinit, SI_SUB_DRIVERS, SI_ORDER_SECOND, hn_sysinit, NULL);
 
 static void
 hn_sysuninit(void *arg __unused)
 {
 
 	if (hn_tx_taskque != NULL) {
 		int i;
 
 		for (i = 0; i < hn_tx_taskq_cnt; ++i)
 			taskqueue_free(hn_tx_taskque[i]);
 		free(hn_tx_taskque, M_DEVBUF);
 	}
 
 	if (hn_vfmap != NULL)
 		free(hn_vfmap, M_DEVBUF);
 	rm_destroy(&hn_vfmap_lock);
 
 	counter_u64_free(hn_udpcs_fixup);
 }
 SYSUNINIT(hn_sysuninit, SI_SUB_DRIVERS, SI_ORDER_SECOND, hn_sysuninit, NULL);
diff --git a/sys/dev/hyperv/vmbus/vmbus.c b/sys/dev/hyperv/vmbus/vmbus.c
index 774ba6da46e7..5d0b23a09213 100644
--- a/sys/dev/hyperv/vmbus/vmbus.c
+++ b/sys/dev/hyperv/vmbus/vmbus.c
@@ -1,1705 +1,1703 @@
 /*-
  * Copyright (c) 2009-2012,2016-2017 Microsoft Corp.
  * Copyright (c) 2012 NetApp Inc.
  * Copyright (c) 2012 Citrix Inc.
  * 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 unmodified, 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.
  */
 
 /*
  * VM Bus Driver Implementation
  */
 
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/linker.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/sbuf.h>
 #include <sys/smp.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/taskqueue.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
 #if defined(__aarch64__)
 #include <dev/psci/smccc.h>
 #include <dev/hyperv/vmbus/aarch64/hyperv_machdep.h>
 #include <dev/hyperv/vmbus/aarch64/hyperv_reg.h>
 #else
 #include <dev/hyperv/vmbus/x86/hyperv_machdep.h>
 #include <dev/hyperv/vmbus/x86/hyperv_reg.h>
 #include <machine/intr_machdep.h>
 #include <x86/include/apicvar.h>
 #endif
 #include <machine/metadata.h>
 #include <machine/md_var.h>
 #include <machine/resource.h>
 #include <contrib/dev/acpica/include/acpi.h>
 #include <dev/acpica/acpivar.h>
 
 #include <dev/hyperv/include/hyperv.h>
 #include <dev/hyperv/include/vmbus_xact.h>
 #include <dev/hyperv/vmbus/hyperv_var.h>
 #include <dev/hyperv/vmbus/vmbus_reg.h>
 #include <dev/hyperv/vmbus/vmbus_var.h>
 #include <dev/hyperv/vmbus/vmbus_chanvar.h>
 #include <dev/hyperv/vmbus/hyperv_common_reg.h>
 #include "acpi_if.h"
 #include "pcib_if.h"
 #include "vmbus_if.h"
 
 #define VMBUS_GPADL_START		0xe1e10
 
 struct vmbus_msghc {
 	struct vmbus_xact		*mh_xact;
 	struct hypercall_postmsg_in	mh_inprm_save;
 };
 
 static void			vmbus_identify(driver_t *, device_t);
 static int			vmbus_probe(device_t);
 static int			vmbus_attach(device_t);
 static int			vmbus_detach(device_t);
 static int			vmbus_read_ivar(device_t, device_t, int,
 				    uintptr_t *);
 static int			vmbus_child_pnpinfo(device_t, device_t, struct sbuf *);
 static struct resource		*vmbus_alloc_resource(device_t dev,
 				    device_t child, int type, int *rid,
 				    rman_res_t start, rman_res_t end,
 				    rman_res_t count, u_int flags);
 static int			vmbus_alloc_msi(device_t bus, device_t dev,
 				    int count, int maxcount, int *irqs);
 static int			vmbus_release_msi(device_t bus, device_t dev,
 				    int count, int *irqs);
 static int			vmbus_alloc_msix(device_t bus, device_t dev,
 				    int *irq);
 static int			vmbus_release_msix(device_t bus, device_t dev,
 				    int irq);
 static int			vmbus_map_msi(device_t bus, device_t dev,
 				    int irq, uint64_t *addr, uint32_t *data);
 static uint32_t			vmbus_get_version_method(device_t, device_t);
 static int			vmbus_probe_guid_method(device_t, device_t,
 				    const struct hyperv_guid *);
 static uint32_t			vmbus_get_vcpu_id_method(device_t bus,
 				    device_t dev, int cpu);
 static struct taskqueue		*vmbus_get_eventtq_method(device_t, device_t,
 				    int);
 #if defined(EARLY_AP_STARTUP)
 static void			vmbus_intrhook(void *);
 #endif
 
 static int			vmbus_init(struct vmbus_softc *);
 static int			vmbus_connect(struct vmbus_softc *, uint32_t);
 static int			vmbus_req_channels(struct vmbus_softc *sc);
 static void			vmbus_disconnect(struct vmbus_softc *);
 static int			vmbus_scan(struct vmbus_softc *);
 static void			vmbus_scan_teardown(struct vmbus_softc *);
 static void			vmbus_scan_done(struct vmbus_softc *,
 				    const struct vmbus_message *);
 static void			vmbus_chanmsg_handle(struct vmbus_softc *,
 				    const struct vmbus_message *);
 static void			vmbus_msg_task(void *, int);
 static void			vmbus_synic_setup(void *);
 static void			vmbus_synic_teardown(void *);
 static int			vmbus_sysctl_version(SYSCTL_HANDLER_ARGS);
 static int			vmbus_dma_alloc(struct vmbus_softc *);
 static void			vmbus_dma_free(struct vmbus_softc *);
 static int			vmbus_intr_setup(struct vmbus_softc *);
 static void			vmbus_intr_teardown(struct vmbus_softc *);
 static int			vmbus_doattach(struct vmbus_softc *);
 static void			vmbus_event_proc_dummy(struct vmbus_softc *,
 				    int);
 static bus_dma_tag_t	vmbus_get_dma_tag(device_t parent, device_t child);
 static struct vmbus_softc	*vmbus_sc;
 #if defined(__x86_64__)
 static int vmbus_alloc_cpu_mem(struct vmbus_softc *sc);
 static void vmbus_free_cpu_mem(struct vmbus_softc *sc);
 #endif
 
 SYSCTL_NODE(_hw, OID_AUTO, vmbus, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL,
     "Hyper-V vmbus");
 
 static int			vmbus_pin_evttask = 1;
 SYSCTL_INT(_hw_vmbus, OID_AUTO, pin_evttask, CTLFLAG_RDTUN,
     &vmbus_pin_evttask, 0, "Pin event tasks to their respective CPU");
 
 #if defined(__x86_64__)
 static int			hv_tlb_hcall = 1;
 SYSCTL_INT(_hw_vmbus, OID_AUTO, tlb_hcall , CTLFLAG_RDTUN,
     &hv_tlb_hcall, 0, "Use Hyper_V hyercall for tlb flush");
 #endif
 
 uint32_t			vmbus_current_version;
 
 static const uint32_t		vmbus_version[] = {
 	VMBUS_VERSION_WIN10,
 	VMBUS_VERSION_WIN8_1,
 	VMBUS_VERSION_WIN8,
 	VMBUS_VERSION_WIN7,
 	VMBUS_VERSION_WS2008
 };
 
 static const vmbus_chanmsg_proc_t
 vmbus_chanmsg_handlers[VMBUS_CHANMSG_TYPE_MAX] = {
 	VMBUS_CHANMSG_PROC(CHOFFER_DONE, vmbus_scan_done),
 	VMBUS_CHANMSG_PROC_WAKEUP(CONNECT_RESP)
 };
 
 static device_method_t vmbus_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_identify,		vmbus_identify),
 	DEVMETHOD(device_probe,			vmbus_probe),
 	DEVMETHOD(device_attach,		vmbus_attach),
 	DEVMETHOD(device_detach,		vmbus_detach),
 	DEVMETHOD(device_shutdown,		bus_generic_shutdown),
 	DEVMETHOD(device_suspend,		bus_generic_suspend),
 	DEVMETHOD(device_resume,		bus_generic_resume),
 
 	/* Bus interface */
 	DEVMETHOD(bus_add_child,		bus_generic_add_child),
 	DEVMETHOD(bus_print_child,		bus_generic_print_child),
 	DEVMETHOD(bus_read_ivar,		vmbus_read_ivar),
 	DEVMETHOD(bus_child_pnpinfo,		vmbus_child_pnpinfo),
 	DEVMETHOD(bus_alloc_resource,		vmbus_alloc_resource),
 	DEVMETHOD(bus_release_resource,		bus_generic_release_resource),
 	DEVMETHOD(bus_activate_resource,	bus_generic_activate_resource),
 	DEVMETHOD(bus_deactivate_resource,	bus_generic_deactivate_resource),
 	DEVMETHOD(bus_setup_intr,		bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,		bus_generic_teardown_intr),
 	DEVMETHOD(bus_get_cpus,			bus_generic_get_cpus),
 	DEVMETHOD(bus_get_dma_tag,		vmbus_get_dma_tag),
 
 	/* pcib interface */
 	DEVMETHOD(pcib_alloc_msi,		vmbus_alloc_msi),
 	DEVMETHOD(pcib_release_msi,		vmbus_release_msi),
 	DEVMETHOD(pcib_alloc_msix,		vmbus_alloc_msix),
 	DEVMETHOD(pcib_release_msix,		vmbus_release_msix),
 	DEVMETHOD(pcib_map_msi,			vmbus_map_msi),
 
 	/* Vmbus interface */
 	DEVMETHOD(vmbus_get_version,		vmbus_get_version_method),
 	DEVMETHOD(vmbus_probe_guid,		vmbus_probe_guid_method),
 	DEVMETHOD(vmbus_get_vcpu_id,		vmbus_get_vcpu_id_method),
 	DEVMETHOD(vmbus_get_event_taskq,	vmbus_get_eventtq_method),
 
 	DEVMETHOD_END
 };
 
 static driver_t vmbus_driver = {
 	"vmbus",
 	vmbus_methods,
 	sizeof(struct vmbus_softc)
 };
 
 uint32_t hv_max_vp_index;
 
 DRIVER_MODULE(vmbus, pcib, vmbus_driver, NULL, NULL);
 DRIVER_MODULE(vmbus, acpi_syscontainer, vmbus_driver, NULL, NULL);
 
 MODULE_DEPEND(vmbus, acpi, 1, 1, 1);
 MODULE_DEPEND(vmbus, pci, 1, 1, 1);
 MODULE_VERSION(vmbus, 1);
 
 static __inline struct vmbus_softc *
 vmbus_get_softc(void)
 {
 	return vmbus_sc;
 }
 
 static bus_dma_tag_t
 vmbus_get_dma_tag(device_t dev, device_t child)
 {
 	struct vmbus_softc *sc = vmbus_get_softc();
 	return (sc->dmat);
 }
 
 void
 vmbus_msghc_reset(struct vmbus_msghc *mh, size_t dsize)
 {
 	struct hypercall_postmsg_in *inprm;
 
 	if (dsize > HYPERCALL_POSTMSGIN_DSIZE_MAX)
 		panic("invalid data size %zu", dsize);
 
 	inprm = vmbus_xact_req_data(mh->mh_xact);
 	memset(inprm, 0, HYPERCALL_POSTMSGIN_SIZE);
 	inprm->hc_connid = VMBUS_CONNID_MESSAGE;
 	inprm->hc_msgtype = HYPERV_MSGTYPE_CHANNEL;
 	inprm->hc_dsize = dsize;
 }
 
 struct vmbus_msghc *
 vmbus_msghc_get(struct vmbus_softc *sc, size_t dsize)
 {
 	struct vmbus_msghc *mh;
 	struct vmbus_xact *xact;
 
 	if (dsize > HYPERCALL_POSTMSGIN_DSIZE_MAX)
 		panic("invalid data size %zu", dsize);
 
 	xact = vmbus_xact_get(sc->vmbus_xc,
 	    dsize + __offsetof(struct hypercall_postmsg_in, hc_data[0]));
 	if (xact == NULL)
 		return (NULL);
 
 	mh = vmbus_xact_priv(xact, sizeof(*mh));
 	mh->mh_xact = xact;
 
 	vmbus_msghc_reset(mh, dsize);
 	return (mh);
 }
 
 void
 vmbus_msghc_put(struct vmbus_softc *sc __unused, struct vmbus_msghc *mh)
 {
 
 	vmbus_xact_put(mh->mh_xact);
 }
 
 void *
 vmbus_msghc_dataptr(struct vmbus_msghc *mh)
 {
 	struct hypercall_postmsg_in *inprm;
 
 	inprm = vmbus_xact_req_data(mh->mh_xact);
 	return (inprm->hc_data);
 }
 
 int
 vmbus_msghc_exec_noresult(struct vmbus_msghc *mh)
 {
 	sbintime_t time = SBT_1MS;
 	struct hypercall_postmsg_in *inprm;
 	bus_addr_t inprm_paddr;
 	int i;
 
 	inprm = vmbus_xact_req_data(mh->mh_xact);
 	inprm_paddr = vmbus_xact_req_paddr(mh->mh_xact);
 
 	/*
 	 * Save the input parameter so that we could restore the input
 	 * parameter if the Hypercall failed.
 	 *
 	 * XXX
 	 * Is this really necessary?!  i.e. Will the Hypercall ever
 	 * overwrite the input parameter?
 	 */
 	memcpy(&mh->mh_inprm_save, inprm, HYPERCALL_POSTMSGIN_SIZE);
 
 	/*
 	 * In order to cope with transient failures, e.g. insufficient
 	 * resources on host side, we retry the post message Hypercall
 	 * several times.  20 retries seem sufficient.
 	 */
 #define HC_RETRY_MAX	20
 
 	for (i = 0; i < HC_RETRY_MAX; ++i) {
 		uint64_t status;
 
 		status = hypercall_post_message(inprm_paddr);
 		if (status == HYPERCALL_STATUS_SUCCESS)
 			return 0;
 
 		pause_sbt("hcpmsg", time, 0, C_HARDCLOCK);
 		if (time < SBT_1S * 2)
 			time *= 2;
 
 		/* Restore input parameter and try again */
 		memcpy(inprm, &mh->mh_inprm_save, HYPERCALL_POSTMSGIN_SIZE);
 	}
 
 #undef HC_RETRY_MAX
 
 	return EIO;
 }
 
 int
 vmbus_msghc_exec(struct vmbus_softc *sc __unused, struct vmbus_msghc *mh)
 {
 	int error;
 
 	vmbus_xact_activate(mh->mh_xact);
 	error = vmbus_msghc_exec_noresult(mh);
 	if (error)
 		vmbus_xact_deactivate(mh->mh_xact);
 	return error;
 }
 
 void
 vmbus_msghc_exec_cancel(struct vmbus_softc *sc __unused, struct vmbus_msghc *mh)
 {
 
 	vmbus_xact_deactivate(mh->mh_xact);
 }
 
 const struct vmbus_message *
 vmbus_msghc_wait_result(struct vmbus_softc *sc __unused, struct vmbus_msghc *mh)
 {
 	size_t resp_len;
 
 	return (vmbus_xact_wait(mh->mh_xact, &resp_len));
 }
 
 const struct vmbus_message *
 vmbus_msghc_poll_result(struct vmbus_softc *sc __unused, struct vmbus_msghc *mh)
 {
 	size_t resp_len;
 
 	return (vmbus_xact_poll(mh->mh_xact, &resp_len));
 }
 
 void
 vmbus_msghc_wakeup(struct vmbus_softc *sc, const struct vmbus_message *msg)
 {
 
 	vmbus_xact_ctx_wakeup(sc->vmbus_xc, msg, sizeof(*msg));
 }
 
 uint32_t
 vmbus_gpadl_alloc(struct vmbus_softc *sc)
 {
 	uint32_t gpadl;
 
 again:
 	gpadl = atomic_fetchadd_int(&sc->vmbus_gpadl, 1);
 	if (gpadl == 0)
 		goto again;
 	return (gpadl);
 }
 
 /* Used for Hyper-V socket when guest client connects to host */
 int
 vmbus_req_tl_connect(struct hyperv_guid *guest_srv_id,
     struct hyperv_guid *host_srv_id)
 {
 	struct vmbus_softc *sc = vmbus_get_softc();
 	struct vmbus_chanmsg_tl_connect *req;
 	struct vmbus_msghc *mh;
 	int error;
 
 	if (!sc)
 		return ENXIO;
 
 	mh = vmbus_msghc_get(sc, sizeof(*req));
 	if (mh == NULL) {
 		device_printf(sc->vmbus_dev,
 		    "can not get msg hypercall for tl connect\n");
 		return ENXIO;
 	}
 
 	req = vmbus_msghc_dataptr(mh);
 	req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_TL_CONN;
 	req->guest_endpoint_id = *guest_srv_id;
 	req->host_service_id = *host_srv_id;
 
 	error = vmbus_msghc_exec_noresult(mh);
 	vmbus_msghc_put(sc, mh);
 
 	if (error) {
 		device_printf(sc->vmbus_dev,
 		    "tl connect msg hypercall failed\n");
 	}
 
 	return error;
 }
 
 static int
 vmbus_connect(struct vmbus_softc *sc, uint32_t version)
 {
 	struct vmbus_chanmsg_connect *req;
 	const struct vmbus_message *msg;
 	struct vmbus_msghc *mh;
 	int error, done = 0;
 
 	mh = vmbus_msghc_get(sc, sizeof(*req));
 	if (mh == NULL)
 		return ENXIO;
 
 	req = vmbus_msghc_dataptr(mh);
 	req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_CONNECT;
 	req->chm_ver = version;
 	req->chm_evtflags = pmap_kextract((vm_offset_t)sc->vmbus_evtflags);
 	req->chm_mnf1 = pmap_kextract((vm_offset_t)sc->vmbus_mnf1);
 	req->chm_mnf2 = pmap_kextract((vm_offset_t)sc->vmbus_mnf2);
 
 	error = vmbus_msghc_exec(sc, mh);
 	if (error) {
 		vmbus_msghc_put(sc, mh);
 		return error;
 	}
 
 	msg = vmbus_msghc_wait_result(sc, mh);
 	done = ((const struct vmbus_chanmsg_connect_resp *)
 	    msg->msg_data)->chm_done;
 
 	vmbus_msghc_put(sc, mh);
 
 	return (done ? 0 : EOPNOTSUPP);
 }
 
 static int
 vmbus_init(struct vmbus_softc *sc)
 {
 	int i;
 
 	for (i = 0; i < nitems(vmbus_version); ++i) {
 		int error;
 
 		error = vmbus_connect(sc, vmbus_version[i]);
 		if (!error) {
 			vmbus_current_version = vmbus_version[i];
 			sc->vmbus_version = vmbus_version[i];
 			device_printf(sc->vmbus_dev, "version %u.%u\n",
 			    VMBUS_VERSION_MAJOR(sc->vmbus_version),
 			    VMBUS_VERSION_MINOR(sc->vmbus_version));
 			return 0;
 		}
 	}
 	return ENXIO;
 }
 
 static void
 vmbus_disconnect(struct vmbus_softc *sc)
 {
 	struct vmbus_chanmsg_disconnect *req;
 	struct vmbus_msghc *mh;
 	int error;
 
 	mh = vmbus_msghc_get(sc, sizeof(*req));
 	if (mh == NULL) {
 		device_printf(sc->vmbus_dev,
 		    "can not get msg hypercall for disconnect\n");
 		return;
 	}
 
 	req = vmbus_msghc_dataptr(mh);
 	req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_DISCONNECT;
 
 	error = vmbus_msghc_exec_noresult(mh);
 	vmbus_msghc_put(sc, mh);
 
 	if (error) {
 		device_printf(sc->vmbus_dev,
 		    "disconnect msg hypercall failed\n");
 	}
 }
 
 static int
 vmbus_req_channels(struct vmbus_softc *sc)
 {
 	struct vmbus_chanmsg_chrequest *req;
 	struct vmbus_msghc *mh;
 	int error;
 
 	mh = vmbus_msghc_get(sc, sizeof(*req));
 	if (mh == NULL)
 		return ENXIO;
 
 	req = vmbus_msghc_dataptr(mh);
 	req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_CHREQUEST;
 
 	error = vmbus_msghc_exec_noresult(mh);
 	vmbus_msghc_put(sc, mh);
 
 	return error;
 }
 
 static void
 vmbus_scan_done_task(void *xsc, int pending __unused)
 {
 	struct vmbus_softc *sc = xsc;
 
 	bus_topo_lock();
 	sc->vmbus_scandone = true;
 	bus_topo_unlock();
 	wakeup(&sc->vmbus_scandone);
 }
 
 static void
 vmbus_scan_done(struct vmbus_softc *sc,
     const struct vmbus_message *msg __unused)
 {
 
 	taskqueue_enqueue(sc->vmbus_devtq, &sc->vmbus_scandone_task);
 }
 
 static int
 vmbus_scan(struct vmbus_softc *sc)
 {
 	int error;
 
 	/*
 	 * Identify, probe and attach for non-channel devices.
 	 */
 	bus_generic_probe(sc->vmbus_dev);
 	bus_generic_attach(sc->vmbus_dev);
 
 	/*
 	 * This taskqueue serializes vmbus devices' attach and detach
 	 * for channel offer and rescind messages.
 	 */
 	sc->vmbus_devtq = taskqueue_create("vmbus dev", M_WAITOK,
 	    taskqueue_thread_enqueue, &sc->vmbus_devtq);
 	taskqueue_start_threads(&sc->vmbus_devtq, 1, PI_NET, "vmbusdev");
 	TASK_INIT(&sc->vmbus_scandone_task, 0, vmbus_scan_done_task, sc);
 
 	/*
 	 * This taskqueue handles sub-channel detach, so that vmbus
 	 * device's detach running in vmbus_devtq can drain its sub-
 	 * channels.
 	 */
 	sc->vmbus_subchtq = taskqueue_create("vmbus subch", M_WAITOK,
 	    taskqueue_thread_enqueue, &sc->vmbus_subchtq);
 	taskqueue_start_threads(&sc->vmbus_subchtq, 1, PI_NET, "vmbussch");
 
 	/*
 	 * Start vmbus scanning.
 	 */
 	error = vmbus_req_channels(sc);
 	if (error) {
 		device_printf(sc->vmbus_dev, "channel request failed: %d\n",
 		    error);
 		return (error);
 	}
 
 	/*
 	 * Wait for all vmbus devices from the initial channel offers to be
 	 * attached.
 	 */
 	bus_topo_assert();
 	while (!sc->vmbus_scandone)
 		mtx_sleep(&sc->vmbus_scandone, bus_topo_mtx(), 0, "vmbusdev", 0);
 
 	if (bootverbose) {
 		device_printf(sc->vmbus_dev, "device scan, probe and attach "
 		    "done\n");
 	}
 	return (0);
 }
 
 static void
 vmbus_scan_teardown(struct vmbus_softc *sc)
 {
 
 	bus_topo_assert();
 	if (sc->vmbus_devtq != NULL) {
 		bus_topo_unlock();
 		taskqueue_free(sc->vmbus_devtq);
 		bus_topo_lock();
 		sc->vmbus_devtq = NULL;
 	}
 	if (sc->vmbus_subchtq != NULL) {
 		bus_topo_unlock();
 		taskqueue_free(sc->vmbus_subchtq);
 		bus_topo_lock();
 		sc->vmbus_subchtq = NULL;
 	}
 }
 
 static void
 vmbus_chanmsg_handle(struct vmbus_softc *sc, const struct vmbus_message *msg)
 {
 	vmbus_chanmsg_proc_t msg_proc;
 	uint32_t msg_type;
 
 	msg_type = ((const struct vmbus_chanmsg_hdr *)msg->msg_data)->chm_type;
 	if (msg_type >= VMBUS_CHANMSG_TYPE_MAX) {
 		device_printf(sc->vmbus_dev, "unknown message type 0x%x\n",
 		    msg_type);
 		return;
 	}
 
 	msg_proc = vmbus_chanmsg_handlers[msg_type];
 	if (msg_proc != NULL)
 		msg_proc(sc, msg);
 
 	/* Channel specific processing */
 	vmbus_chan_msgproc(sc, msg);
 }
 
 static void
 vmbus_msg_task(void *xsc, int pending __unused)
 {
 	struct vmbus_softc *sc = xsc;
 	volatile struct vmbus_message *msg;
 
 	msg = VMBUS_PCPU_GET(sc, message, curcpu) + VMBUS_SINT_MESSAGE;
 	for (;;) {
 		if (msg->msg_type == HYPERV_MSGTYPE_NONE) {
 			/* No message */
 			break;
 		} else if (msg->msg_type == HYPERV_MSGTYPE_CHANNEL) {
 			/* Channel message */
 			vmbus_chanmsg_handle(sc,
 			    __DEVOLATILE(const struct vmbus_message *, msg));
 		}
 
 		msg->msg_type = HYPERV_MSGTYPE_NONE;
 		/*
 		 * Make sure the write to msg_type (i.e. set to
 		 * HYPERV_MSGTYPE_NONE) happens before we read the
 		 * msg_flags and EOMing. Otherwise, the EOMing will
 		 * not deliver any more messages since there is no
 		 * empty slot
 		 *
 		 * NOTE:
 		 * mb() is used here, since atomic_thread_fence_seq_cst()
 		 * will become compiler fence on UP kernel.
 		 */
 		mb();
 		if (msg->msg_flags & VMBUS_MSGFLAG_PENDING) {
 			/*
 			 * This will cause message queue rescan to possibly
 			 * deliver another msg from the hypervisor
 			 */
 			WRMSR(MSR_HV_EOM, 0);
 		}
 	}
 }
 static __inline int
 vmbus_handle_intr1(struct vmbus_softc *sc, struct trapframe *frame, int cpu)
 {
 	volatile struct vmbus_message *msg;
 	struct vmbus_message *msg_base;
 
 	msg_base = VMBUS_PCPU_GET(sc, message, cpu);
 
 	/*
 	 * Check event timer.
 	 *
 	 * TODO: move this to independent IDT vector.
 	 */
 	vmbus_handle_timer_intr1(msg_base, frame);
 	/*
 	 * Check events.  Hot path for network and storage I/O data; high rate.
 	 *
 	 * NOTE:
 	 * As recommended by the Windows guest fellows, we check events before
 	 * checking messages.
 	 */
 	sc->vmbus_event_proc(sc, cpu);
 
 	/*
 	 * Check messages.  Mainly management stuffs; ultra low rate.
 	 */
 	msg = msg_base + VMBUS_SINT_MESSAGE;
 	if (__predict_false(msg->msg_type != HYPERV_MSGTYPE_NONE)) {
 		taskqueue_enqueue(VMBUS_PCPU_GET(sc, message_tq, cpu),
 		    VMBUS_PCPU_PTR(sc, message_task, cpu));
 	}
 
 	return (FILTER_HANDLED);
 }
 
 void
 vmbus_handle_intr(struct trapframe *trap_frame)
 {
 	struct vmbus_softc *sc = vmbus_get_softc();
 	int cpu = curcpu;
 
 	/*
 	 * Disable preemption.
 	 */
 	critical_enter();
 
 	/*
 	 * Do a little interrupt counting. This used x86 specific
 	 * intrcnt_add function
 	 */
 #if !defined(__aarch64__)
 	(*VMBUS_PCPU_GET(sc, intr_cnt, cpu))++;
 #endif /* not for aarch64 */
 	vmbus_handle_intr1(sc, trap_frame, cpu);
 
 	/*
 	 * Enable preemption.
 	 */
 	critical_exit();
 }
 
 static void
 vmbus_synic_setup(void *xsc)
 {
 	struct vmbus_softc *sc = xsc;
 	int cpu = curcpu;
 	uint64_t val, orig;
 	uint32_t sint;
 
 	if (hyperv_features & CPUID_HV_MSR_VP_INDEX) {
 		/* Save virtual processor id. */
 		VMBUS_PCPU_GET(sc, vcpuid, cpu) = RDMSR(MSR_HV_VP_INDEX);
 	} else {
 		/* Set virtual processor id to 0 for compatibility. */
 		VMBUS_PCPU_GET(sc, vcpuid, cpu) = 0;
 	}
 
 	if (VMBUS_PCPU_GET(sc, vcpuid, cpu) > hv_max_vp_index)
 		hv_max_vp_index = VMBUS_PCPU_GET(sc, vcpuid, cpu);
 
 	/*
 	 * Setup the SynIC message.
 	 */
 	orig = RDMSR(MSR_HV_SIMP);
 	val = pmap_kextract((vm_offset_t)VMBUS_PCPU_GET(sc, message, cpu)) &
 	    MSR_HV_SIMP_PGMASK;
 	val |= MSR_HV_SIMP_ENABLE | (orig & MSR_HV_SIMP_RSVD_MASK);
 	WRMSR(MSR_HV_SIMP, val);
 	/*
 	 * Setup the SynIC event flags.
 	 */
 	orig = RDMSR(MSR_HV_SIEFP);
 	val = pmap_kextract((vm_offset_t)VMBUS_PCPU_GET(sc, event_flags, cpu)) &
 	    MSR_HV_SIMP_PGMASK;
 	val |= MSR_HV_SIEFP_ENABLE | (orig & MSR_HV_SIEFP_RSVD_MASK);
 	WRMSR(MSR_HV_SIEFP, val);
 
 	/*
 	 * Configure and unmask SINT for message and event flags.
 	 */
 	sint = MSR_HV_SINT0 + VMBUS_SINT_MESSAGE;
 	orig = RDMSR(sint);
 	val = sc->vmbus_idtvec | MSR_HV_SINT_AUTOEOI |
 	    (orig & MSR_HV_SINT_RSVD_MASK);
 	WRMSR(sint, val);
 
 	/*
 	 * Configure and unmask SINT for timer.
 	 */
 	vmbus_synic_setup1(sc);
 	/*
 	 * All done; enable SynIC.
 	 */
 	orig = RDMSR(MSR_HV_SCONTROL);
 	val = MSR_HV_SCTRL_ENABLE | (orig & MSR_HV_SCTRL_RSVD_MASK);
 	WRMSR(MSR_HV_SCONTROL, val);
 }
 
 #if defined(__x86_64__)
 void
 hyperv_vm_tlb_flush(pmap_t pmap, vm_offset_t addr1, vm_offset_t addr2,
     smp_invl_local_cb_t curcpu_cb, enum invl_op_codes op)
 {
 	struct vmbus_softc *sc = vmbus_get_softc();
 	return hv_vm_tlb_flush(pmap, addr1, addr2, op, sc, curcpu_cb);
 }
 #endif /*__x86_64__*/
 
 static void
 vmbus_synic_teardown(void *arg)
 {
 	uint64_t orig;
 	uint32_t sint;
 
 	/*
 	 * Disable SynIC.
 	 */
 	orig = RDMSR(MSR_HV_SCONTROL);
 	WRMSR(MSR_HV_SCONTROL, (orig & MSR_HV_SCTRL_RSVD_MASK));
 
 	/*
 	 * Mask message and event flags SINT.
 	 */
 	sint = MSR_HV_SINT0 + VMBUS_SINT_MESSAGE;
 	orig = RDMSR(sint);
 	WRMSR(sint, orig | MSR_HV_SINT_MASKED);
 
 	/*
 	 * Mask timer SINT.
 	 */
 	vmbus_synic_teardown1();
 	/*
 	 * Teardown SynIC message.
 	 */
 	orig = RDMSR(MSR_HV_SIMP);
 	WRMSR(MSR_HV_SIMP, (orig & MSR_HV_SIMP_RSVD_MASK));
 
 	/*
 	 * Teardown SynIC event flags.
 	 */
 	orig = RDMSR(MSR_HV_SIEFP);
 	WRMSR(MSR_HV_SIEFP, (orig & MSR_HV_SIEFP_RSVD_MASK));
 }
 
 static int
 vmbus_dma_alloc(struct vmbus_softc *sc)
 {
 	uint8_t *evtflags;
 	int cpu;
 
 	CPU_FOREACH(cpu) {
 		void *ptr;
 
 		/*
 		 * Per-cpu messages and event flags.
 		 */
 		ptr = contigmalloc(PAGE_SIZE, M_DEVBUF, M_WAITOK | M_ZERO,
 		    0ul, ~0ul, PAGE_SIZE, 0);
 		if (ptr == NULL)
 			return ENOMEM;
 		VMBUS_PCPU_GET(sc, message, cpu) = ptr;
 
 		ptr = contigmalloc(PAGE_SIZE, M_DEVBUF, M_WAITOK | M_ZERO,
 		    0ul, ~0ul, PAGE_SIZE, 0);
 		if (ptr == NULL)
 			return ENOMEM;
 		VMBUS_PCPU_GET(sc, event_flags, cpu) = ptr;
 	}
 
 	evtflags = contigmalloc(PAGE_SIZE, M_DEVBUF, M_WAITOK | M_ZERO,
 	    0ul, ~0ul, PAGE_SIZE, 0);
 	if (evtflags == NULL)
 		return ENOMEM;
 	sc->vmbus_rx_evtflags = (u_long *)evtflags;
 	sc->vmbus_tx_evtflags = (u_long *)(evtflags + (PAGE_SIZE / 2));
 	sc->vmbus_evtflags = evtflags;
 
 	sc->vmbus_mnf1 = contigmalloc(PAGE_SIZE, M_DEVBUF, M_WAITOK | M_ZERO,
 	    0ul, ~0ul, PAGE_SIZE, 0);
 	if (sc->vmbus_mnf1 == NULL)
 		return ENOMEM;
 
 	sc->vmbus_mnf2 = contigmalloc(sizeof(struct vmbus_mnf), M_DEVBUF,
 	    M_WAITOK | M_ZERO, 0ul, ~0ul, PAGE_SIZE, 0);
 	if (sc->vmbus_mnf2 == NULL)
 		return ENOMEM;
 
 	return 0;
 }
 
 static void
 vmbus_dma_free(struct vmbus_softc *sc)
 {
 	int cpu;
 
 	if (sc->vmbus_evtflags != NULL) {
-		contigfree(sc->vmbus_evtflags, PAGE_SIZE, M_DEVBUF);
+		free(sc->vmbus_evtflags, M_DEVBUF);
 		sc->vmbus_evtflags = NULL;
 		sc->vmbus_rx_evtflags = NULL;
 		sc->vmbus_tx_evtflags = NULL;
 	}
 	if (sc->vmbus_mnf1 != NULL) {
-		contigfree(sc->vmbus_mnf1, PAGE_SIZE, M_DEVBUF);
+		free(sc->vmbus_mnf1, M_DEVBUF);
 		sc->vmbus_mnf1 = NULL;
 	}
 	if (sc->vmbus_mnf2 != NULL) {
-		contigfree(sc->vmbus_mnf2, sizeof(struct vmbus_mnf), M_DEVBUF);
+		free(sc->vmbus_mnf2, M_DEVBUF);
 		sc->vmbus_mnf2 = NULL;
 	}
 
 	CPU_FOREACH(cpu) {
 		if (VMBUS_PCPU_GET(sc, message, cpu) != NULL) {
-			contigfree(VMBUS_PCPU_GET(sc, message, cpu), PAGE_SIZE,
-			    M_DEVBUF);
+			free(VMBUS_PCPU_GET(sc, message, cpu), M_DEVBUF);
 			VMBUS_PCPU_GET(sc, message, cpu) = NULL;
 		}
 		if (VMBUS_PCPU_GET(sc, event_flags, cpu) != NULL) {
-			contigfree(VMBUS_PCPU_GET(sc, event_flags, cpu),
-			    PAGE_SIZE, M_DEVBUF);
+			free(VMBUS_PCPU_GET(sc, event_flags, cpu), M_DEVBUF);
 			VMBUS_PCPU_GET(sc, event_flags, cpu) = NULL;
 		}
 	}
 }
 
 static int
 vmbus_intr_setup(struct vmbus_softc *sc)
 {
 	int cpu;
 
 	CPU_FOREACH(cpu) {
 		char buf[MAXCOMLEN + 1];
 		cpuset_t cpu_mask;
 
 		/* Allocate an interrupt counter for Hyper-V interrupt */
 		snprintf(buf, sizeof(buf), "cpu%d:hyperv", cpu);
 #if !defined(__aarch64__)
 		intrcnt_add(buf, VMBUS_PCPU_PTR(sc, intr_cnt, cpu));
 #endif /* not for aarch64 */
 		/*
 		 * Setup taskqueue to handle events.  Task will be per-
 		 * channel.
 		 */
 		VMBUS_PCPU_GET(sc, event_tq, cpu) = taskqueue_create_fast(
 		    "hyperv event", M_WAITOK, taskqueue_thread_enqueue,
 		    VMBUS_PCPU_PTR(sc, event_tq, cpu));
 		if (vmbus_pin_evttask) {
 			CPU_SETOF(cpu, &cpu_mask);
 			taskqueue_start_threads_cpuset(
 			    VMBUS_PCPU_PTR(sc, event_tq, cpu), 1, PI_NET,
 			    &cpu_mask, "hvevent%d", cpu);
 		} else {
 			taskqueue_start_threads(
 			    VMBUS_PCPU_PTR(sc, event_tq, cpu), 1, PI_NET,
 			    "hvevent%d", cpu);
 		}
 
 		/*
 		 * Setup tasks and taskqueues to handle messages.
 		 */
 		VMBUS_PCPU_GET(sc, message_tq, cpu) = taskqueue_create_fast(
 		    "hyperv msg", M_WAITOK, taskqueue_thread_enqueue,
 		    VMBUS_PCPU_PTR(sc, message_tq, cpu));
 		CPU_SETOF(cpu, &cpu_mask);
 		taskqueue_start_threads_cpuset(
 		    VMBUS_PCPU_PTR(sc, message_tq, cpu), 1, PI_NET, &cpu_mask,
 		    "hvmsg%d", cpu);
 		TASK_INIT(VMBUS_PCPU_PTR(sc, message_task, cpu), 0,
 		    vmbus_msg_task, sc);
 	}
 	return (vmbus_setup_intr1(sc));
 }
 static void
 vmbus_intr_teardown(struct vmbus_softc *sc)
 {
 	vmbus_intr_teardown1(sc);
 }
 
 static int
 vmbus_read_ivar(device_t dev, device_t child, int index, uintptr_t *result)
 {
 	return (ENOENT);
 }
 
 static int
 vmbus_child_pnpinfo(device_t dev, device_t child, struct sbuf *sb)
 {
 	const struct vmbus_channel *chan;
 	char guidbuf[HYPERV_GUID_STRLEN];
 
 	chan = vmbus_get_channel(child);
 	if (chan == NULL) {
 		/* Event timer device, which does not belong to a channel */
 		return (0);
 	}
 
 	hyperv_guid2str(&chan->ch_guid_type, guidbuf, sizeof(guidbuf));
 	sbuf_printf(sb, "classid=%s", guidbuf);
 
 	hyperv_guid2str(&chan->ch_guid_inst, guidbuf, sizeof(guidbuf));
 	sbuf_printf(sb, " deviceid=%s", guidbuf);
 
 	return (0);
 }
 
 int
 vmbus_add_child(struct vmbus_channel *chan)
 {
 	struct vmbus_softc *sc = chan->ch_vmbus;
 	device_t parent = sc->vmbus_dev;
 
 	bus_topo_lock();
 
 	chan->ch_dev = device_add_child(parent, NULL, DEVICE_UNIT_ANY);
 	if (chan->ch_dev == NULL) {
 		bus_topo_unlock();
 		device_printf(parent, "device_add_child for chan%u failed\n",
 		    chan->ch_id);
 		return (ENXIO);
 	}
 	device_set_ivars(chan->ch_dev, chan);
 	device_probe_and_attach(chan->ch_dev);
 	bus_topo_unlock();
 
 	return (0);
 }
 
 int
 vmbus_delete_child(struct vmbus_channel *chan)
 {
 	int error = 0;
 
 	bus_topo_lock();
 	if (chan->ch_dev != NULL) {
 		error = device_delete_child(chan->ch_vmbus->vmbus_dev,
 		    chan->ch_dev);
 		chan->ch_dev = NULL;
 	}
 	bus_topo_unlock();
 	return (error);
 }
 
 static int
 vmbus_sysctl_version(SYSCTL_HANDLER_ARGS)
 {
 	struct vmbus_softc *sc = arg1;
 	char verstr[16];
 
 	snprintf(verstr, sizeof(verstr), "%u.%u",
 	    VMBUS_VERSION_MAJOR(sc->vmbus_version),
 	    VMBUS_VERSION_MINOR(sc->vmbus_version));
 	return sysctl_handle_string(oidp, verstr, sizeof(verstr), req);
 }
 
 /*
  * We need the function to make sure the MMIO resource is allocated from the
  * ranges found in _CRS.
  *
  * For the release function, we can use bus_generic_release_resource().
  */
 static struct resource *
 vmbus_alloc_resource(device_t dev, device_t child, int type, int *rid,
     rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)
 {
 	device_t parent = device_get_parent(dev);
 	struct resource *res;
 
 	if (type == SYS_RES_MEMORY) {
 		struct vmbus_softc *sc = device_get_softc(dev);
 
 		res = pcib_host_res_alloc(&sc->vmbus_mmio_res, child, type,
 		    rid, start, end, count, flags);
 	} else {
 		res = BUS_ALLOC_RESOURCE(parent, child, type, rid, start,
 		    end, count, flags);
 	}
 
 	return (res);
 }
 
 static int
 vmbus_alloc_msi(device_t bus, device_t dev, int count, int maxcount, int *irqs)
 {
 
 	return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount,
 	    irqs));
 }
 
 static int
 vmbus_release_msi(device_t bus, device_t dev, int count, int *irqs)
 {
 
 	return (PCIB_RELEASE_MSI(device_get_parent(bus), dev, count, irqs));
 }
 
 static int
 vmbus_alloc_msix(device_t bus, device_t dev, int *irq)
 {
 
 	return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, irq));
 }
 
 static int
 vmbus_release_msix(device_t bus, device_t dev, int irq)
 {
 
 	return (PCIB_RELEASE_MSIX(device_get_parent(bus), dev, irq));
 }
 
 static int
 vmbus_map_msi(device_t bus, device_t dev, int irq, uint64_t *addr,
 	uint32_t *data)
 {
 
 	return (PCIB_MAP_MSI(device_get_parent(bus), dev, irq, addr, data));
 }
 
 static uint32_t
 vmbus_get_version_method(device_t bus, device_t dev)
 {
 	struct vmbus_softc *sc = device_get_softc(bus);
 
 	return sc->vmbus_version;
 }
 
 static int
 vmbus_probe_guid_method(device_t bus, device_t dev,
     const struct hyperv_guid *guid)
 {
 	const struct vmbus_channel *chan = vmbus_get_channel(dev);
 
 	if (memcmp(&chan->ch_guid_type, guid, sizeof(struct hyperv_guid)) == 0)
 		return 0;
 	return ENXIO;
 }
 
 static uint32_t
 vmbus_get_vcpu_id_method(device_t bus, device_t dev, int cpu)
 {
 	const struct vmbus_softc *sc = device_get_softc(bus);
 
 	return (VMBUS_PCPU_GET(sc, vcpuid, cpu));
 }
 
 static struct taskqueue *
 vmbus_get_eventtq_method(device_t bus, device_t dev __unused, int cpu)
 {
 	const struct vmbus_softc *sc = device_get_softc(bus);
 
 	KASSERT(cpu >= 0 && cpu < mp_ncpus, ("invalid cpu%d", cpu));
 	return (VMBUS_PCPU_GET(sc, event_tq, cpu));
 }
 
 #define VTPM_BASE_ADDR 0xfed40000
 #define FOUR_GB (1ULL << 32)
 
 enum parse_pass { parse_64, parse_32 };
 
 struct parse_context {
 	device_t vmbus_dev;
 	enum parse_pass pass;
 };
 
 static ACPI_STATUS
 parse_crs(ACPI_RESOURCE *res, void *ctx)
 {
 	const struct parse_context *pc = ctx;
 	device_t vmbus_dev = pc->vmbus_dev;
 
 	struct vmbus_softc *sc = device_get_softc(vmbus_dev);
 	UINT64 start, end;
 
 	switch (res->Type) {
 	case ACPI_RESOURCE_TYPE_ADDRESS32:
 		start = res->Data.Address32.Address.Minimum;
 		end = res->Data.Address32.Address.Maximum;
 		break;
 
 	case ACPI_RESOURCE_TYPE_ADDRESS64:
 		start = res->Data.Address64.Address.Minimum;
 		end = res->Data.Address64.Address.Maximum;
 		break;
 
 	default:
 		/* Unused types. */
 		return (AE_OK);
 	}
 
 	/*
 	 * We don't use <1MB addresses.
 	 */
 	if (end < 0x100000)
 		return (AE_OK);
 
 	/* Don't conflict with vTPM. */
 	if (end >= VTPM_BASE_ADDR && start < VTPM_BASE_ADDR)
 		end = VTPM_BASE_ADDR - 1;
 
 	if ((pc->pass == parse_32 && start < FOUR_GB) ||
 	    (pc->pass == parse_64 && start >= FOUR_GB))
 		pcib_host_res_decodes(&sc->vmbus_mmio_res, SYS_RES_MEMORY,
 		    start, end, 0);
 
 	return (AE_OK);
 }
 
 static void
 vmbus_get_crs(device_t dev, device_t vmbus_dev, enum parse_pass pass)
 {
 	struct parse_context pc;
 	ACPI_STATUS status;
 
 	if (bootverbose)
 		device_printf(dev, "walking _CRS, pass=%d\n", pass);
 
 	pc.vmbus_dev = vmbus_dev;
 	pc.pass = pass;
 	status = AcpiWalkResources(acpi_get_handle(dev), "_CRS",
 			parse_crs, &pc);
 
 	if (bootverbose && ACPI_FAILURE(status))
 		device_printf(dev, "_CRS: not found, pass=%d\n", pass);
 }
 
 static void
 vmbus_get_mmio_res_pass(device_t dev, enum parse_pass pass)
 {
 	device_t acpi0, parent;
 
 	parent = device_get_parent(dev);
 
 	acpi0 = device_get_parent(parent);
 	if (strcmp("acpi0", device_get_nameunit(acpi0)) == 0) {
 		device_t *children;
 		int count;
 
 		/*
 		 * Try to locate VMBUS resources and find _CRS on them.
 		 */
 		if (device_get_children(acpi0, &children, &count) == 0) {
 			int i;
 
 			for (i = 0; i < count; ++i) {
 				if (!device_is_attached(children[i]))
 					continue;
 
 				if (strcmp("vmbus_res",
 				    device_get_name(children[i])) == 0)
 					vmbus_get_crs(children[i], dev, pass);
 			}
 			free(children, M_TEMP);
 		}
 
 		/*
 		 * Try to find _CRS on acpi.
 		 */
 		vmbus_get_crs(acpi0, dev, pass);
 	} else {
 		device_printf(dev, "not grandchild of acpi\n");
 	}
 
 	/*
 	 * Try to find _CRS on parent.
 	 */
 	vmbus_get_crs(parent, dev, pass);
 }
 
 static void
 vmbus_get_mmio_res(device_t dev)
 {
 	struct vmbus_softc *sc = device_get_softc(dev);
 	/*
 	 * We walk the resources twice to make sure that: in the resource
 	 * list, the 32-bit resources appear behind the 64-bit resources.
 	 * NB: resource_list_add() uses INSERT_TAIL. This way, when we
 	 * iterate through the list to find a range for a 64-bit BAR in
 	 * vmbus_alloc_resource(), we can make sure we try to use >4GB
 	 * ranges first.
 	 */
 	pcib_host_res_init(dev, &sc->vmbus_mmio_res);
 
 	vmbus_get_mmio_res_pass(dev, parse_64);
 	vmbus_get_mmio_res_pass(dev, parse_32);
 }
 
 /*
  * On Gen2 VMs, Hyper-V provides mmio space for framebuffer.
  * This mmio address range is not useable for other PCI devices.
  * Currently only efifb and vbefb drivers are using this range without
  * reserving it from system.
  * Therefore, vmbus driver reserves it before any other PCI device
  * drivers start to request mmio addresses.
  */
 static struct resource *hv_fb_res;
 
 static void
 vmbus_fb_mmio_res(device_t dev)
 {
 	struct efi_fb *efifb;
 #if !defined(__aarch64__)
 	struct vbe_fb *vbefb;
 #endif /* aarch64 */
 	rman_res_t fb_start, fb_end, fb_count;
 	int fb_height, fb_width;
 	caddr_t kmdp;
 
 	struct vmbus_softc *sc = device_get_softc(dev);
 	int rid = 0;
 
 	kmdp = preload_search_by_type("elf kernel");
 	if (kmdp == NULL)
 		kmdp = preload_search_by_type("elf64 kernel");
 	efifb = (struct efi_fb *)preload_search_info(kmdp,
 	    MODINFO_METADATA | MODINFOMD_EFI_FB);
 #if !defined(__aarch64__)
 	vbefb = (struct vbe_fb *)preload_search_info(kmdp,
 	    MODINFO_METADATA | MODINFOMD_VBE_FB);
 #endif /* aarch64 */
 	if (efifb != NULL) {
 		fb_start = efifb->fb_addr;
 		fb_end = efifb->fb_addr + efifb->fb_size;
 		fb_count = efifb->fb_size;
 		fb_height = efifb->fb_height;
 		fb_width = efifb->fb_width;
 	}
 #if !defined(__aarch64__)
 	else if (vbefb != NULL) {
 		fb_start = vbefb->fb_addr;
 		fb_end = vbefb->fb_addr + vbefb->fb_size;
 		fb_count = vbefb->fb_size;
 		fb_height = vbefb->fb_height;
 		fb_width = vbefb->fb_width;
 	}
 #endif /* aarch64 */
 	else {
 		if (bootverbose)
 			device_printf(dev,
 			    "no preloaded kernel fb information\n");
 		/* We are on Gen1 VM, just return. */
 		return;
 	}
 
 	if (bootverbose)
 		device_printf(dev,
 		    "fb: fb_addr: %#jx, size: %#jx, "
 		    "actual size needed: 0x%x\n",
 		    fb_start, fb_count, fb_height * fb_width);
 
 	hv_fb_res = pcib_host_res_alloc(&sc->vmbus_mmio_res, dev,
 	    SYS_RES_MEMORY, &rid, fb_start, fb_end, fb_count,
 	    RF_ACTIVE | rman_make_alignment_flags(PAGE_SIZE));
 
 	if (hv_fb_res && bootverbose)
 		device_printf(dev,
 		    "successfully reserved memory for framebuffer "
 		    "starting at %#jx, size %#jx\n",
 		    fb_start, fb_count);
 }
 
 static void
 vmbus_free_mmio_res(device_t dev)
 {
 	struct vmbus_softc *sc = device_get_softc(dev);
 
 	pcib_host_res_free(dev, &sc->vmbus_mmio_res);
 
 	if (hv_fb_res)
 		hv_fb_res = NULL;
 }
 
 static void
 vmbus_identify(driver_t *driver, device_t parent)
 {
 
 	if (device_get_unit(parent) != 0 || vm_guest != VM_GUEST_HV ||
 	    (hyperv_features & CPUID_HV_MSR_SYNIC) == 0)
 		return;
 	device_add_child(parent, "vmbus", DEVICE_UNIT_ANY);
 }
 
 static int
 vmbus_probe(device_t dev)
 {
 
 	if (device_get_unit(dev) != 0 || vm_guest != VM_GUEST_HV ||
 	    (hyperv_features & CPUID_HV_MSR_SYNIC) == 0)
 		return (ENXIO);
 
 	device_set_desc(dev, "Hyper-V Vmbus");
 	return (BUS_PROBE_DEFAULT);
 }
 
 #if defined(__x86_64__)
 static int
 vmbus_alloc_cpu_mem(struct vmbus_softc *sc)
 {
 	int cpu;
 
 	CPU_FOREACH(cpu) {
 		void **hv_cpu_mem;
 
 		hv_cpu_mem = VMBUS_PCPU_PTR(sc, cpu_mem, cpu);
 		*hv_cpu_mem = contigmalloc(PAGE_SIZE, M_DEVBUF,
 		    M_NOWAIT | M_ZERO, 0ul, ~0ul, PAGE_SIZE, 0);
 
 		if (*hv_cpu_mem == NULL)
 			return ENOMEM;
 	}
 
 	return 0;
 }
 
 static void
 vmbus_free_cpu_mem(struct vmbus_softc *sc)
 {
 	int cpu;
 
 	CPU_FOREACH(cpu) {
 		void **hv_cpu_mem;
 		hv_cpu_mem = VMBUS_PCPU_PTR(sc, cpu_mem, cpu);
 		if(*hv_cpu_mem != NULL) {
-			contigfree(*hv_cpu_mem, PAGE_SIZE, M_DEVBUF);
+			free(*hv_cpu_mem, M_DEVBUF);
 			*hv_cpu_mem = NULL;
 		}
 	}
 }
 #endif
 
 /**
  * @brief Main vmbus driver initialization routine.
  *
  * Here, we
  * - initialize the vmbus driver context
  * - setup various driver entry points
  * - invoke the vmbus hv main init routine
  * - get the irq resource
  * - invoke the vmbus to add the vmbus root device
  * - setup the vmbus root device
  * - retrieve the channel offers
  */
 static int
 vmbus_doattach(struct vmbus_softc *sc)
 {
 	struct sysctl_oid_list *child;
 	struct sysctl_ctx_list *ctx;
 	int ret;
 	device_t dev_res;
 	ACPI_HANDLE handle;
 	unsigned int coherent = 0;
 
 	if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED)
 		return (0);
 
 	vmbus_get_mmio_res(sc->vmbus_dev);
 	vmbus_fb_mmio_res(sc->vmbus_dev);
 
 	sc->vmbus_flags |= VMBUS_FLAG_ATTACHED;
 
 	sc->vmbus_gpadl = VMBUS_GPADL_START;
 	mtx_init(&sc->vmbus_prichan_lock, "vmbus prichan", NULL, MTX_DEF);
 	TAILQ_INIT(&sc->vmbus_prichans);
 	mtx_init(&sc->vmbus_chan_lock, "vmbus channel", NULL, MTX_DEF);
 	TAILQ_INIT(&sc->vmbus_chans);
 	sc->vmbus_chmap = malloc(
 	    sizeof(struct vmbus_channel *) * VMBUS_CHAN_MAX, M_DEVBUF,
 	    M_WAITOK | M_ZERO);
 
 	/* Coherency attribute */
 	dev_res =  devclass_get_device(devclass_find("vmbus_res"), 0);
 	if (dev_res != NULL) {
 		handle = acpi_get_handle(dev_res);
 
 		if (ACPI_FAILURE(acpi_GetInteger(handle, "_CCA", &coherent)))
 			coherent = 0;
 	}
 	if (bootverbose)
 		device_printf(sc->vmbus_dev, "Bus is%s cache-coherent\n",
 			coherent ? "" : " not");
 
 	bus_dma_tag_create(bus_get_dma_tag(sc->vmbus_dev),
 		1, 0,
 		BUS_SPACE_MAXADDR,
 		BUS_SPACE_MAXADDR,
 		NULL, NULL,
 		BUS_SPACE_MAXSIZE,
 		BUS_SPACE_UNRESTRICTED,
 		BUS_SPACE_MAXSIZE,
 		coherent ? BUS_DMA_COHERENT : 0,
 		NULL, NULL,
 		&sc->dmat);
 	/*
 	 * Create context for "post message" Hypercalls
 	 */
 	sc->vmbus_xc = vmbus_xact_ctx_create(bus_get_dma_tag(sc->vmbus_dev),
 	    HYPERCALL_POSTMSGIN_SIZE, VMBUS_MSG_SIZE,
 	    sizeof(struct vmbus_msghc));
 	if (sc->vmbus_xc == NULL) {
 		ret = ENXIO;
 		goto cleanup;
 	}
 
 	/*
 	 * Allocate DMA stuffs.
 	 */
 	ret = vmbus_dma_alloc(sc);
 	if (ret != 0)
 		goto cleanup;
 
 	/*
 	 * Setup interrupt.
 	 */
 	ret = vmbus_intr_setup(sc);
 	if (ret != 0)
 		goto cleanup;
 
 #if defined(__x86_64__)
 	/*
 	 * Alloc per cpu memory for tlb flush hypercall
 	 */
 	if (hv_tlb_hcall) {
 		ret = vmbus_alloc_cpu_mem(sc);
 		if (ret != 0) {
 			hv_tlb_hcall = 0;
 			if (bootverbose)
 				device_printf(sc->vmbus_dev,
 				    "cannot alloc contig memory for "
 				    "cpu_mem, use system provided "
 				    "tlb flush call.\n");
 
 			vmbus_free_cpu_mem(sc);
 		}
 	}
 #endif
 
 	/*
 	 * Setup SynIC.
 	 */
 	if (bootverbose)
 		device_printf(sc->vmbus_dev, "smp_started = %d\n", smp_started);
 	smp_rendezvous(NULL, vmbus_synic_setup, NULL, sc);
 	sc->vmbus_flags |= VMBUS_FLAG_SYNIC;
 
 #if defined(__x86_64__)
 	if (hv_tlb_hcall)
 		smp_targeted_tlb_shootdown = &hyperv_vm_tlb_flush;
 #endif
 
 	/*
 	 * Initialize vmbus, e.g. connect to Hypervisor.
 	 */
 	ret = vmbus_init(sc);
 	if (ret != 0)
 		goto cleanup;
 
 	if (sc->vmbus_version == VMBUS_VERSION_WS2008 ||
 	    sc->vmbus_version == VMBUS_VERSION_WIN7)
 		sc->vmbus_event_proc = vmbus_event_proc_compat;
 	else
 		sc->vmbus_event_proc = vmbus_event_proc;
 
 	ret = vmbus_scan(sc);
 	if (ret != 0)
 		goto cleanup;
 
 	ctx = device_get_sysctl_ctx(sc->vmbus_dev);
 	child = SYSCTL_CHILDREN(device_get_sysctl_tree(sc->vmbus_dev));
 	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "version",
 	    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, 0,
 	    vmbus_sysctl_version, "A", "vmbus version");
 
 	return (ret);
 
 cleanup:
 	vmbus_scan_teardown(sc);
 	vmbus_intr_teardown(sc);
 	vmbus_dma_free(sc);
 	if (sc->vmbus_xc != NULL) {
 		vmbus_xact_ctx_destroy(sc->vmbus_xc);
 		sc->vmbus_xc = NULL;
 	}
 	free(__DEVOLATILE(void *, sc->vmbus_chmap), M_DEVBUF);
 	mtx_destroy(&sc->vmbus_prichan_lock);
 	mtx_destroy(&sc->vmbus_chan_lock);
 
 	return (ret);
 }
 
 static void
 vmbus_event_proc_dummy(struct vmbus_softc *sc __unused, int cpu __unused)
 {
 }
 
 #if defined(EARLY_AP_STARTUP)
 
 static void
 vmbus_intrhook(void *xsc)
 {
 	struct vmbus_softc *sc = xsc;
 
 	if (bootverbose)
 		device_printf(sc->vmbus_dev, "intrhook\n");
 	vmbus_doattach(sc);
 	config_intrhook_disestablish(&sc->vmbus_intrhook);
 }
 
 #endif /* EARLY_AP_STARTUP */
 
 static int
 vmbus_attach(device_t dev)
 {
 	vmbus_sc = device_get_softc(dev);
 	vmbus_sc->vmbus_dev = dev;
 	vmbus_sc->vmbus_idtvec = -1;
 
 	/*
 	 * Event processing logic will be configured:
 	 * - After the vmbus protocol version negotiation.
 	 * - Before we request channel offers.
 	 */
 	vmbus_sc->vmbus_event_proc = vmbus_event_proc_dummy;
 
 #if defined(EARLY_AP_STARTUP)
 	/*
 	 * Defer the real attach until the pause(9) works as expected.
 	 */
 	vmbus_sc->vmbus_intrhook.ich_func = vmbus_intrhook;
 	vmbus_sc->vmbus_intrhook.ich_arg = vmbus_sc;
 	config_intrhook_establish(&vmbus_sc->vmbus_intrhook);
 #endif /* EARLY_AP_STARTUP  and aarch64 */
 
 	return (0);
 }
 
 static int
 vmbus_detach(device_t dev)
 {
 	struct vmbus_softc *sc = device_get_softc(dev);
 
 	bus_generic_detach(dev);
 	vmbus_chan_destroy_all(sc);
 
 	vmbus_scan_teardown(sc);
 
 	vmbus_disconnect(sc);
 
 	if (sc->vmbus_flags & VMBUS_FLAG_SYNIC) {
 		sc->vmbus_flags &= ~VMBUS_FLAG_SYNIC;
 		smp_rendezvous(NULL, vmbus_synic_teardown, NULL, NULL);
 	}
 
 #if defined(__x86_64__)
 	/*
 	 * Restore the tlb flush to native call
 	 */
 	if (hv_tlb_hcall) {
 		smp_targeted_tlb_shootdown = &smp_targeted_tlb_shootdown_native;
 		vmbus_free_cpu_mem(sc);
 	}
 #endif
 
 	vmbus_intr_teardown(sc);
 	vmbus_dma_free(sc);
 
 	if (sc->vmbus_xc != NULL) {
 		vmbus_xact_ctx_destroy(sc->vmbus_xc);
 		sc->vmbus_xc = NULL;
 	}
 
 	free(__DEVOLATILE(void *, sc->vmbus_chmap), M_DEVBUF);
 	mtx_destroy(&sc->vmbus_prichan_lock);
 	mtx_destroy(&sc->vmbus_chan_lock);
 
 	vmbus_free_mmio_res(dev);
 
 #if defined(__aarch64__)
 	bus_release_resource(device_get_parent(dev), SYS_RES_IRQ, sc->vector,
 	    sc->ires);
 #endif
 	return (0);
 }
 
 #if !defined(EARLY_AP_STARTUP)
 
 static void
 vmbus_sysinit(void *arg __unused)
 {
 	struct vmbus_softc *sc = vmbus_get_softc();
 
 	if (vm_guest != VM_GUEST_HV || sc == NULL)
 		return;
 
 	vmbus_doattach(sc);
 }
 /*
  * NOTE:
  * We have to start as the last step of SI_SUB_SMP, i.e. after SMP is
  * initialized.
  */
 SYSINIT(vmbus_initialize, SI_SUB_SMP, SI_ORDER_ANY, vmbus_sysinit, NULL);
 #endif	/* !EARLY_AP_STARTUP */
diff --git a/sys/dev/hyperv/vmbus/vmbus_chan.c b/sys/dev/hyperv/vmbus/vmbus_chan.c
index 0922470d4672..5ce6e545158c 100644
--- a/sys/dev/hyperv/vmbus/vmbus_chan.c
+++ b/sys/dev/hyperv/vmbus/vmbus_chan.c
@@ -1,2398 +1,2396 @@
 /*-
  * Copyright (c) 2009-2012,2016 Microsoft Corp.
  * Copyright (c) 2012 NetApp Inc.
  * Copyright (c) 2012 Citrix Inc.
  * 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 unmodified, 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.
  */
 
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/smp.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 
 #include <machine/atomic.h>
 #include <machine/stdarg.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 
 #include <dev/hyperv/include/vmbus_xact.h>
 #include <dev/hyperv/vmbus/hyperv_var.h>
 #include <dev/hyperv/vmbus/vmbus_reg.h>
 #include <dev/hyperv/vmbus/vmbus_var.h>
 #include <dev/hyperv/vmbus/vmbus_brvar.h>
 #include <dev/hyperv/vmbus/vmbus_chanvar.h>
 
 struct vmbus_chan_pollarg {
 	struct vmbus_channel	*poll_chan;
 	u_int			poll_hz;
 };
 
 static void			vmbus_chan_update_evtflagcnt(
 				    struct vmbus_softc *,
 				    const struct vmbus_channel *);
 static int			vmbus_chan_close_internal(
 				    struct vmbus_channel *);
 static int			vmbus_chan_sysctl_mnf(SYSCTL_HANDLER_ARGS);
 static void			vmbus_chan_sysctl_create(
 				    struct vmbus_channel *);
 static struct vmbus_channel	*vmbus_chan_alloc(struct vmbus_softc *);
 static void			vmbus_chan_free(struct vmbus_channel *);
 static int			vmbus_chan_add(struct vmbus_channel *);
 static void			vmbus_chan_cpu_default(struct vmbus_channel *);
 static int			vmbus_chan_release(struct vmbus_channel *);
 static void			vmbus_chan_set_chmap(struct vmbus_channel *);
 static void			vmbus_chan_clear_chmap(struct vmbus_channel *);
 static void			vmbus_chan_detach(struct vmbus_channel *);
 static bool			vmbus_chan_wait_revoke(
 				    const struct vmbus_channel *, bool);
 static void			vmbus_chan_poll_timeout(void *);
 static bool			vmbus_chan_poll_cancel_intq(
 				    struct vmbus_channel *);
 static void			vmbus_chan_poll_cancel(struct vmbus_channel *);
 
 static void			vmbus_chan_ins_prilist(struct vmbus_softc *,
 				    struct vmbus_channel *);
 static void			vmbus_chan_rem_prilist(struct vmbus_softc *,
 				    struct vmbus_channel *);
 static void			vmbus_chan_ins_list(struct vmbus_softc *,
 				    struct vmbus_channel *);
 static void			vmbus_chan_rem_list(struct vmbus_softc *,
 				    struct vmbus_channel *);
 static void			vmbus_chan_ins_sublist(struct vmbus_channel *,
 				    struct vmbus_channel *);
 static void			vmbus_chan_rem_sublist(struct vmbus_channel *,
 				    struct vmbus_channel *);
 
 static void			vmbus_chan_task(void *, int);
 static void			vmbus_chan_task_nobatch(void *, int);
 static void			vmbus_chan_poll_task(void *, int);
 static void			vmbus_chan_clrchmap_task(void *, int);
 static void			vmbus_chan_pollcfg_task(void *, int);
 static void			vmbus_chan_polldis_task(void *, int);
 static void			vmbus_chan_poll_cancel_task(void *, int);
 static void			vmbus_prichan_attach_task(void *, int);
 static void			vmbus_subchan_attach_task(void *, int);
 static void			vmbus_prichan_detach_task(void *, int);
 static void			vmbus_subchan_detach_task(void *, int);
 
 static void			vmbus_chan_msgproc_choffer(struct vmbus_softc *,
 				    const struct vmbus_message *);
 static void			vmbus_chan_msgproc_chrescind(
 				    struct vmbus_softc *,
 				    const struct vmbus_message *);
 
 static int			vmbus_chan_printf(const struct vmbus_channel *,
 				    const char *, ...) __printflike(2, 3);
 
 /*
  * Vmbus channel message processing.
  */
 static const vmbus_chanmsg_proc_t
 vmbus_chan_msgprocs[VMBUS_CHANMSG_TYPE_MAX] = {
 	VMBUS_CHANMSG_PROC(CHOFFER,	vmbus_chan_msgproc_choffer),
 	VMBUS_CHANMSG_PROC(CHRESCIND,	vmbus_chan_msgproc_chrescind),
 
 	VMBUS_CHANMSG_PROC_WAKEUP(CHOPEN_RESP),
 	VMBUS_CHANMSG_PROC_WAKEUP(GPADL_CONNRESP),
 	VMBUS_CHANMSG_PROC_WAKEUP(GPADL_DISCONNRESP)
 };
 
 /*
  * Notify host that there are data pending on our TX bufring or
  * we have put some data on the TX bufring.
  */
 static __inline void
 vmbus_chan_signal(const struct vmbus_channel *chan)
 {
 	atomic_set_long(chan->ch_evtflag, chan->ch_evtflag_mask);
 	if (chan->ch_txflags & VMBUS_CHAN_TXF_HASMNF)
 		atomic_set_int(chan->ch_montrig, chan->ch_montrig_mask);
 	else
 		hypercall_signal_event(pmap_kextract(
 		    (vm_offset_t)chan->ch_monprm));
 }
 
 static __inline void
 vmbus_chan_signal_tx(struct vmbus_channel *chan)
 {
 	chan->ch_txbr.txbr_intrcnt ++;
 
 	vmbus_chan_signal(chan);
 }
 
 static __inline void
 vmbus_chan_signal_rx(struct vmbus_channel *chan)
 {
 	chan->ch_rxbr.rxbr_intrcnt ++;
 
 	vmbus_chan_signal(chan);
 }
 
 static void
 vmbus_chan_ins_prilist(struct vmbus_softc *sc, struct vmbus_channel *chan)
 {
 
 	mtx_assert(&sc->vmbus_prichan_lock, MA_OWNED);
 	if (atomic_testandset_int(&chan->ch_stflags,
 	    VMBUS_CHAN_ST_ONPRIL_SHIFT))
 		panic("channel is already on the prilist");
 	TAILQ_INSERT_TAIL(&sc->vmbus_prichans, chan, ch_prilink);
 }
 
 static void
 vmbus_chan_rem_prilist(struct vmbus_softc *sc, struct vmbus_channel *chan)
 {
 
 	mtx_assert(&sc->vmbus_prichan_lock, MA_OWNED);
 	if (atomic_testandclear_int(&chan->ch_stflags,
 	    VMBUS_CHAN_ST_ONPRIL_SHIFT) == 0)
 		panic("channel is not on the prilist");
 	TAILQ_REMOVE(&sc->vmbus_prichans, chan, ch_prilink);
 }
 
 static void
 vmbus_chan_ins_sublist(struct vmbus_channel *prichan,
     struct vmbus_channel *chan)
 {
 
 	mtx_assert(&prichan->ch_subchan_lock, MA_OWNED);
 
 	if (atomic_testandset_int(&chan->ch_stflags,
 	    VMBUS_CHAN_ST_ONSUBL_SHIFT))
 		panic("channel is already on the sublist");
 	TAILQ_INSERT_TAIL(&prichan->ch_subchans, chan, ch_sublink);
 
 	/* Bump sub-channel count. */
 	prichan->ch_subchan_cnt++;
 }
 
 static void
 vmbus_chan_rem_sublist(struct vmbus_channel *prichan,
     struct vmbus_channel *chan)
 {
 
 	mtx_assert(&prichan->ch_subchan_lock, MA_OWNED);
 
 	KASSERT(prichan->ch_subchan_cnt > 0,
 	    ("invalid subchan_cnt %d", prichan->ch_subchan_cnt));
 	prichan->ch_subchan_cnt--;
 
 	if (atomic_testandclear_int(&chan->ch_stflags,
 	    VMBUS_CHAN_ST_ONSUBL_SHIFT) == 0)
 		panic("channel is not on the sublist");
 	TAILQ_REMOVE(&prichan->ch_subchans, chan, ch_sublink);
 }
 
 static void
 vmbus_chan_ins_list(struct vmbus_softc *sc, struct vmbus_channel *chan)
 {
 
 	mtx_assert(&sc->vmbus_chan_lock, MA_OWNED);
 	if (atomic_testandset_int(&chan->ch_stflags,
 	    VMBUS_CHAN_ST_ONLIST_SHIFT))
 		panic("channel is already on the list");
 	TAILQ_INSERT_TAIL(&sc->vmbus_chans, chan, ch_link);
 }
 
 static void
 vmbus_chan_rem_list(struct vmbus_softc *sc, struct vmbus_channel *chan)
 {
 
 	mtx_assert(&sc->vmbus_chan_lock, MA_OWNED);
 	if (atomic_testandclear_int(&chan->ch_stflags,
 	    VMBUS_CHAN_ST_ONLIST_SHIFT) == 0)
 		panic("channel is not on the list");
 	TAILQ_REMOVE(&sc->vmbus_chans, chan, ch_link);
 }
 
 static int
 vmbus_chan_sysctl_mnf(SYSCTL_HANDLER_ARGS)
 {
 	struct vmbus_channel *chan = arg1;
 	int mnf = 0;
 
 	if (chan->ch_txflags & VMBUS_CHAN_TXF_HASMNF)
 		mnf = 1;
 	return sysctl_handle_int(oidp, &mnf, 0, req);
 }
 
 static void
 vmbus_chan_sysctl_create(struct vmbus_channel *chan)
 {
 	struct sysctl_oid *ch_tree, *chid_tree, *br_tree;
 	struct sysctl_ctx_list *ctx;
 	uint32_t ch_id;
 	char name[16];
 
 	/*
 	 * Add sysctl nodes related to this channel to this
 	 * channel's sysctl ctx, so that they can be destroyed
 	 * independently upon close of this channel, which can
 	 * happen even if the device is not detached.
 	 */
 	ctx = &chan->ch_sysctl_ctx;
 	sysctl_ctx_init(ctx);
 
 	/*
 	 * Create dev.NAME.UNIT.channel tree.
 	 */
 	ch_tree = SYSCTL_ADD_NODE(ctx,
 	    SYSCTL_CHILDREN(device_get_sysctl_tree(chan->ch_dev)),
 	    OID_AUTO, "channel", CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "");
 	if (ch_tree == NULL)
 		return;
 
 	/*
 	 * Create dev.NAME.UNIT.channel.CHANID tree.
 	 */
 	if (VMBUS_CHAN_ISPRIMARY(chan))
 		ch_id = chan->ch_id;
 	else
 		ch_id = chan->ch_prichan->ch_id;
 	snprintf(name, sizeof(name), "%d", ch_id);
 	chid_tree = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(ch_tree),
 	    OID_AUTO, name, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "");
 	if (chid_tree == NULL)
 		return;
 
 	if (!VMBUS_CHAN_ISPRIMARY(chan)) {
 		/*
 		 * Create dev.NAME.UNIT.channel.CHANID.sub tree.
 		 */
 		ch_tree = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(chid_tree),
 		    OID_AUTO, "sub", CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "");
 		if (ch_tree == NULL)
 			return;
 
 		/*
 		 * Create dev.NAME.UNIT.channel.CHANID.sub.SUBIDX tree.
 		 *
 		 * NOTE:
 		 * chid_tree is changed to this new sysctl tree.
 		 */
 		snprintf(name, sizeof(name), "%d", chan->ch_subidx);
 		chid_tree = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(ch_tree),
 		    OID_AUTO, name, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "");
 		if (chid_tree == NULL)
 			return;
 
 		SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(chid_tree), OID_AUTO,
 		    "chanid", CTLFLAG_RD, &chan->ch_id, 0, "channel id");
 	}
 
 	SYSCTL_ADD_UINT(ctx, SYSCTL_CHILDREN(chid_tree), OID_AUTO,
 	    "cpu", CTLFLAG_RD, &chan->ch_cpuid, 0, "owner CPU id");
 	SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(chid_tree), OID_AUTO,
 	    "mnf", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE,
 	    chan, 0, vmbus_chan_sysctl_mnf, "I",
 	    "has monitor notification facilities");
 
 	br_tree = SYSCTL_ADD_NODE(ctx, SYSCTL_CHILDREN(chid_tree), OID_AUTO,
 	    "br", CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "");
 	if (br_tree != NULL) {
 		/*
 		 * Create sysctl tree for RX bufring.
 		 */
 		vmbus_br_sysctl_create(ctx, br_tree, &chan->ch_rxbr.rxbr, "rx");
 		/*
 		 * Create sysctl tree for TX bufring.
 		 */
 		vmbus_br_sysctl_create(ctx, br_tree, &chan->ch_txbr.txbr, "tx");
 	}
 }
 
 int
 vmbus_chan_open(struct vmbus_channel *chan, int txbr_size, int rxbr_size,
     const void *udata, int udlen, vmbus_chan_callback_t cb, void *cbarg)
 {
 	struct vmbus_chan_br cbr;
 	int error;
 
 	/*
 	 * Allocate the TX+RX bufrings.
 	 */
 	KASSERT(chan->ch_bufring == NULL, ("bufrings are allocated"));
-	chan->ch_bufring_size = txbr_size + rxbr_size;
-	chan->ch_bufring = contigmalloc(chan->ch_bufring_size, M_DEVBUF,
+	chan->ch_bufring = contigmalloc(txbr_size + rxbr_size, M_DEVBUF,
 	    M_WAITOK | M_ZERO, 0ul, ~0ul, PAGE_SIZE, 0);
 	if (chan->ch_bufring == NULL) {
 		vmbus_chan_printf(chan, "bufring allocation failed\n");
 		return (ENOMEM);
 	}
 
 	cbr.cbr = chan->ch_bufring;
 	cbr.cbr_paddr = pmap_kextract((vm_offset_t)chan->ch_bufring);
 	cbr.cbr_txsz = txbr_size;
 	cbr.cbr_rxsz = rxbr_size;
 
 	error = vmbus_chan_open_br(chan, &cbr, udata, udlen, cb, cbarg);
 	if (error) {
 		if (error == EISCONN) {
 			/*
 			 * XXX
 			 * The bufring GPADL is still connected; abandon
 			 * this bufring, instead of having mysterious
 			 * crash or trashed data later on.
 			 */
 			vmbus_chan_printf(chan, "chan%u bufring GPADL "
 			    "is still connected upon channel open error; "
 			    "leak %d bytes memory\n", chan->ch_id,
 			    txbr_size + rxbr_size);
 		} else {
-			contigfree(chan->ch_bufring, chan->ch_bufring_size,
-			    M_DEVBUF);
+			free(chan->ch_bufring, M_DEVBUF);
 		}
 		chan->ch_bufring = NULL;
 	}
 	return (error);
 }
 
 int
 vmbus_chan_open_br(struct vmbus_channel *chan, const struct vmbus_chan_br *cbr,
     const void *udata, int udlen, vmbus_chan_callback_t cb, void *cbarg)
 {
 	struct vmbus_softc *sc = chan->ch_vmbus;
 	const struct vmbus_message *msg;
 	struct vmbus_chanmsg_chopen *req;
 	struct vmbus_msghc *mh;
 	uint32_t status;
 	int error, txbr_size, rxbr_size;
 	task_fn_t *task_fn;
 	uint8_t *br;
 
 	if (udlen > VMBUS_CHANMSG_CHOPEN_UDATA_SIZE) {
 		vmbus_chan_printf(chan,
 		    "invalid udata len %d for chan%u\n", udlen, chan->ch_id);
 		return (EINVAL);
 	}
 
 	br = cbr->cbr;
 	txbr_size = cbr->cbr_txsz;
 	rxbr_size = cbr->cbr_rxsz;
 	KASSERT((txbr_size & PAGE_MASK) == 0,
 	    ("send bufring size is not multiple page"));
 	KASSERT((rxbr_size & PAGE_MASK) == 0,
 	    ("recv bufring size is not multiple page"));
 	KASSERT((cbr->cbr_paddr & PAGE_MASK) == 0,
 	    ("bufring is not page aligned"));
 
 	/*
 	 * Zero out the TX/RX bufrings, in case that they were used before.
 	 */
 	memset(br, 0, txbr_size + rxbr_size);
 
 	if (atomic_testandset_int(&chan->ch_stflags,
 	    VMBUS_CHAN_ST_OPENED_SHIFT))
 		panic("double-open chan%u", chan->ch_id);
 
 	chan->ch_cb = cb;
 	chan->ch_cbarg = cbarg;
 
 	vmbus_chan_update_evtflagcnt(sc, chan);
 
 	chan->ch_tq = VMBUS_PCPU_GET(chan->ch_vmbus, event_tq, chan->ch_cpuid);
 	if (chan->ch_flags & VMBUS_CHAN_FLAG_BATCHREAD)
 		task_fn = vmbus_chan_task;
 	else
 		task_fn = vmbus_chan_task_nobatch;
 	TASK_INIT(&chan->ch_task, 0, task_fn, chan);
 
 	/* TX bufring comes first */
 	vmbus_txbr_setup(&chan->ch_txbr, br, txbr_size);
 	/* RX bufring immediately follows TX bufring */
 	vmbus_rxbr_setup(&chan->ch_rxbr, br + txbr_size, rxbr_size);
 
 	/* Create sysctl tree for this channel */
 	vmbus_chan_sysctl_create(chan);
 
 	/*
 	 * Connect the bufrings, both RX and TX, to this channel.
 	 */
 	error = vmbus_chan_gpadl_connect(chan, cbr->cbr_paddr,
 	    txbr_size + rxbr_size, &chan->ch_bufring_gpadl);
 	if (error) {
 		vmbus_chan_printf(chan,
 		    "failed to connect bufring GPADL to chan%u\n", chan->ch_id);
 		goto failed;
 	}
 
 	/*
 	 * Install this channel, before it is opened, but after everything
 	 * else has been setup.
 	 */
 	vmbus_chan_set_chmap(chan);
 
 	/*
 	 * Open channel w/ the bufring GPADL on the target CPU.
 	 */
 	mh = vmbus_msghc_get(sc, sizeof(*req));
 	if (mh == NULL) {
 		vmbus_chan_printf(chan,
 		    "can not get msg hypercall for chopen(chan%u)\n",
 		    chan->ch_id);
 		error = ENXIO;
 		goto failed;
 	}
 
 	req = vmbus_msghc_dataptr(mh);
 	req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_CHOPEN;
 	req->chm_chanid = chan->ch_id;
 	req->chm_openid = chan->ch_id;
 	req->chm_gpadl = chan->ch_bufring_gpadl;
 	req->chm_vcpuid = chan->ch_vcpuid;
 	req->chm_txbr_pgcnt = txbr_size >> PAGE_SHIFT;
 	if (udlen > 0)
 		memcpy(req->chm_udata, udata, udlen);
 
 	error = vmbus_msghc_exec(sc, mh);
 	if (error) {
 		vmbus_chan_printf(chan,
 		    "chopen(chan%u) msg hypercall exec failed: %d\n",
 		    chan->ch_id, error);
 		vmbus_msghc_put(sc, mh);
 		goto failed;
 	}
 
 	for (;;) {
 		msg = vmbus_msghc_poll_result(sc, mh);
 		if (msg != NULL)
 			break;
 		if (vmbus_chan_is_revoked(chan)) {
 			int i;
 
 			/*
 			 * NOTE:
 			 * Hypervisor does _not_ send response CHOPEN to
 			 * a revoked channel.
 			 */
 			vmbus_chan_printf(chan,
 			    "chan%u is revoked, when it is being opened\n",
 			    chan->ch_id);
 
 			/*
 			 * XXX
 			 * Add extra delay before cancel the hypercall
 			 * execution; mainly to close any possible
 			 * CHRESCIND and CHOPEN_RESP races on the
 			 * hypervisor side.
 			 */
 #define REVOKE_LINGER	100
 			for (i = 0; i < REVOKE_LINGER; ++i) {
 				msg = vmbus_msghc_poll_result(sc, mh);
 				if (msg != NULL)
 					break;
 				pause("rchopen", 1);
 			}
 #undef REVOKE_LINGER
 			if (msg == NULL)
 				vmbus_msghc_exec_cancel(sc, mh);
 			break;
 		}
 		pause("chopen", 1);
 	}
 	if (msg != NULL) {
 		status = ((const struct vmbus_chanmsg_chopen_resp *)
 		    msg->msg_data)->chm_status;
 	} else {
 		/* XXX any non-0 value is ok here. */
 		status = 0xff;
 	}
 
 	vmbus_msghc_put(sc, mh);
 
 	if (status == 0) {
 		if (bootverbose)
 			vmbus_chan_printf(chan, "chan%u opened\n", chan->ch_id);
 		return (0);
 	}
 
 	vmbus_chan_printf(chan, "failed to open chan%u\n", chan->ch_id);
 	error = ENXIO;
 
 failed:
 	sysctl_ctx_free(&chan->ch_sysctl_ctx);
 	vmbus_chan_clear_chmap(chan);
 	if (chan->ch_bufring_gpadl != 0) {
 		int error1;
 
 		error1 = vmbus_chan_gpadl_disconnect(chan,
 		    chan->ch_bufring_gpadl);
 		if (error1) {
 			/*
 			 * Give caller a hint that the bufring GPADL is still
 			 * connected.
 			 */
 			error = EISCONN;
 		}
 		chan->ch_bufring_gpadl = 0;
 	}
 	atomic_clear_int(&chan->ch_stflags, VMBUS_CHAN_ST_OPENED);
 	return (error);
 }
 
 int
 vmbus_chan_gpadl_connect(struct vmbus_channel *chan, bus_addr_t paddr,
     int size, uint32_t *gpadl0)
 {
 	struct vmbus_softc *sc = chan->ch_vmbus;
 	struct vmbus_msghc *mh;
 	struct vmbus_chanmsg_gpadl_conn *req;
 	const struct vmbus_message *msg;
 	size_t reqsz;
 	uint32_t gpadl, status;
 	int page_count, range_len, i, cnt, error;
 	uint64_t page_id;
 
 	KASSERT(*gpadl0 == 0, ("GPADL is not zero"));
 
 	/*
 	 * Preliminary checks.
 	 */
 
 	KASSERT((size & PAGE_MASK) == 0,
 	    ("invalid GPA size %d, not multiple page size", size));
 	page_count = size >> PAGE_SHIFT;
 
 	KASSERT((paddr & PAGE_MASK) == 0,
 	    ("GPA is not page aligned %jx", (uintmax_t)paddr));
 	page_id = paddr >> PAGE_SHIFT;
 
 	range_len = __offsetof(struct vmbus_gpa_range, gpa_page[page_count]);
 	/*
 	 * We don't support multiple GPA ranges.
 	 */
 	if (range_len > UINT16_MAX) {
 		vmbus_chan_printf(chan, "GPA too large, %d pages\n",
 		    page_count);
 		return EOPNOTSUPP;
 	}
 
 	/*
 	 * Allocate GPADL id.
 	 */
 	gpadl = vmbus_gpadl_alloc(sc);
 
 	/*
 	 * Connect this GPADL to the target channel.
 	 *
 	 * NOTE:
 	 * Since each message can only hold small set of page
 	 * addresses, several messages may be required to
 	 * complete the connection.
 	 */
 	if (page_count > VMBUS_CHANMSG_GPADL_CONN_PGMAX)
 		cnt = VMBUS_CHANMSG_GPADL_CONN_PGMAX;
 	else
 		cnt = page_count;
 	page_count -= cnt;
 
 	reqsz = __offsetof(struct vmbus_chanmsg_gpadl_conn,
 	    chm_range.gpa_page[cnt]);
 	mh = vmbus_msghc_get(sc, reqsz);
 	if (mh == NULL) {
 		vmbus_chan_printf(chan,
 		    "can not get msg hypercall for gpadl_conn(chan%u)\n",
 		    chan->ch_id);
 		return EIO;
 	}
 
 	req = vmbus_msghc_dataptr(mh);
 	req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_GPADL_CONN;
 	req->chm_chanid = chan->ch_id;
 	req->chm_gpadl = gpadl;
 	req->chm_range_len = range_len;
 	req->chm_range_cnt = 1;
 	req->chm_range.gpa_len = size;
 	req->chm_range.gpa_ofs = 0;
 	for (i = 0; i < cnt; ++i)
 		req->chm_range.gpa_page[i] = page_id++;
 
 	error = vmbus_msghc_exec(sc, mh);
 	if (error) {
 		vmbus_chan_printf(chan,
 		    "gpadl_conn(chan%u) msg hypercall exec failed: %d\n",
 		    chan->ch_id, error);
 		vmbus_msghc_put(sc, mh);
 		return error;
 	}
 
 	while (page_count > 0) {
 		struct vmbus_chanmsg_gpadl_subconn *subreq;
 
 		if (page_count > VMBUS_CHANMSG_GPADL_SUBCONN_PGMAX)
 			cnt = VMBUS_CHANMSG_GPADL_SUBCONN_PGMAX;
 		else
 			cnt = page_count;
 		page_count -= cnt;
 
 		reqsz = __offsetof(struct vmbus_chanmsg_gpadl_subconn,
 		    chm_gpa_page[cnt]);
 		vmbus_msghc_reset(mh, reqsz);
 
 		subreq = vmbus_msghc_dataptr(mh);
 		subreq->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_GPADL_SUBCONN;
 		subreq->chm_gpadl = gpadl;
 		for (i = 0; i < cnt; ++i)
 			subreq->chm_gpa_page[i] = page_id++;
 
 		vmbus_msghc_exec_noresult(mh);
 	}
 	KASSERT(page_count == 0, ("invalid page count %d", page_count));
 
 	msg = vmbus_msghc_wait_result(sc, mh);
 	status = ((const struct vmbus_chanmsg_gpadl_connresp *)
 	    msg->msg_data)->chm_status;
 
 	vmbus_msghc_put(sc, mh);
 
 	if (status != 0) {
 		vmbus_chan_printf(chan, "gpadl_conn(chan%u) failed: %u\n",
 		    chan->ch_id, status);
 		return EIO;
 	}
 
 	/* Done; commit the GPADL id. */
 	*gpadl0 = gpadl;
 	if (bootverbose) {
 		vmbus_chan_printf(chan, "gpadl_conn(chan%u) succeeded\n",
 		    chan->ch_id);
 	}
 	return 0;
 }
 
 static bool
 vmbus_chan_wait_revoke(const struct vmbus_channel *chan, bool can_sleep)
 {
 #define WAIT_COUNT	200	/* 200ms */
 
 	int i;
 
 	for (i = 0; i < WAIT_COUNT; ++i) {
 		if (vmbus_chan_is_revoked(chan))
 			return (true);
 		if (can_sleep)
 			pause("wchrev", 1);
 		else
 			DELAY(1000);
 	}
 	return (false);
 
 #undef WAIT_COUNT
 }
 
 /*
  * Disconnect the GPA from the target channel
  */
 int
 vmbus_chan_gpadl_disconnect(struct vmbus_channel *chan, uint32_t gpadl)
 {
 	struct vmbus_softc *sc = chan->ch_vmbus;
 	struct vmbus_msghc *mh;
 	struct vmbus_chanmsg_gpadl_disconn *req;
 	int error;
 
 	KASSERT(gpadl != 0, ("GPADL is zero"));
 
 	mh = vmbus_msghc_get(sc, sizeof(*req));
 	if (mh == NULL) {
 		vmbus_chan_printf(chan,
 		    "can not get msg hypercall for gpadl_disconn(chan%u)\n",
 		    chan->ch_id);
 		return (EBUSY);
 	}
 
 	req = vmbus_msghc_dataptr(mh);
 	req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_GPADL_DISCONN;
 	req->chm_chanid = chan->ch_id;
 	req->chm_gpadl = gpadl;
 
 	error = vmbus_msghc_exec(sc, mh);
 	if (error) {
 		vmbus_msghc_put(sc, mh);
 
 		if (vmbus_chan_wait_revoke(chan, true)) {
 			/*
 			 * Error is benign; this channel is revoked,
 			 * so this GPADL will not be touched anymore.
 			 */
 			vmbus_chan_printf(chan,
 			    "gpadl_disconn(revoked chan%u) msg hypercall "
 			    "exec failed: %d\n", chan->ch_id, error);
 			return (0);
 		}
 		vmbus_chan_printf(chan,
 		    "gpadl_disconn(chan%u) msg hypercall exec failed: %d\n",
 		    chan->ch_id, error);
 		return (error);
 	}
 
 	vmbus_msghc_wait_result(sc, mh);
 	/* Discard result; no useful information */
 	vmbus_msghc_put(sc, mh);
 
 	return (0);
 }
 
 static void
 vmbus_chan_detach(struct vmbus_channel *chan)
 {
 	int refs;
 
 	KASSERT(chan->ch_refs > 0, ("chan%u: invalid refcnt %d",
 	    chan->ch_id, chan->ch_refs));
 	refs = atomic_fetchadd_int(&chan->ch_refs, -1);
 #ifdef INVARIANTS
 	if (VMBUS_CHAN_ISPRIMARY(chan)) {
 		KASSERT(refs == 1, ("chan%u: invalid refcnt %d for prichan",
 		    chan->ch_id, refs + 1));
 	}
 #endif
 	if (refs == 1) {
 		/*
 		 * Detach the target channel.
 		 */
 		if (bootverbose) {
 			vmbus_chan_printf(chan, "chan%u detached\n",
 			    chan->ch_id);
 		}
 		taskqueue_enqueue(chan->ch_mgmt_tq, &chan->ch_detach_task);
 	}
 }
 
 static void
 vmbus_chan_clrchmap_task(void *xchan, int pending __unused)
 {
 	struct vmbus_channel *chan = xchan;
 
 	chan->ch_vmbus->vmbus_chmap[chan->ch_id] = NULL;
 }
 
 static void
 vmbus_chan_clear_chmap(struct vmbus_channel *chan)
 {
 	struct task chmap_task;
 
 	TASK_INIT(&chmap_task, 0, vmbus_chan_clrchmap_task, chan);
 	vmbus_chan_run_task(chan, &chmap_task);
 }
 
 static void
 vmbus_chan_set_chmap(struct vmbus_channel *chan)
 {
 	__compiler_membar();
 	chan->ch_vmbus->vmbus_chmap[chan->ch_id] = chan;
 }
 
 static void
 vmbus_chan_poll_cancel_task(void *xchan, int pending __unused)
 {
 
 	vmbus_chan_poll_cancel_intq(xchan);
 }
 
 static void
 vmbus_chan_poll_cancel(struct vmbus_channel *chan)
 {
 	struct task poll_cancel;
 
 	TASK_INIT(&poll_cancel, 0, vmbus_chan_poll_cancel_task, chan);
 	vmbus_chan_run_task(chan, &poll_cancel);
 }
 
 static int
 vmbus_chan_close_internal(struct vmbus_channel *chan)
 {
 	struct vmbus_softc *sc = chan->ch_vmbus;
 	struct vmbus_msghc *mh;
 	struct vmbus_chanmsg_chclose *req;
 	uint32_t old_stflags;
 	int error;
 
 	/*
 	 * NOTE:
 	 * Sub-channels are closed upon their primary channel closing,
 	 * so they can be closed even before they are opened.
 	 */
 	for (;;) {
 		old_stflags = chan->ch_stflags;
 		if (atomic_cmpset_int(&chan->ch_stflags, old_stflags,
 		    old_stflags & ~VMBUS_CHAN_ST_OPENED))
 			break;
 	}
 	if ((old_stflags & VMBUS_CHAN_ST_OPENED) == 0) {
 		/* Not opened yet; done */
 		if (bootverbose) {
 			vmbus_chan_printf(chan, "chan%u not opened\n",
 			    chan->ch_id);
 		}
 		return (0);
 	}
 
 	/*
 	 * Free this channel's sysctl tree attached to its device's
 	 * sysctl tree.
 	 */
 	sysctl_ctx_free(&chan->ch_sysctl_ctx);
 
 	/*
 	 * Cancel polling, if it is enabled.
 	 */
 	vmbus_chan_poll_cancel(chan);
 
 	/*
 	 * NOTE:
 	 * Order is critical.  This channel _must_ be uninstalled first,
 	 * else the channel task may be enqueued by the IDT after it has
 	 * been drained.
 	 */
 	vmbus_chan_clear_chmap(chan);
 	taskqueue_drain(chan->ch_tq, &chan->ch_task);
 	chan->ch_tq = NULL;
 
 	/*
 	 * Close this channel.
 	 */
 	mh = vmbus_msghc_get(sc, sizeof(*req));
 	if (mh == NULL) {
 		vmbus_chan_printf(chan,
 		    "can not get msg hypercall for chclose(chan%u)\n",
 		    chan->ch_id);
 		error = ENXIO;
 		goto disconnect;
 	}
 
 	req = vmbus_msghc_dataptr(mh);
 	req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_CHCLOSE;
 	req->chm_chanid = chan->ch_id;
 
 	error = vmbus_msghc_exec_noresult(mh);
 	vmbus_msghc_put(sc, mh);
 
 	if (error) {
 		vmbus_chan_printf(chan,
 		    "chclose(chan%u) msg hypercall exec failed: %d\n",
 		    chan->ch_id, error);
 		goto disconnect;
 	}
 
 	if (bootverbose)
 		vmbus_chan_printf(chan, "chan%u closed\n", chan->ch_id);
 
 disconnect:
 	/*
 	 * Disconnect the TX+RX bufrings from this channel.
 	 */
 	if (chan->ch_bufring_gpadl != 0) {
 		int error1;
 
 		error1 = vmbus_chan_gpadl_disconnect(chan,
 		    chan->ch_bufring_gpadl);
 		if (error1) {
 			/*
 			 * XXX
 			 * The bufring GPADL is still connected; abandon
 			 * this bufring, instead of having mysterious
 			 * crash or trashed data later on.
 			 */
 			vmbus_chan_printf(chan, "chan%u bufring GPADL "
 			    "is still connected after close\n", chan->ch_id);
 			chan->ch_bufring = NULL;
 			/*
 			 * Give caller a hint that the bufring GPADL is
 			 * still connected.
 			 */
 			error = EISCONN;
 		}
 		chan->ch_bufring_gpadl = 0;
 	}
 
 	/*
 	 * Destroy the TX+RX bufrings.
 	 */
 	if (chan->ch_bufring != NULL) {
-		contigfree(chan->ch_bufring, chan->ch_bufring_size, M_DEVBUF);
+		free(chan->ch_bufring, M_DEVBUF);
 		chan->ch_bufring = NULL;
 	}
 	return (error);
 }
 
 int
 vmbus_chan_close_direct(struct vmbus_channel *chan)
 {
 	int error;
 
 #ifdef INVARIANTS
 	if (VMBUS_CHAN_ISPRIMARY(chan)) {
 		struct vmbus_channel *subchan;
 
 		/*
 		 * All sub-channels _must_ have been closed, or are _not_
 		 * opened at all.
 		 */
 		mtx_lock(&chan->ch_subchan_lock);
 		TAILQ_FOREACH(subchan, &chan->ch_subchans, ch_sublink) {
 			KASSERT(
 			   (subchan->ch_stflags & VMBUS_CHAN_ST_OPENED) == 0,
 			   ("chan%u: subchan%u is still opened",
 			    chan->ch_id, subchan->ch_subidx));
 		}
 		mtx_unlock(&chan->ch_subchan_lock);
 	}
 #endif
 
 	error = vmbus_chan_close_internal(chan);
 	if (!VMBUS_CHAN_ISPRIMARY(chan)) {
 		/*
 		 * This sub-channel is referenced, when it is linked to
 		 * the primary channel; drop that reference now.
 		 */
 		vmbus_chan_detach(chan);
 	}
 	return (error);
 }
 
 /*
  * Caller should make sure that all sub-channels have
  * been added to 'chan' and all to-be-closed channels
  * are not being opened.
  */
 void
 vmbus_chan_close(struct vmbus_channel *chan)
 {
 	int subchan_cnt;
 
 	if (!VMBUS_CHAN_ISPRIMARY(chan)) {
 		/*
 		 * Sub-channel is closed when its primary channel
 		 * is closed; done.
 		 */
 		return;
 	}
 
 	/*
 	 * Close all sub-channels, if any.
 	 */
 	subchan_cnt = chan->ch_subchan_cnt;
 	if (subchan_cnt > 0) {
 		struct vmbus_channel **subchan;
 		int i;
 
 		subchan = vmbus_subchan_get(chan, subchan_cnt);
 		for (i = 0; i < subchan_cnt; ++i) {
 			vmbus_chan_close_internal(subchan[i]);
 			/*
 			 * This sub-channel is referenced, when it is
 			 * linked to the primary channel; drop that
 			 * reference now.
 			 */
 			vmbus_chan_detach(subchan[i]);
 		}
 		vmbus_subchan_rel(subchan, subchan_cnt);
 	}
 
 	/* Then close the primary channel. */
 	vmbus_chan_close_internal(chan);
 }
 
 void
 vmbus_chan_intr_drain(struct vmbus_channel *chan)
 {
 
 	taskqueue_drain(chan->ch_tq, &chan->ch_task);
 }
 
 uint32_t
 vmbus_chan_write_available(struct vmbus_channel *chan)
 {
 	return (vmbus_txbr_available(&chan->ch_txbr));
 }
 
 bool
 vmbus_chan_write_signal(struct vmbus_channel *chan,
     int32_t min_signal_size)
 {
 	if (min_signal_size >= 0 &&
 	    vmbus_chan_write_available(chan) > min_signal_size) {
 		return false;
 	}
 
 	if (!vmbus_txbr_get_imask(&chan->ch_txbr)) {
 		/* txbr imask is not set, signal the reader */
 		vmbus_chan_signal_tx(chan);
 		return true;
 	}
 
 	return false;
 }
 
 void
 vmbus_chan_set_pending_send_size(struct vmbus_channel *chan,
     uint32_t size)
 {
 	if (chan)
 		vmbus_txbr_set_pending_snd_sz(&chan->ch_txbr, size);
 }
 
 int
 vmbus_chan_iov_send(struct vmbus_channel *chan,
     const struct iovec iov[], int iovlen,
     vmbus_br_copy_callback_t cb, void *cbarg)
 {
 	int error;
 	boolean_t send_evt;
 
 	if (iovlen == 0)
 		return (0);
 
 	error = vmbus_txbr_write_call(&chan->ch_txbr, iov, iovlen,
 	    cb, cbarg, &send_evt);
 
 	if (!error && send_evt) {
 		vmbus_chan_signal_tx(chan);
 	}
 
 	return error;
 }
 
 int
 vmbus_chan_send(struct vmbus_channel *chan, uint16_t type, uint16_t flags,
     void *data, int dlen, uint64_t xactid)
 {
 	struct vmbus_chanpkt pkt;
 	int pktlen, pad_pktlen, hlen, error;
 	uint64_t pad = 0;
 	struct iovec iov[3];
 	boolean_t send_evt;
 
 	hlen = sizeof(pkt);
 	pktlen = hlen + dlen;
 	pad_pktlen = VMBUS_CHANPKT_TOTLEN(pktlen);
 	KASSERT(pad_pktlen <= vmbus_txbr_maxpktsz(&chan->ch_txbr),
 	    ("invalid packet size %d", pad_pktlen));
 
 	pkt.cp_hdr.cph_type = type;
 	pkt.cp_hdr.cph_flags = flags;
 	VMBUS_CHANPKT_SETLEN(pkt.cp_hdr.cph_hlen, hlen);
 	VMBUS_CHANPKT_SETLEN(pkt.cp_hdr.cph_tlen, pad_pktlen);
 	pkt.cp_hdr.cph_xactid = xactid;
 
 	iov[0].iov_base = &pkt;
 	iov[0].iov_len = hlen;
 	iov[1].iov_base = data;
 	iov[1].iov_len = dlen;
 	iov[2].iov_base = &pad;
 	iov[2].iov_len = pad_pktlen - pktlen;
 
 	error = vmbus_txbr_write(&chan->ch_txbr, iov, 3, &send_evt);
 	if (!error && send_evt)
 		vmbus_chan_signal_tx(chan);
 	return error;
 }
 
 int
 vmbus_chan_send_sglist(struct vmbus_channel *chan,
     struct vmbus_gpa sg[], int sglen, void *data, int dlen, uint64_t xactid)
 {
 	struct vmbus_chanpkt_sglist pkt;
 	int pktlen, pad_pktlen, hlen, error;
 	struct iovec iov[4];
 	boolean_t send_evt;
 	uint64_t pad = 0;
 
 	hlen = __offsetof(struct vmbus_chanpkt_sglist, cp_gpa[sglen]);
 	pktlen = hlen + dlen;
 	pad_pktlen = VMBUS_CHANPKT_TOTLEN(pktlen);
 	KASSERT(pad_pktlen <= vmbus_txbr_maxpktsz(&chan->ch_txbr),
 	    ("invalid packet size %d", pad_pktlen));
 
 	pkt.cp_hdr.cph_type = VMBUS_CHANPKT_TYPE_GPA;
 	pkt.cp_hdr.cph_flags = VMBUS_CHANPKT_FLAG_RC;
 	VMBUS_CHANPKT_SETLEN(pkt.cp_hdr.cph_hlen, hlen);
 	VMBUS_CHANPKT_SETLEN(pkt.cp_hdr.cph_tlen, pad_pktlen);
 	pkt.cp_hdr.cph_xactid = xactid;
 	pkt.cp_rsvd = 0;
 	pkt.cp_gpa_cnt = sglen;
 
 	iov[0].iov_base = &pkt;
 	iov[0].iov_len = sizeof(pkt);
 	iov[1].iov_base = sg;
 	iov[1].iov_len = sizeof(struct vmbus_gpa) * sglen;
 	iov[2].iov_base = data;
 	iov[2].iov_len = dlen;
 	iov[3].iov_base = &pad;
 	iov[3].iov_len = pad_pktlen - pktlen;
 
 	error = vmbus_txbr_write(&chan->ch_txbr, iov, 4, &send_evt);
 	if (!error && send_evt)
 		vmbus_chan_signal_tx(chan);
 	return error;
 }
 
 int
 vmbus_chan_send_prplist(struct vmbus_channel *chan,
     struct vmbus_gpa_range *prp, int prp_cnt, void *data, int dlen,
     uint64_t xactid)
 {
 	struct vmbus_chanpkt_prplist pkt;
 	int pktlen, pad_pktlen, hlen, error;
 	struct iovec iov[4];
 	boolean_t send_evt;
 	uint64_t pad = 0;
 
 	hlen = __offsetof(struct vmbus_chanpkt_prplist,
 	    cp_range[0].gpa_page[prp_cnt]);
 	pktlen = hlen + dlen;
 	pad_pktlen = VMBUS_CHANPKT_TOTLEN(pktlen);
 	KASSERT(pad_pktlen <= vmbus_txbr_maxpktsz(&chan->ch_txbr),
 	    ("invalid packet size %d", pad_pktlen));
 
 	pkt.cp_hdr.cph_type = VMBUS_CHANPKT_TYPE_GPA;
 	pkt.cp_hdr.cph_flags = VMBUS_CHANPKT_FLAG_RC;
 	VMBUS_CHANPKT_SETLEN(pkt.cp_hdr.cph_hlen, hlen);
 	VMBUS_CHANPKT_SETLEN(pkt.cp_hdr.cph_tlen, pad_pktlen);
 	pkt.cp_hdr.cph_xactid = xactid;
 	pkt.cp_rsvd = 0;
 	pkt.cp_range_cnt = 1;
 
 	iov[0].iov_base = &pkt;
 	iov[0].iov_len = sizeof(pkt);
 	iov[1].iov_base = prp;
 	iov[1].iov_len = __offsetof(struct vmbus_gpa_range, gpa_page[prp_cnt]);
 	iov[2].iov_base = data;
 	iov[2].iov_len = dlen;
 	iov[3].iov_base = &pad;
 	iov[3].iov_len = pad_pktlen - pktlen;
 
 	error = vmbus_txbr_write(&chan->ch_txbr, iov, 4, &send_evt);
 	if (!error && send_evt)
 		vmbus_chan_signal_tx(chan);
 	return error;
 }
 
 int
 vmbus_chan_recv(struct vmbus_channel *chan, void *data, int *dlen0,
     uint64_t *xactid)
 {
 	struct vmbus_chanpkt_hdr pkt;
 	int error, dlen, hlen;
 	boolean_t sig_event;
 
 	error = vmbus_rxbr_peek(&chan->ch_rxbr, &pkt, sizeof(pkt));
 	if (error)
 		return (error);
 
 	if (__predict_false(pkt.cph_hlen < VMBUS_CHANPKT_HLEN_MIN)) {
 		vmbus_chan_printf(chan, "invalid hlen %u\n", pkt.cph_hlen);
 		/* XXX this channel is dead actually. */
 		return (EIO);
 	}
 	if (__predict_false(pkt.cph_hlen > pkt.cph_tlen)) {
 		vmbus_chan_printf(chan, "invalid hlen %u and tlen %u\n",
 		    pkt.cph_hlen, pkt.cph_tlen);
 		/* XXX this channel is dead actually. */
 		return (EIO);
 	}
 
 	hlen = VMBUS_CHANPKT_GETLEN(pkt.cph_hlen);
 	dlen = VMBUS_CHANPKT_GETLEN(pkt.cph_tlen) - hlen;
 
 	if (*dlen0 < dlen) {
 		/* Return the size of this packet's data. */
 		*dlen0 = dlen;
 		return (ENOBUFS);
 	}
 
 	*xactid = pkt.cph_xactid;
 	*dlen0 = dlen;
 
 	/* Skip packet header */
 	error = vmbus_rxbr_read(&chan->ch_rxbr, data, dlen, hlen, &sig_event);
 	KASSERT(!error, ("vmbus_rxbr_read failed"));
 
 	if (!error && sig_event)
 		vmbus_chan_signal_rx(chan);
 
 	return (0);
 }
 
 int
 vmbus_chan_recv_pkt(struct vmbus_channel *chan,
     struct vmbus_chanpkt_hdr *pkt, int *pktlen0)
 {
 	int error, pktlen, pkt_hlen;
 	boolean_t sig_event;
 
 	pkt_hlen = sizeof(*pkt);
 	error = vmbus_rxbr_peek(&chan->ch_rxbr, pkt, pkt_hlen);
 	if (error)
 		return (error);
 
 	if (__predict_false(pkt->cph_hlen < VMBUS_CHANPKT_HLEN_MIN)) {
 		vmbus_chan_printf(chan, "invalid hlen %u\n", pkt->cph_hlen);
 		/* XXX this channel is dead actually. */
 		return (EIO);
 	}
 	if (__predict_false(pkt->cph_hlen > pkt->cph_tlen)) {
 		vmbus_chan_printf(chan, "invalid hlen %u and tlen %u\n",
 		    pkt->cph_hlen, pkt->cph_tlen);
 		/* XXX this channel is dead actually. */
 		return (EIO);
 	}
 
 	pktlen = VMBUS_CHANPKT_GETLEN(pkt->cph_tlen);
 	if (*pktlen0 < pktlen) {
 		/* Return the size of this packet. */
 		*pktlen0 = pktlen;
 		return (ENOBUFS);
 	}
 	*pktlen0 = pktlen;
 
 	/*
 	 * Skip the fixed-size packet header, which has been filled
 	 * by the above vmbus_rxbr_peek().
 	 */
 	error = vmbus_rxbr_read(&chan->ch_rxbr, pkt + 1,
 	    pktlen - pkt_hlen, pkt_hlen, &sig_event);
 	KASSERT(!error, ("vmbus_rxbr_read failed"));
 
 	if (!error && sig_event)
 		vmbus_chan_signal_rx(chan);
 
 	return (0);
 }
 
 uint32_t
 vmbus_chan_read_available(struct vmbus_channel *chan)
 {
 	return (vmbus_rxbr_available(&chan->ch_rxbr));
 }
 
 /*
  * This routine does:
  *     - Advance the channel read index for 'advance' bytes
  *     - Copy data_len bytes in to the buffer pointed by 'data'
  * Return 0 if operation succeed. EAGAIN if operations if failed.
  * If failed, the buffer pointed by 'data' is intact, and the
  * channel read index is not advanced at all.
  */
 int
 vmbus_chan_recv_peek(struct vmbus_channel *chan,
     void *data, int data_len, uint32_t advance)
 {
 	int error;
 	boolean_t sig_event;
 
 	if (data == NULL || data_len <= 0)
 		return (EINVAL);
 
 	error = vmbus_rxbr_idxadv_peek(&chan->ch_rxbr,
 	    data, data_len, advance, &sig_event);
 
 	if (!error && sig_event) {
 		vmbus_chan_signal_rx(chan);
 	}
 
 	return (error);
 }
 
 /*
  * This routine does:
  *     - Advance the channel read index for 'advance' bytes
  */
 int
 vmbus_chan_recv_idxadv(struct vmbus_channel *chan, uint32_t advance)
 {
 	int error;
 	boolean_t sig_event;
 
 	if (advance == 0)
 		return (EINVAL);
 
 	error = vmbus_rxbr_idxadv(&chan->ch_rxbr, advance, &sig_event);
 
 	if (!error && sig_event) {
 		vmbus_chan_signal_rx(chan);
 	}
 
 	return (error);
 }
 
 
 /*
  * Caller should hold its own lock to serialize the ring buffer
  * copy.
  */
 int
 vmbus_chan_recv_peek_call(struct vmbus_channel *chan, int data_len,
     uint32_t skip, vmbus_br_copy_callback_t cb, void *cbarg)
 {
 	if (!chan || data_len <= 0 || cb == NULL)
 		return (EINVAL);
 
 	return (vmbus_rxbr_peek_call(&chan->ch_rxbr, data_len, skip,
 	    cb, cbarg));
 }
 
 static void
 vmbus_chan_task(void *xchan, int pending __unused)
 {
 	struct vmbus_channel *chan = xchan;
 	vmbus_chan_callback_t cb = chan->ch_cb;
 	void *cbarg = chan->ch_cbarg;
 
 	KASSERT(chan->ch_poll_intvl == 0,
 	    ("chan%u: interrupted in polling mode", chan->ch_id));
 
 	/*
 	 * Optimize host to guest signaling by ensuring:
 	 * 1. While reading the channel, we disable interrupts from
 	 *    host.
 	 * 2. Ensure that we process all posted messages from the host
 	 *    before returning from this callback.
 	 * 3. Once we return, enable signaling from the host. Once this
 	 *    state is set we check to see if additional packets are
 	 *    available to read. In this case we repeat the process.
 	 *
 	 * NOTE: Interrupt has been disabled in the ISR.
 	 */
 	for (;;) {
 		uint32_t left;
 
 		cb(chan, cbarg);
 
 		left = vmbus_rxbr_intr_unmask(&chan->ch_rxbr);
 		if (left == 0) {
 			/* No more data in RX bufring; done */
 			break;
 		}
 		vmbus_rxbr_intr_mask(&chan->ch_rxbr);
 	}
 }
 
 static void
 vmbus_chan_task_nobatch(void *xchan, int pending __unused)
 {
 	struct vmbus_channel *chan = xchan;
 
 	KASSERT(chan->ch_poll_intvl == 0,
 	    ("chan%u: interrupted in polling mode", chan->ch_id));
 	chan->ch_cb(chan, chan->ch_cbarg);
 }
 
 static void
 vmbus_chan_poll_timeout(void *xchan)
 {
 	struct vmbus_channel *chan = xchan;
 
 	KASSERT(chan->ch_poll_intvl != 0,
 	    ("chan%u: polling timeout in interrupt mode", chan->ch_id));
 	taskqueue_enqueue(chan->ch_tq, &chan->ch_poll_task);
 }
 
 static void
 vmbus_chan_poll_task(void *xchan, int pending __unused)
 {
 	struct vmbus_channel *chan = xchan;
 
 	KASSERT(chan->ch_poll_intvl != 0,
 	    ("chan%u: polling in interrupt mode", chan->ch_id));
 	callout_reset_sbt_curcpu(&chan->ch_poll_timeo, chan->ch_poll_intvl, 0,
 	    vmbus_chan_poll_timeout, chan, chan->ch_poll_flags);
 	chan->ch_cb(chan, chan->ch_cbarg);
 }
 
 static void
 vmbus_chan_pollcfg_task(void *xarg, int pending __unused)
 {
 	const struct vmbus_chan_pollarg *arg = xarg;
 	struct vmbus_channel *chan = arg->poll_chan;
 	sbintime_t intvl;
 	int poll_flags;
 
 	/*
 	 * Save polling interval.
 	 */
 	intvl = SBT_1S / arg->poll_hz;
 	if (intvl == 0)
 		intvl = 1;
 	if (intvl == chan->ch_poll_intvl) {
 		/* Nothing changes; done */
 		return;
 	}
 	chan->ch_poll_intvl = intvl;
 
 	/* Adjust callout flags. */
 	poll_flags = C_DIRECT_EXEC;
 	if (arg->poll_hz <= hz)
 		poll_flags |= C_HARDCLOCK;
 	chan->ch_poll_flags = poll_flags;
 
 	/*
 	 * Disconnect this channel from the channel map to make sure that
 	 * the RX bufring interrupt enabling bit can not be touched, and
 	 * ISR can not enqueue this channel task anymore.  THEN, disable
 	 * interrupt from the RX bufring (TX bufring does not generate
 	 * interrupt to VM).
 	 *
 	 * NOTE: order is critical.
 	 */
 	chan->ch_vmbus->vmbus_chmap[chan->ch_id] = NULL;
 	__compiler_membar();
 	vmbus_rxbr_intr_mask(&chan->ch_rxbr);
 
 	/*
 	 * NOTE:
 	 * At this point, this channel task will not be enqueued by
 	 * the ISR anymore, time to cancel the pending one.
 	 */
 	taskqueue_cancel(chan->ch_tq, &chan->ch_task, NULL);
 
 	/* Kick start! */
 	taskqueue_enqueue(chan->ch_tq, &chan->ch_poll_task);
 }
 
 static bool
 vmbus_chan_poll_cancel_intq(struct vmbus_channel *chan)
 {
 
 	if (chan->ch_poll_intvl == 0) {
 		/* Not enabled. */
 		return (false);
 	}
 
 	/*
 	 * Stop polling callout, so that channel polling task
 	 * will not be enqueued anymore.
 	 */
 	callout_drain(&chan->ch_poll_timeo);
 
 	/*
 	 * Disable polling by resetting polling interval.
 	 *
 	 * NOTE:
 	 * The polling interval resetting MUST be conducted
 	 * after the callout is drained; mainly to keep the
 	 * proper assertion in place.
 	 */
 	chan->ch_poll_intvl = 0;
 
 	/*
 	 * NOTE:
 	 * At this point, this channel polling task will not be
 	 * enqueued by the callout anymore, time to cancel the
 	 * pending one.
 	 */
 	taskqueue_cancel(chan->ch_tq, &chan->ch_poll_task, NULL);
 
 	/* Polling was enabled. */
 	return (true);
 }
 
 static void
 vmbus_chan_polldis_task(void *xchan, int pending __unused)
 {
 	struct vmbus_channel *chan = xchan;
 
 	if (!vmbus_chan_poll_cancel_intq(chan)) {
 		/* Already disabled; done. */
 		return;
 	}
 
 	/*
 	 * Plug this channel back to the channel map and unmask
 	 * the RX bufring interrupt.
 	 */
 	chan->ch_vmbus->vmbus_chmap[chan->ch_id] = chan;
 	__compiler_membar();
 	vmbus_rxbr_intr_unmask(&chan->ch_rxbr);
 
 	/*
 	 * Kick start the interrupt task, just in case unmasking
 	 * interrupt races ISR.
 	 */
 	taskqueue_enqueue(chan->ch_tq, &chan->ch_task);
 }
 
 static __inline void
 vmbus_event_flags_proc(struct vmbus_softc *sc, volatile u_long *event_flags,
     int flag_cnt)
 {
 	int f;
 
 	for (f = 0; f < flag_cnt; ++f) {
 		uint32_t chid_base;
 		u_long flags;
 		int chid_ofs;
 
 		if (event_flags[f] == 0)
 			continue;
 
 		flags = atomic_swap_long(&event_flags[f], 0);
 		chid_base = f << VMBUS_EVTFLAG_SHIFT;
 
 		while ((chid_ofs = ffsl(flags)) != 0) {
 			struct vmbus_channel *chan;
 
 			--chid_ofs; /* NOTE: ffsl is 1-based */
 			flags &= ~(1UL << chid_ofs);
 
 			chan = sc->vmbus_chmap[chid_base + chid_ofs];
 			if (__predict_false(chan == NULL)) {
 				/* Channel is closed. */
 				continue;
 			}
 			__compiler_membar();
 
 			if (chan->ch_flags & VMBUS_CHAN_FLAG_BATCHREAD)
 				vmbus_rxbr_intr_mask(&chan->ch_rxbr);
 			taskqueue_enqueue(chan->ch_tq, &chan->ch_task);
 		}
 	}
 }
 
 void
 vmbus_event_proc(struct vmbus_softc *sc, int cpu)
 {
 	struct vmbus_evtflags *eventf;
 
 	/*
 	 * On Host with Win8 or above, the event page can be checked directly
 	 * to get the id of the channel that has the pending interrupt.
 	 */
 	eventf = VMBUS_PCPU_GET(sc, event_flags, cpu) + VMBUS_SINT_MESSAGE;
 	vmbus_event_flags_proc(sc, eventf->evt_flags,
 	    VMBUS_PCPU_GET(sc, event_flags_cnt, cpu));
 }
 
 void
 vmbus_event_proc_compat(struct vmbus_softc *sc, int cpu)
 {
 	struct vmbus_evtflags *eventf;
 
 	eventf = VMBUS_PCPU_GET(sc, event_flags, cpu) + VMBUS_SINT_MESSAGE;
 	if (atomic_testandclear_long(&eventf->evt_flags[0], 0)) {
 		vmbus_event_flags_proc(sc, sc->vmbus_rx_evtflags,
 		    VMBUS_CHAN_MAX_COMPAT >> VMBUS_EVTFLAG_SHIFT);
 	}
 }
 
 static void
 vmbus_chan_update_evtflagcnt(struct vmbus_softc *sc,
     const struct vmbus_channel *chan)
 {
 	volatile int *flag_cnt_ptr;
 	int flag_cnt;
 
 	flag_cnt = (chan->ch_id / VMBUS_EVTFLAG_LEN) + 1;
 	flag_cnt_ptr = VMBUS_PCPU_PTR(sc, event_flags_cnt, chan->ch_cpuid);
 
 	for (;;) {
 		int old_flag_cnt;
 
 		old_flag_cnt = *flag_cnt_ptr;
 		if (old_flag_cnt >= flag_cnt)
 			break;
 		if (atomic_cmpset_int(flag_cnt_ptr, old_flag_cnt, flag_cnt)) {
 			if (bootverbose) {
 				vmbus_chan_printf(chan,
 				    "chan%u update cpu%d flag_cnt to %d\n",
 				    chan->ch_id, chan->ch_cpuid, flag_cnt);
 			}
 			break;
 		}
 	}
 }
 
 static struct vmbus_channel *
 vmbus_chan_alloc(struct vmbus_softc *sc)
 {
 	struct vmbus_channel *chan;
 
 	chan = malloc(sizeof(*chan), M_DEVBUF, M_WAITOK | M_ZERO);
 
 	chan->ch_monprm = contigmalloc(sizeof(struct hyperv_mon_param),
 	    M_DEVBUF, M_WAITOK | M_ZERO, 0ul, ~0ul, HYPERCALL_PARAM_ALIGN, 0);
 	if (chan->ch_monprm == NULL) {
 		device_printf(sc->vmbus_dev, "monprm alloc failed\n");
 		free(chan, M_DEVBUF);
 		return NULL;
 	}
 
 	chan->ch_refs = 1;
 	chan->ch_vmbus = sc;
 	mtx_init(&chan->ch_subchan_lock, "vmbus subchan", NULL, MTX_DEF);
 	sx_init(&chan->ch_orphan_lock, "vmbus chorphan");
 	TAILQ_INIT(&chan->ch_subchans);
 	vmbus_rxbr_init(&chan->ch_rxbr);
 	vmbus_txbr_init(&chan->ch_txbr);
 
 	TASK_INIT(&chan->ch_poll_task, 0, vmbus_chan_poll_task, chan);
 	callout_init(&chan->ch_poll_timeo, 1);
 
 	return chan;
 }
 
 static void
 vmbus_chan_free(struct vmbus_channel *chan)
 {
 
 	KASSERT(TAILQ_EMPTY(&chan->ch_subchans) && chan->ch_subchan_cnt == 0,
 	    ("still owns sub-channels"));
 	KASSERT((chan->ch_stflags &
 	    (VMBUS_CHAN_ST_OPENED |
 	     VMBUS_CHAN_ST_ONPRIL |
 	     VMBUS_CHAN_ST_ONSUBL |
 	     VMBUS_CHAN_ST_ONLIST)) == 0, ("free busy channel"));
 	KASSERT(chan->ch_orphan_xact == NULL,
 	    ("still has orphan xact installed"));
 	KASSERT(chan->ch_refs == 0, ("chan%u: invalid refcnt %d",
 	    chan->ch_id, chan->ch_refs));
 	KASSERT(chan->ch_poll_intvl == 0, ("chan%u: polling is activated",
 	    chan->ch_id));
 
-	contigfree(chan->ch_monprm, sizeof(struct hyperv_mon_param), M_DEVBUF);
+	free(chan->ch_monprm, M_DEVBUF);
 	mtx_destroy(&chan->ch_subchan_lock);
 	sx_destroy(&chan->ch_orphan_lock);
 	vmbus_rxbr_deinit(&chan->ch_rxbr);
 	vmbus_txbr_deinit(&chan->ch_txbr);
 	free(chan, M_DEVBUF);
 }
 
 static int
 vmbus_chan_add(struct vmbus_channel *newchan)
 {
 	struct vmbus_softc *sc = newchan->ch_vmbus;
 	struct vmbus_channel *prichan;
 
 	if (newchan->ch_id == 0) {
 		/*
 		 * XXX
 		 * Chan0 will neither be processed nor should be offered;
 		 * skip it.
 		 */
 		device_printf(sc->vmbus_dev, "got chan0 offer, discard\n");
 		return EINVAL;
 	} else if (newchan->ch_id >= VMBUS_CHAN_MAX) {
 		device_printf(sc->vmbus_dev, "invalid chan%u offer\n",
 		    newchan->ch_id);
 		return EINVAL;
 	}
 
 	mtx_lock(&sc->vmbus_prichan_lock);
 	TAILQ_FOREACH(prichan, &sc->vmbus_prichans, ch_prilink) {
 		/*
 		 * Sub-channel will have the same type GUID and instance
 		 * GUID as its primary channel.
 		 */
 		if (memcmp(&prichan->ch_guid_type, &newchan->ch_guid_type,
 		    sizeof(struct hyperv_guid)) == 0 &&
 		    memcmp(&prichan->ch_guid_inst, &newchan->ch_guid_inst,
 		    sizeof(struct hyperv_guid)) == 0)
 			break;
 	}
 	if (VMBUS_CHAN_ISPRIMARY(newchan)) {
 		if (prichan == NULL) {
 			/* Install the new primary channel */
 			vmbus_chan_ins_prilist(sc, newchan);
 			mtx_unlock(&sc->vmbus_prichan_lock);
 			goto done;
 		} else {
 			mtx_unlock(&sc->vmbus_prichan_lock);
 			device_printf(sc->vmbus_dev,
 			    "duplicated primary chan%u\n", newchan->ch_id);
 			return EINVAL;
 		}
 	} else { /* Sub-channel */
 		if (prichan == NULL) {
 			mtx_unlock(&sc->vmbus_prichan_lock);
 			device_printf(sc->vmbus_dev,
 			    "no primary chan for chan%u\n", newchan->ch_id);
 			return EINVAL;
 		}
 		/*
 		 * Found the primary channel for this sub-channel and
 		 * move on.
 		 *
 		 * XXX refcnt prichan
 		 */
 	}
 	mtx_unlock(&sc->vmbus_prichan_lock);
 
 	/*
 	 * This is a sub-channel; link it with the primary channel.
 	 */
 	KASSERT(!VMBUS_CHAN_ISPRIMARY(newchan),
 	    ("new channel is not sub-channel"));
 	KASSERT(prichan != NULL, ("no primary channel"));
 
 	/*
 	 * Reference count this sub-channel; it will be dereferenced
 	 * when this sub-channel is closed.
 	 */
 	KASSERT(newchan->ch_refs == 1, ("chan%u: invalid refcnt %d",
 	    newchan->ch_id, newchan->ch_refs));
 	atomic_add_int(&newchan->ch_refs, 1);
 
 	newchan->ch_prichan = prichan;
 	newchan->ch_dev = prichan->ch_dev;
 
 	mtx_lock(&prichan->ch_subchan_lock);
 	vmbus_chan_ins_sublist(prichan, newchan);
 	mtx_unlock(&prichan->ch_subchan_lock);
 	/*
 	 * Notify anyone that is interested in this sub-channel,
 	 * after this sub-channel is setup.
 	 */
 	wakeup(prichan);
 done:
 	/*
 	 * Hook this channel up for later revocation.
 	 */
 	mtx_lock(&sc->vmbus_chan_lock);
 	vmbus_chan_ins_list(sc, newchan);
 	mtx_unlock(&sc->vmbus_chan_lock);
 
 	if (bootverbose) {
 		vmbus_chan_printf(newchan, "chan%u subidx%u offer\n",
 		    newchan->ch_id, newchan->ch_subidx);
 	}
 
 	/* Select default cpu for this channel. */
 	vmbus_chan_cpu_default(newchan);
 
 	return 0;
 }
 
 void
 vmbus_chan_cpu_set(struct vmbus_channel *chan, int cpu)
 {
 	KASSERT(cpu >= 0 && cpu < mp_ncpus, ("invalid cpu %d", cpu));
 
 	if (chan->ch_vmbus->vmbus_version == VMBUS_VERSION_WS2008 ||
 	    chan->ch_vmbus->vmbus_version == VMBUS_VERSION_WIN7) {
 		/* Only cpu0 is supported */
 		cpu = 0;
 	}
 
 	chan->ch_cpuid = cpu;
 	chan->ch_vcpuid = VMBUS_PCPU_GET(chan->ch_vmbus, vcpuid, cpu);
 
 	if (bootverbose) {
 		vmbus_chan_printf(chan,
 		    "chan%u assigned to cpu%u [vcpu%u]\n",
 		    chan->ch_id, chan->ch_cpuid, chan->ch_vcpuid);
 	}
 }
 
 void
 vmbus_chan_cpu_rr(struct vmbus_channel *chan)
 {
 	static uint32_t vmbus_chan_nextcpu;
 	int cpu;
 
 	cpu = atomic_fetchadd_int(&vmbus_chan_nextcpu, 1) % mp_ncpus;
 	vmbus_chan_cpu_set(chan, cpu);
 }
 
 static void
 vmbus_chan_cpu_default(struct vmbus_channel *chan)
 {
 	/*
 	 * By default, pin the channel to cpu0.  Devices having
 	 * special channel-cpu mapping requirement should call
 	 * vmbus_chan_cpu_{set,rr}().
 	 */
 	vmbus_chan_cpu_set(chan, 0);
 }
 
 static void
 vmbus_chan_msgproc_choffer(struct vmbus_softc *sc,
     const struct vmbus_message *msg)
 {
 	const struct vmbus_chanmsg_choffer *offer;
 	struct vmbus_channel *chan;
 	task_fn_t *detach_fn, *attach_fn;
 	int error;
 
 	offer = (const struct vmbus_chanmsg_choffer *)msg->msg_data;
 
 	chan = vmbus_chan_alloc(sc);
 	if (chan == NULL) {
 		device_printf(sc->vmbus_dev, "allocate chan%u failed\n",
 		    offer->chm_chanid);
 		return;
 	}
 
 	chan->ch_id = offer->chm_chanid;
 	chan->ch_subidx = offer->chm_subidx;
 	chan->ch_guid_type = offer->chm_chtype;
 	chan->ch_guid_inst = offer->chm_chinst;
 
 	/* Batch reading is on by default */
 	chan->ch_flags |= VMBUS_CHAN_FLAG_BATCHREAD;
 
 	chan->ch_monprm->mp_connid = VMBUS_CONNID_EVENT;
 	if (sc->vmbus_version != VMBUS_VERSION_WS2008)
 		chan->ch_monprm->mp_connid = offer->chm_connid;
 
 	if (offer->chm_flags1 & VMBUS_CHOFFER_FLAG1_HASMNF) {
 		int trig_idx;
 
 		/*
 		 * Setup MNF stuffs.
 		 */
 		chan->ch_txflags |= VMBUS_CHAN_TXF_HASMNF;
 
 		trig_idx = offer->chm_montrig / VMBUS_MONTRIG_LEN;
 		if (trig_idx >= VMBUS_MONTRIGS_MAX)
 			panic("invalid monitor trigger %u", offer->chm_montrig);
 		chan->ch_montrig =
 		    &sc->vmbus_mnf2->mnf_trigs[trig_idx].mt_pending;
 
 		chan->ch_montrig_mask =
 		    1 << (offer->chm_montrig % VMBUS_MONTRIG_LEN);
 	}
 
 	if (offer->chm_chflags & VMBUS_CHAN_TLNPI_PROVIDER_OFFER) {
 		/* This is HyperV socket channel */
 		chan->ch_is_hvs = true;
 		/* The first byte != 0 means the host initiated connection. */
 		chan->ch_hvs_conn_from_host =
 		    offer->chm_udata.pipe.user_def[0];
 
 		if (bootverbose) {
 			device_printf(sc->vmbus_dev,
 			    "chan%u is hyperv socket channel "
 			    "connected %s host\n",
 			    chan->ch_id,
 			    (chan->ch_hvs_conn_from_host != 0) ?
 			    "from" : "to");
 		}
 	} else {
 		chan->ch_is_hvs = false;
 	}
 
 	/*
 	 * Setup event flag.
 	 */
 	chan->ch_evtflag =
 	    &sc->vmbus_tx_evtflags[chan->ch_id >> VMBUS_EVTFLAG_SHIFT];
 	chan->ch_evtflag_mask = 1UL << (chan->ch_id & VMBUS_EVTFLAG_MASK);
 
 	/*
 	 * Setup attach and detach tasks.
 	 */
 	if (VMBUS_CHAN_ISPRIMARY(chan)) {
 		chan->ch_mgmt_tq = sc->vmbus_devtq;
 		attach_fn = vmbus_prichan_attach_task;
 		detach_fn = vmbus_prichan_detach_task;
 	} else {
 		chan->ch_mgmt_tq = sc->vmbus_subchtq;
 		attach_fn = vmbus_subchan_attach_task;
 		detach_fn = vmbus_subchan_detach_task;
 	}
 	TASK_INIT(&chan->ch_attach_task, 0, attach_fn, chan);
 	TASK_INIT(&chan->ch_detach_task, 0, detach_fn, chan);
 
 	error = vmbus_chan_add(chan);
 	if (error) {
 		device_printf(sc->vmbus_dev, "add chan%u failed: %d\n",
 		    chan->ch_id, error);
 		atomic_subtract_int(&chan->ch_refs, 1);
 		vmbus_chan_free(chan);
 		return;
 	}
 	taskqueue_enqueue(chan->ch_mgmt_tq, &chan->ch_attach_task);
 }
 
 static void
 vmbus_chan_msgproc_chrescind(struct vmbus_softc *sc,
     const struct vmbus_message *msg)
 {
 	const struct vmbus_chanmsg_chrescind *note;
 	struct vmbus_channel *chan;
 
 	note = (const struct vmbus_chanmsg_chrescind *)msg->msg_data;
 	if (note->chm_chanid > VMBUS_CHAN_MAX) {
 		device_printf(sc->vmbus_dev, "invalid revoked chan%u\n",
 		    note->chm_chanid);
 		return;
 	}
 
 	/*
 	 * Find and remove the target channel from the channel list.
 	 */
 	mtx_lock(&sc->vmbus_chan_lock);
 	TAILQ_FOREACH(chan, &sc->vmbus_chans, ch_link) {
 		if (chan->ch_id == note->chm_chanid)
 			break;
 	}
 	if (chan == NULL) {
 		mtx_unlock(&sc->vmbus_chan_lock);
 		device_printf(sc->vmbus_dev, "chan%u is not offered\n",
 		    note->chm_chanid);
 		return;
 	}
 	vmbus_chan_rem_list(sc, chan);
 	mtx_unlock(&sc->vmbus_chan_lock);
 
 	if (VMBUS_CHAN_ISPRIMARY(chan)) {
 		/*
 		 * The target channel is a primary channel; remove the
 		 * target channel from the primary channel list now,
 		 * instead of later, so that it will not be found by
 		 * other sub-channel offers, which are processed in
 		 * this thread.
 		 */
 		mtx_lock(&sc->vmbus_prichan_lock);
 		vmbus_chan_rem_prilist(sc, chan);
 		mtx_unlock(&sc->vmbus_prichan_lock);
 	}
 
 	/*
 	 * NOTE:
 	 * The following processing order is critical:
 	 * Set the REVOKED state flag before orphaning the installed xact.
 	 */
 
 	if (atomic_testandset_int(&chan->ch_stflags,
 	    VMBUS_CHAN_ST_REVOKED_SHIFT))
 		panic("channel has already been revoked");
 
 	sx_xlock(&chan->ch_orphan_lock);
 	if (chan->ch_orphan_xact != NULL)
 		vmbus_xact_ctx_orphan(chan->ch_orphan_xact);
 	sx_xunlock(&chan->ch_orphan_lock);
 
 	if (bootverbose)
 		vmbus_chan_printf(chan, "chan%u revoked\n", note->chm_chanid);
 	vmbus_chan_detach(chan);
 }
 
 static int
 vmbus_chan_release(struct vmbus_channel *chan)
 {
 	struct vmbus_softc *sc = chan->ch_vmbus;
 	struct vmbus_chanmsg_chfree *req;
 	struct vmbus_msghc *mh;
 	int error;
 
 	mh = vmbus_msghc_get(sc, sizeof(*req));
 	if (mh == NULL) {
 		vmbus_chan_printf(chan,
 		    "can not get msg hypercall for chfree(chan%u)\n",
 		    chan->ch_id);
 		return (ENXIO);
 	}
 
 	req = vmbus_msghc_dataptr(mh);
 	req->chm_hdr.chm_type = VMBUS_CHANMSG_TYPE_CHFREE;
 	req->chm_chanid = chan->ch_id;
 
 	error = vmbus_msghc_exec_noresult(mh);
 	vmbus_msghc_put(sc, mh);
 
 	if (error) {
 		vmbus_chan_printf(chan,
 		    "chfree(chan%u) msg hypercall exec failed: %d\n",
 		    chan->ch_id, error);
 	} else {
 		if (bootverbose)
 			vmbus_chan_printf(chan, "chan%u freed\n", chan->ch_id);
 	}
 	return (error);
 }
 
 static void
 vmbus_prichan_detach_task(void *xchan, int pending __unused)
 {
 	struct vmbus_channel *chan = xchan;
 
 	KASSERT(VMBUS_CHAN_ISPRIMARY(chan),
 	    ("chan%u is not primary channel", chan->ch_id));
 
 	/* Delete and detach the device associated with this channel. */
 	vmbus_delete_child(chan);
 
 	/* Release this channel (back to vmbus). */
 	vmbus_chan_release(chan);
 
 	/* Free this channel's resource. */
 	vmbus_chan_free(chan);
 }
 
 static void
 vmbus_subchan_detach_task(void *xchan, int pending __unused)
 {
 	struct vmbus_channel *chan = xchan;
 	struct vmbus_channel *pri_chan = chan->ch_prichan;
 
 	KASSERT(!VMBUS_CHAN_ISPRIMARY(chan),
 	    ("chan%u is primary channel", chan->ch_id));
 
 	/* Release this channel (back to vmbus). */
 	vmbus_chan_release(chan);
 
 	/* Unlink from its primary channel's sub-channel list. */
 	mtx_lock(&pri_chan->ch_subchan_lock);
 	vmbus_chan_rem_sublist(pri_chan, chan);
 	mtx_unlock(&pri_chan->ch_subchan_lock);
 	/* Notify anyone that is waiting for this sub-channel to vanish. */
 	wakeup(pri_chan);
 
 	/* Free this channel's resource. */
 	vmbus_chan_free(chan);
 }
 
 static void
 vmbus_prichan_attach_task(void *xchan, int pending __unused)
 {
 
 	/*
 	 * Add device for this primary channel.
 	 */
 	vmbus_add_child(xchan);
 }
 
 static void
 vmbus_subchan_attach_task(void *xchan __unused, int pending __unused)
 {
 
 	/* Nothing */
 }
 
 void
 vmbus_chan_destroy_all(struct vmbus_softc *sc)
 {
 
 	/*
 	 * Detach all devices and destroy the corresponding primary
 	 * channels.
 	 */
 	for (;;) {
 		struct vmbus_channel *chan;
 
 		mtx_lock(&sc->vmbus_chan_lock);
 		TAILQ_FOREACH(chan, &sc->vmbus_chans, ch_link) {
 			if (VMBUS_CHAN_ISPRIMARY(chan))
 				break;
 		}
 		if (chan == NULL) {
 			/* No more primary channels; done. */
 			mtx_unlock(&sc->vmbus_chan_lock);
 			break;
 		}
 		vmbus_chan_rem_list(sc, chan);
 		mtx_unlock(&sc->vmbus_chan_lock);
 
 		mtx_lock(&sc->vmbus_prichan_lock);
 		vmbus_chan_rem_prilist(sc, chan);
 		mtx_unlock(&sc->vmbus_prichan_lock);
 
 		taskqueue_enqueue(chan->ch_mgmt_tq, &chan->ch_detach_task);
 	}
 }
 
 struct vmbus_channel **
 vmbus_subchan_get(struct vmbus_channel *pri_chan, int subchan_cnt)
 {
 	struct vmbus_channel **ret, *chan;
 	int i;
 
 	KASSERT(subchan_cnt > 0, ("invalid sub-channel count %d", subchan_cnt));
 
 	ret = malloc(subchan_cnt * sizeof(struct vmbus_channel *), M_TEMP,
 	    M_WAITOK);
 
 	mtx_lock(&pri_chan->ch_subchan_lock);
 
 	while (pri_chan->ch_subchan_cnt < subchan_cnt)
 		mtx_sleep(pri_chan, &pri_chan->ch_subchan_lock, 0, "subch", 0);
 
 	i = 0;
 	TAILQ_FOREACH(chan, &pri_chan->ch_subchans, ch_sublink) {
 		/* TODO: refcnt chan */
 		ret[i] = chan;
 
 		++i;
 		if (i == subchan_cnt)
 			break;
 	}
 	KASSERT(i == subchan_cnt, ("invalid subchan count %d, should be %d",
 	    pri_chan->ch_subchan_cnt, subchan_cnt));
 
 	mtx_unlock(&pri_chan->ch_subchan_lock);
 
 	return ret;
 }
 
 void
 vmbus_subchan_rel(struct vmbus_channel **subchan, int subchan_cnt __unused)
 {
 
 	free(subchan, M_TEMP);
 }
 
 void
 vmbus_subchan_drain(struct vmbus_channel *pri_chan)
 {
 	mtx_lock(&pri_chan->ch_subchan_lock);
 	while (pri_chan->ch_subchan_cnt > 0)
 		mtx_sleep(pri_chan, &pri_chan->ch_subchan_lock, 0, "dsubch", 0);
 	mtx_unlock(&pri_chan->ch_subchan_lock);
 }
 
 void
 vmbus_chan_msgproc(struct vmbus_softc *sc, const struct vmbus_message *msg)
 {
 	vmbus_chanmsg_proc_t msg_proc;
 	uint32_t msg_type;
 
 	msg_type = ((const struct vmbus_chanmsg_hdr *)msg->msg_data)->chm_type;
 	KASSERT(msg_type < VMBUS_CHANMSG_TYPE_MAX,
 	    ("invalid message type %u", msg_type));
 
 	msg_proc = vmbus_chan_msgprocs[msg_type];
 	if (msg_proc != NULL)
 		msg_proc(sc, msg);
 }
 
 void
 vmbus_chan_set_readbatch(struct vmbus_channel *chan, bool on)
 {
 	if (!on)
 		chan->ch_flags &= ~VMBUS_CHAN_FLAG_BATCHREAD;
 	else
 		chan->ch_flags |= VMBUS_CHAN_FLAG_BATCHREAD;
 }
 
 uint32_t
 vmbus_chan_id(const struct vmbus_channel *chan)
 {
 	return chan->ch_id;
 }
 
 uint32_t
 vmbus_chan_subidx(const struct vmbus_channel *chan)
 {
 	return chan->ch_subidx;
 }
 
 bool
 vmbus_chan_is_primary(const struct vmbus_channel *chan)
 {
 	if (VMBUS_CHAN_ISPRIMARY(chan))
 		return true;
 	else
 		return false;
 }
 
 bool
 vmbus_chan_is_hvs(const struct vmbus_channel *chan)
 {
 	return chan->ch_is_hvs;
 }
 
 bool
 vmbus_chan_is_hvs_conn_from_host(const struct vmbus_channel *chan)
 {
 	KASSERT(vmbus_chan_is_hvs(chan) == true,
 	    ("Not a HyperV Socket channel %u", chan->ch_id));
 	if (chan->ch_hvs_conn_from_host != 0)
 		return true;
 	else
 		return false;
 }
 
 struct hyperv_guid *
 vmbus_chan_guid_type(struct vmbus_channel *chan)
 {
 	return &chan->ch_guid_type;
 }
 
 struct hyperv_guid *
 vmbus_chan_guid_inst(struct vmbus_channel *chan)
 {
 	return &chan->ch_guid_inst;
 }
 
 int
 vmbus_chan_prplist_nelem(int br_size, int prpcnt_max, int dlen_max)
 {
 	int elem_size;
 
 	elem_size = __offsetof(struct vmbus_chanpkt_prplist,
 	    cp_range[0].gpa_page[prpcnt_max]);
 	elem_size += dlen_max;
 	elem_size = VMBUS_CHANPKT_TOTLEN(elem_size);
 
 	return (vmbus_br_nelem(br_size, elem_size));
 }
 
 bool
 vmbus_chan_tx_empty(const struct vmbus_channel *chan)
 {
 
 	return (vmbus_txbr_empty(&chan->ch_txbr));
 }
 
 bool
 vmbus_chan_rx_empty(const struct vmbus_channel *chan)
 {
 
 	return (vmbus_rxbr_empty(&chan->ch_rxbr));
 }
 
 static int
 vmbus_chan_printf(const struct vmbus_channel *chan, const char *fmt, ...)
 {
 	va_list ap;
 	device_t dev;
 	int retval;
 
 	if (chan->ch_dev == NULL || !device_is_alive(chan->ch_dev))
 		dev = chan->ch_vmbus->vmbus_dev;
 	else
 		dev = chan->ch_dev;
 
 	retval = device_print_prettyname(dev);
 	va_start(ap, fmt);
 	retval += vprintf(fmt, ap);
 	va_end(ap);
 
 	return (retval);
 }
 
 void
 vmbus_chan_run_task(struct vmbus_channel *chan, struct task *task)
 {
 
 	taskqueue_enqueue(chan->ch_tq, task);
 	taskqueue_drain(chan->ch_tq, task);
 }
 
 struct taskqueue *
 vmbus_chan_mgmt_tq(const struct vmbus_channel *chan)
 {
 
 	return (chan->ch_mgmt_tq);
 }
 
 bool
 vmbus_chan_is_revoked(const struct vmbus_channel *chan)
 {
 
 	if (chan->ch_stflags & VMBUS_CHAN_ST_REVOKED)
 		return (true);
 	return (false);
 }
 
 void
 vmbus_chan_set_orphan(struct vmbus_channel *chan, struct vmbus_xact_ctx *xact)
 {
 
 	sx_xlock(&chan->ch_orphan_lock);
 	chan->ch_orphan_xact = xact;
 	sx_xunlock(&chan->ch_orphan_lock);
 }
 
 void
 vmbus_chan_unset_orphan(struct vmbus_channel *chan)
 {
 
 	sx_xlock(&chan->ch_orphan_lock);
 	chan->ch_orphan_xact = NULL;
 	sx_xunlock(&chan->ch_orphan_lock);
 }
 
 const void *
 vmbus_chan_xact_wait(const struct vmbus_channel *chan,
     struct vmbus_xact *xact, size_t *resp_len, bool can_sleep)
 {
 	const void *ret;
 
 	if (can_sleep)
 		ret = vmbus_xact_wait(xact, resp_len);
 	else
 		ret = vmbus_xact_busywait(xact, resp_len);
 	if (vmbus_chan_is_revoked(chan)) {
 		/*
 		 * This xact probably is interrupted, and the
 		 * interruption can race the reply reception,
 		 * so we have to make sure that there are nothing
 		 * left on the RX bufring, i.e. this xact will
 		 * not be touched, once this function returns.
 		 *
 		 * Since the hypervisor will not put more data
 		 * onto the RX bufring once the channel is revoked,
 		 * the following loop will be terminated, once all
 		 * data are drained by the driver's channel
 		 * callback.
 		 */
 		while (!vmbus_chan_rx_empty(chan)) {
 			if (can_sleep)
 				pause("chxact", 1);
 			else
 				DELAY(1000);
 		}
 	}
 	return (ret);
 }
 
 void
 vmbus_chan_poll_enable(struct vmbus_channel *chan, u_int pollhz)
 {
 	struct vmbus_chan_pollarg arg;
 	struct task poll_cfg;
 
 	KASSERT(chan->ch_flags & VMBUS_CHAN_FLAG_BATCHREAD,
 	    ("enable polling on non-batch chan%u", chan->ch_id));
 	KASSERT(pollhz >= VMBUS_CHAN_POLLHZ_MIN &&
 	    pollhz <= VMBUS_CHAN_POLLHZ_MAX, ("invalid pollhz %u", pollhz));
 
 	arg.poll_chan = chan;
 	arg.poll_hz = pollhz;
 	TASK_INIT(&poll_cfg, 0, vmbus_chan_pollcfg_task, &arg);
 	vmbus_chan_run_task(chan, &poll_cfg);
 }
 
 void
 vmbus_chan_poll_disable(struct vmbus_channel *chan)
 {
 	struct task poll_dis;
 
 	KASSERT(chan->ch_flags & VMBUS_CHAN_FLAG_BATCHREAD,
 	    ("disable polling on non-batch chan%u", chan->ch_id));
 
 	TASK_INIT(&poll_dis, 0, vmbus_chan_polldis_task, chan);
 	vmbus_chan_run_task(chan, &poll_dis);
 }
diff --git a/sys/dev/hyperv/vmbus/vmbus_chanvar.h b/sys/dev/hyperv/vmbus/vmbus_chanvar.h
index e88ada2dd274..c02ec24c70a1 100644
--- a/sys/dev/hyperv/vmbus/vmbus_chanvar.h
+++ b/sys/dev/hyperv/vmbus/vmbus_chanvar.h
@@ -1,191 +1,190 @@
 /*-
  * Copyright (c) 2016 Microsoft Corp.
  * 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 unmodified, 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.
  */
 
 #ifndef _VMBUS_CHANVAR_H_
 #define _VMBUS_CHANVAR_H_
 
 #include <sys/param.h>
 #include <sys/callout.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/queue.h>
 #include <sys/sysctl.h>
 #include <sys/sx.h>
 #include <sys/taskqueue.h>
 
 #include <dev/hyperv/include/hyperv.h>
 #include <dev/hyperv/include/vmbus.h>
 #include <dev/hyperv/vmbus/vmbus_brvar.h>
 
 struct vmbus_channel {
 	/*
 	 * NOTE:
 	 * Fields before ch_txbr are only accessed on this channel's
 	 * target CPU.
 	 */
 	uint32_t			ch_flags;	/* VMBUS_CHAN_FLAG_ */
 	int				ch_poll_flags;	/* callout flags */
 
 	/*
 	 * RX bufring; immediately following ch_txbr.
 	 */
 	struct vmbus_rxbr		ch_rxbr;
 
 	struct taskqueue		*ch_tq;
 	struct task			ch_task;
 	struct task			ch_poll_task;
 	sbintime_t			ch_poll_intvl;
 	struct callout			ch_poll_timeo;
 	vmbus_chan_callback_t		ch_cb;
 	void				*ch_cbarg;
 
 	/*
 	 * TX bufring; at the beginning of ch_bufring.
 	 *
 	 * NOTE:
 	 * Put TX bufring and the following MNF/evtflag to a new
 	 * cacheline, since they will be accessed on all CPUs by
 	 * locking ch_txbr first.
 	 *
 	 * XXX
 	 * TX bufring and following MNF/evtflags do _not_ fit in
 	 * one 64B cacheline.
 	 */
 	struct vmbus_txbr		ch_txbr __aligned(CACHE_LINE_SIZE);
 	uint32_t			ch_txflags;	/* VMBUS_CHAN_TXF_ */
 
 	/*
 	 * These are based on the vmbus_chanmsg_choffer.chm_montrig.
 	 * Save it here for easy access.
 	 */
 	uint32_t			ch_montrig_mask;/* MNF trig mask */
 	volatile uint32_t		*ch_montrig;	/* MNF trigger loc. */
 
 	/*
 	 * These are based on the vmbus_chanmsg_choffer.chm_chanid.
 	 * Save it here for easy access.
 	 */
 	u_long				ch_evtflag_mask;/* event flag */
 	volatile u_long			*ch_evtflag;	/* event flag loc. */
 
 	/*
 	 * Rarely used fields.
 	 */
 
 	struct hyperv_mon_param		*ch_monprm;
 
 	uint32_t			ch_id;		/* channel id */
 	device_t			ch_dev;
 	struct vmbus_softc		*ch_vmbus;
 
 	int				ch_cpuid;	/* owner cpu */
 	/*
 	 * Virtual cpuid for ch_cpuid; it is used to communicate cpuid
 	 * related information w/ Hyper-V.  If MSR_HV_VP_INDEX does not
 	 * exist, ch_vcpuid will always be 0 for compatibility.
 	 */
 	uint32_t			ch_vcpuid;
 
 	/*
 	 * If this is a primary channel, ch_subchan* fields
 	 * contain sub-channels belonging to this primary
 	 * channel.
 	 */
 	struct mtx			ch_subchan_lock;
 	TAILQ_HEAD(, vmbus_channel)	ch_subchans;
 	int				ch_subchan_cnt;
 
 	/* If this is a sub-channel */
 	TAILQ_ENTRY(vmbus_channel)	ch_sublink;	/* sub-channel link */
 	struct vmbus_channel		*ch_prichan;	/* owner primary chan */
 
 	void				*ch_bufring;	/* TX+RX bufrings */
-	size_t				ch_bufring_size;
 	uint32_t			ch_bufring_gpadl;
 
 	struct task			ch_attach_task;	/* run in ch_mgmt_tq */
 	struct task			ch_detach_task;	/* run in ch_mgmt_tq */
 	struct taskqueue		*ch_mgmt_tq;
 
 	/* If this is a primary channel */
 	TAILQ_ENTRY(vmbus_channel)	ch_prilink;	/* primary chan link */
 
 	TAILQ_ENTRY(vmbus_channel)	ch_link;	/* channel link */
 	uint32_t			ch_subidx;	/* subchan index */
 	volatile uint32_t		ch_stflags;	/* atomic-op */
 							/* VMBUS_CHAN_ST_ */
 	struct hyperv_guid		ch_guid_type;
 	struct hyperv_guid		ch_guid_inst;
 
 	struct sx			ch_orphan_lock;
 	struct vmbus_xact_ctx		*ch_orphan_xact;
 
 	int				ch_refs;
 
 	/*
 	 * These are for HyperV socket channel only
 	 */
 	bool				ch_is_hvs;
 	uint8_t				ch_hvs_conn_from_host;
 
 	struct sysctl_ctx_list		ch_sysctl_ctx;
 } __aligned(CACHE_LINE_SIZE);
 
 #define VMBUS_CHAN_ISPRIMARY(chan)	((chan)->ch_subidx == 0)
 
 /*
  * If this flag is set, this channel's interrupt will be masked in ISR,
  * and the RX bufring will be drained before this channel's interrupt is
  * unmasked.
  *
  * This flag is turned on by default.  Drivers can turn it off according
  * to their own requirement.
  */
 #define VMBUS_CHAN_FLAG_BATCHREAD	0x0002
 
 #define VMBUS_CHAN_TXF_HASMNF		0x0001
 
 #define VMBUS_CHAN_ST_OPENED_SHIFT	0
 #define VMBUS_CHAN_ST_ONPRIL_SHIFT	1
 #define VMBUS_CHAN_ST_ONSUBL_SHIFT	2
 #define VMBUS_CHAN_ST_ONLIST_SHIFT	3
 #define VMBUS_CHAN_ST_REVOKED_SHIFT	4	/* sticky */
 #define VMBUS_CHAN_ST_OPENED		(1 << VMBUS_CHAN_ST_OPENED_SHIFT)
 #define VMBUS_CHAN_ST_ONPRIL		(1 << VMBUS_CHAN_ST_ONPRIL_SHIFT)
 #define VMBUS_CHAN_ST_ONSUBL		(1 << VMBUS_CHAN_ST_ONSUBL_SHIFT)
 #define VMBUS_CHAN_ST_ONLIST		(1 << VMBUS_CHAN_ST_ONLIST_SHIFT)
 #define VMBUS_CHAN_ST_REVOKED		(1 << VMBUS_CHAN_ST_REVOKED_SHIFT)
 
 struct vmbus_softc;
 struct vmbus_message;
 
 void		vmbus_event_proc(struct vmbus_softc *, int);
 void		vmbus_event_proc_compat(struct vmbus_softc *, int);
 void		vmbus_chan_msgproc(struct vmbus_softc *,
 		    const struct vmbus_message *);
 void		vmbus_chan_destroy_all(struct vmbus_softc *);
 
 #endif	/* !_VMBUS_CHANVAR_H_ */
diff --git a/sys/dev/hyperv/vmbus/vmbus_xact.c b/sys/dev/hyperv/vmbus/vmbus_xact.c
index f5f766f2c2fc..eb221ef92b2c 100644
--- a/sys/dev/hyperv/vmbus/vmbus_xact.c
+++ b/sys/dev/hyperv/vmbus/vmbus_xact.c
@@ -1,441 +1,441 @@
 /*-
  * Copyright (c) 2016 Microsoft Corp.
  * 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 unmodified, 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.
  */
 
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>
 
 #include <dev/hyperv/include/vmbus_xact.h>
 
 struct vmbus_xact {
 	struct vmbus_xact_ctx		*x_ctx;
 	void				*x_priv;
 
 	void				*x_req;
 
 	const void			*x_resp;
 	size_t				x_resp_len;
 	void				*x_resp0;
 };
 
 struct vmbus_xact_ctx {
 	size_t				xc_req_size;
 	size_t				xc_resp_size;
 	size_t				xc_priv_size;
 
 	struct mtx			xc_lock;
 	/*
 	 * Protected by xc_lock.
 	 */
 	uint32_t			xc_flags;	/* VMBUS_XACT_CTXF_ */
 	struct vmbus_xact		*xc_free;
 	struct vmbus_xact		*xc_active;
 	struct vmbus_xact		*xc_orphan;
 };
 
 #define VMBUS_XACT_CTXF_DESTROY		0x0001
 
 static struct vmbus_xact	*vmbus_xact_alloc(struct vmbus_xact_ctx *,
 				    bus_dma_tag_t);
 static void			vmbus_xact_free(struct vmbus_xact *);
 static struct vmbus_xact	*vmbus_xact_get1(struct vmbus_xact_ctx *,
 				    uint32_t);
 static const void		*vmbus_xact_wait1(struct vmbus_xact *, size_t *,
 				    bool);
 static const void		*vmbus_xact_return(struct vmbus_xact *,
 				    size_t *);
 static void			vmbus_xact_save_resp(struct vmbus_xact *,
 				    const void *, size_t);
 static void			vmbus_xact_ctx_free(struct vmbus_xact_ctx *);
 
 static struct vmbus_xact *
 vmbus_xact_alloc(struct vmbus_xact_ctx *ctx, bus_dma_tag_t parent_dtag)
 {
 	struct vmbus_xact *xact;
 
 	xact = malloc(sizeof(*xact), M_DEVBUF, M_WAITOK | M_ZERO);
 	xact->x_ctx = ctx;
 
 	/* XXX assume that page aligned is enough */
 	xact->x_req = contigmalloc(ctx->xc_req_size, M_DEVBUF,
 	    M_WAITOK | M_ZERO, 0ul, ~0ul, PAGE_SIZE, 0);
 	if (xact->x_req == NULL) {
 		free(xact, M_DEVBUF);
 		return (NULL);
 	}
 	if (ctx->xc_priv_size != 0)
 		xact->x_priv = malloc(ctx->xc_priv_size, M_DEVBUF, M_WAITOK);
 	xact->x_resp0 = malloc(ctx->xc_resp_size, M_DEVBUF, M_WAITOK);
 
 	return (xact);
 }
 
 static void
 vmbus_xact_free(struct vmbus_xact *xact)
 {
 
-	contigfree(xact->x_req, xact->x_ctx->xc_req_size, M_DEVBUF);
+	free(xact->x_req, M_DEVBUF);
 	free(xact->x_resp0, M_DEVBUF);
 	if (xact->x_priv != NULL)
 		free(xact->x_priv, M_DEVBUF);
 	free(xact, M_DEVBUF);
 }
 
 static struct vmbus_xact *
 vmbus_xact_get1(struct vmbus_xact_ctx *ctx, uint32_t dtor_flag)
 {
 	struct vmbus_xact *xact;
 
 	mtx_lock(&ctx->xc_lock);
 
 	while ((ctx->xc_flags & dtor_flag) == 0 && ctx->xc_free == NULL)
 		mtx_sleep(&ctx->xc_free, &ctx->xc_lock, 0, "gxact", 0);
 	if (ctx->xc_flags & dtor_flag) {
 		/* Being destroyed */
 		xact = NULL;
 	} else {
 		xact = ctx->xc_free;
 		KASSERT(xact != NULL, ("no free xact"));
 		KASSERT(xact->x_resp == NULL, ("xact has pending response"));
 		ctx->xc_free = NULL;
 	}
 
 	mtx_unlock(&ctx->xc_lock);
 
 	return (xact);
 }
 
 struct vmbus_xact_ctx *
 vmbus_xact_ctx_create(bus_dma_tag_t dtag, size_t req_size, size_t resp_size,
     size_t priv_size)
 {
 	struct vmbus_xact_ctx *ctx;
 
 	KASSERT(req_size > 0, ("request size is 0"));
 	KASSERT(resp_size > 0, ("response size is 0"));
 
 	ctx = malloc(sizeof(*ctx), M_DEVBUF, M_WAITOK | M_ZERO);
 	ctx->xc_req_size = req_size;
 	ctx->xc_resp_size = resp_size;
 	ctx->xc_priv_size = priv_size;
 
 	ctx->xc_free = vmbus_xact_alloc(ctx, dtag);
 	if (ctx->xc_free == NULL) {
 		free(ctx, M_DEVBUF);
 		return (NULL);
 	}
 
 	mtx_init(&ctx->xc_lock, "vmbus xact", NULL, MTX_DEF);
 
 	return (ctx);
 }
 
 bool
 vmbus_xact_ctx_orphan(struct vmbus_xact_ctx *ctx)
 {
 	mtx_lock(&ctx->xc_lock);
 	if (ctx->xc_flags & VMBUS_XACT_CTXF_DESTROY) {
 		mtx_unlock(&ctx->xc_lock);
 		return (false);
 	}
 	ctx->xc_flags |= VMBUS_XACT_CTXF_DESTROY;
 	mtx_unlock(&ctx->xc_lock);
 
 	wakeup(&ctx->xc_free);
 	wakeup(&ctx->xc_active);
 
 	ctx->xc_orphan = vmbus_xact_get1(ctx, 0);
 	if (ctx->xc_orphan == NULL)
 		panic("can't get xact");
 	return (true);
 }
 
 static void
 vmbus_xact_ctx_free(struct vmbus_xact_ctx *ctx)
 {
 	KASSERT(ctx->xc_flags & VMBUS_XACT_CTXF_DESTROY,
 	    ("xact ctx was not orphaned"));
 	KASSERT(ctx->xc_orphan != NULL, ("no orphaned xact"));
 
 	vmbus_xact_free(ctx->xc_orphan);
 	mtx_destroy(&ctx->xc_lock);
 	free(ctx, M_DEVBUF);
 }
 
 void
 vmbus_xact_ctx_destroy(struct vmbus_xact_ctx *ctx)
 {
 
 	vmbus_xact_ctx_orphan(ctx);
 	vmbus_xact_ctx_free(ctx);
 }
 
 struct vmbus_xact *
 vmbus_xact_get(struct vmbus_xact_ctx *ctx, size_t req_len)
 {
 	struct vmbus_xact *xact;
 
 	if (req_len > ctx->xc_req_size)
 		panic("invalid request size %zu", req_len);
 
 	xact = vmbus_xact_get1(ctx, VMBUS_XACT_CTXF_DESTROY);
 	if (xact == NULL)
 		return (NULL);
 
 	memset(xact->x_req, 0, req_len);
 	return (xact);
 }
 
 void
 vmbus_xact_put(struct vmbus_xact *xact)
 {
 	struct vmbus_xact_ctx *ctx = xact->x_ctx;
 
 	KASSERT(ctx->xc_active == NULL, ("pending active xact"));
 	xact->x_resp = NULL;
 
 	mtx_lock(&ctx->xc_lock);
 	KASSERT(ctx->xc_free == NULL, ("has free xact"));
 	ctx->xc_free = xact;
 	mtx_unlock(&ctx->xc_lock);
 	wakeup(&ctx->xc_free);
 }
 
 void *
 vmbus_xact_req_data(const struct vmbus_xact *xact)
 {
 
 	return (xact->x_req);
 }
 
 bus_addr_t
 vmbus_xact_req_paddr(const struct vmbus_xact *xact)
 {
 
 	return (pmap_kextract((vm_offset_t)xact->x_req));
 }
 
 void *
 vmbus_xact_priv(const struct vmbus_xact *xact, size_t priv_len)
 {
 
 	if (priv_len > xact->x_ctx->xc_priv_size)
 		panic("invalid priv size %zu", priv_len);
 	return (xact->x_priv);
 }
 
 void
 vmbus_xact_activate(struct vmbus_xact *xact)
 {
 	struct vmbus_xact_ctx *ctx = xact->x_ctx;
 
 	KASSERT(xact->x_resp == NULL, ("xact has pending response"));
 
 	mtx_lock(&ctx->xc_lock);
 	KASSERT(ctx->xc_active == NULL, ("pending active xact"));
 	ctx->xc_active = xact;
 	mtx_unlock(&ctx->xc_lock);
 }
 
 void
 vmbus_xact_deactivate(struct vmbus_xact *xact)
 {
 	struct vmbus_xact_ctx *ctx = xact->x_ctx;
 
 	mtx_lock(&ctx->xc_lock);
 	KASSERT(ctx->xc_active == xact, ("xact mismatch"));
 	ctx->xc_active = NULL;
 	mtx_unlock(&ctx->xc_lock);
 }
 
 static const void *
 vmbus_xact_return(struct vmbus_xact *xact, size_t *resp_len)
 {
 	struct vmbus_xact_ctx *ctx = xact->x_ctx;
 	const void *resp;
 
 	mtx_assert(&ctx->xc_lock, MA_OWNED);
 	KASSERT(ctx->xc_active == xact, ("xact trashed"));
 
 	if ((ctx->xc_flags & VMBUS_XACT_CTXF_DESTROY) && xact->x_resp == NULL) {
 		uint8_t b = 0;
 
 		/*
 		 * Orphaned and no response was received yet; fake up
 		 * an one byte response.
 		 */
 		printf("vmbus: xact ctx was orphaned w/ pending xact\n");
 		vmbus_xact_save_resp(ctx->xc_active, &b, sizeof(b));
 	}
 	KASSERT(xact->x_resp != NULL, ("no response"));
 
 	ctx->xc_active = NULL;
 
 	resp = xact->x_resp;
 	*resp_len = xact->x_resp_len;
 
 	return (resp);
 }
 
 static const void *
 vmbus_xact_wait1(struct vmbus_xact *xact, size_t *resp_len,
     bool can_sleep)
 {
 	struct vmbus_xact_ctx *ctx = xact->x_ctx;
 	const void *resp;
 
 	mtx_lock(&ctx->xc_lock);
 
 	KASSERT(ctx->xc_active == xact, ("xact mismatch"));
 	while (xact->x_resp == NULL &&
 	    (ctx->xc_flags & VMBUS_XACT_CTXF_DESTROY) == 0) {
 		if (can_sleep) {
 			mtx_sleep(&ctx->xc_active, &ctx->xc_lock, 0,
 			    "wxact", 0);
 		} else {
 			mtx_unlock(&ctx->xc_lock);
 			DELAY(1000);
 			mtx_lock(&ctx->xc_lock);
 		}
 	}
 	resp = vmbus_xact_return(xact, resp_len);
 
 	mtx_unlock(&ctx->xc_lock);
 
 	return (resp);
 }
 
 const void *
 vmbus_xact_wait(struct vmbus_xact *xact, size_t *resp_len)
 {
 
 	return (vmbus_xact_wait1(xact, resp_len, true /* can sleep */));
 }
 
 const void *
 vmbus_xact_busywait(struct vmbus_xact *xact, size_t *resp_len)
 {
 
 	return (vmbus_xact_wait1(xact, resp_len, false /* can't sleep */));
 }
 
 const void *
 vmbus_xact_poll(struct vmbus_xact *xact, size_t *resp_len)
 {
 	struct vmbus_xact_ctx *ctx = xact->x_ctx;
 	const void *resp;
 
 	mtx_lock(&ctx->xc_lock);
 
 	KASSERT(ctx->xc_active == xact, ("xact mismatch"));
 	if (xact->x_resp == NULL &&
 	    (ctx->xc_flags & VMBUS_XACT_CTXF_DESTROY) == 0) {
 		mtx_unlock(&ctx->xc_lock);
 		*resp_len = 0;
 		return (NULL);
 	}
 	resp = vmbus_xact_return(xact, resp_len);
 
 	mtx_unlock(&ctx->xc_lock);
 
 	return (resp);
 }
 
 static void
 vmbus_xact_save_resp(struct vmbus_xact *xact, const void *data, size_t dlen)
 {
 	struct vmbus_xact_ctx *ctx = xact->x_ctx;
 	size_t cplen = dlen;
 
 	mtx_assert(&ctx->xc_lock, MA_OWNED);
 
 	if (cplen > ctx->xc_resp_size) {
 		printf("vmbus: xact response truncated %zu -> %zu\n",
 		    cplen, ctx->xc_resp_size);
 		cplen = ctx->xc_resp_size;
 	}
 
 	KASSERT(ctx->xc_active == xact, ("xact mismatch"));
 	memcpy(xact->x_resp0, data, cplen);
 	xact->x_resp_len = cplen;
 	xact->x_resp = xact->x_resp0;
 }
 
 void
 vmbus_xact_wakeup(struct vmbus_xact *xact, const void *data, size_t dlen)
 {
 	struct vmbus_xact_ctx *ctx = xact->x_ctx;
 	int do_wakeup = 0;
 
 	mtx_lock(&ctx->xc_lock);
 	/*
 	 * NOTE:
 	 * xc_active could be NULL, if the ctx has been orphaned.
 	 */
 	if (ctx->xc_active != NULL) {
 		vmbus_xact_save_resp(xact, data, dlen);
 		do_wakeup = 1;
 	} else {
 		KASSERT(ctx->xc_flags & VMBUS_XACT_CTXF_DESTROY,
 		    ("no active xact pending"));
 		printf("vmbus: drop xact response\n");
 	}
 	mtx_unlock(&ctx->xc_lock);
 
 	if (do_wakeup)
 		wakeup(&ctx->xc_active);
 }
 
 void
 vmbus_xact_ctx_wakeup(struct vmbus_xact_ctx *ctx, const void *data, size_t dlen)
 {
 	int do_wakeup = 0;
 
 	mtx_lock(&ctx->xc_lock);
 	/*
 	 * NOTE:
 	 * xc_active could be NULL, if the ctx has been orphaned.
 	 */
 	if (ctx->xc_active != NULL) {
 		vmbus_xact_save_resp(ctx->xc_active, data, dlen);
 		do_wakeup = 1;
 	} else {
 		KASSERT(ctx->xc_flags & VMBUS_XACT_CTXF_DESTROY,
 		    ("no active xact pending"));
 		printf("vmbus: drop xact response\n");
 	}
 	mtx_unlock(&ctx->xc_lock);
 
 	if (do_wakeup)
 		wakeup(&ctx->xc_active);
 }
diff --git a/sys/dev/ioat/ioat_test.c b/sys/dev/ioat/ioat_test.c
index 9c081e0fb0b9..6ff3494a76da 100644
--- a/sys/dev/ioat/ioat_test.c
+++ b/sys/dev/ioat/ioat_test.c
@@ -1,612 +1,606 @@
 /*-
  * Copyright (C) 2012 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/ioccom.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/rman.h>
 #include <sys/sysctl.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <machine/stdarg.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
 #include "ioat.h"
 #include "ioat_hw.h"
 #include "ioat_internal.h"
 #include "ioat_test.h"
 
 #ifndef time_after
 #define	time_after(a,b)		((long)(b) - (long)(a) < 0)
 #endif
 
 MALLOC_DEFINE(M_IOAT_TEST, "ioat_test", "ioat test allocations");
 
 #define	IOAT_MAX_BUFS	256
 
 struct test_transaction {
 	void			*buf[IOAT_MAX_BUFS];
 	uint32_t		length;
 	uint32_t		depth;
 	uint32_t		crc[IOAT_MAX_BUFS];
 	struct ioat_test	*test;
 	TAILQ_ENTRY(test_transaction)	entry;
 };
 
 #define	IT_LOCK()	mtx_lock(&ioat_test_lk)
 #define	IT_UNLOCK()	mtx_unlock(&ioat_test_lk)
 #define	IT_ASSERT()	mtx_assert(&ioat_test_lk, MA_OWNED)
 static struct mtx ioat_test_lk;
 MTX_SYSINIT(ioat_test_lk, &ioat_test_lk, "test coordination mtx", MTX_DEF);
 
 static int g_thread_index = 1;
 static struct cdev *g_ioat_cdev = NULL;
 
 #define	ioat_test_log(v, ...)	_ioat_test_log((v), "ioat_test: " __VA_ARGS__)
 static void _ioat_test_log(int verbosity, const char *fmt, ...);
 
 static void
 ioat_test_transaction_destroy(struct test_transaction *tx)
 {
-	struct ioat_test *test;
 	int i;
 
-	test = tx->test;
-
 	for (i = 0; i < IOAT_MAX_BUFS; i++) {
 		if (tx->buf[i] != NULL) {
-			if (test->testkind == IOAT_TEST_DMA_8K)
-				free(tx->buf[i], M_IOAT_TEST);
-			else
-				contigfree(tx->buf[i], tx->length, M_IOAT_TEST);
+			free(tx->buf[i], M_IOAT_TEST);
 			tx->buf[i] = NULL;
 		}
 	}
 
 	free(tx, M_IOAT_TEST);
 }
 
 static struct
 test_transaction *ioat_test_transaction_create(struct ioat_test *test,
     unsigned num_buffers)
 {
 	struct test_transaction *tx;
 	unsigned i;
 
 	tx = malloc(sizeof(*tx), M_IOAT_TEST, M_NOWAIT | M_ZERO);
 	if (tx == NULL)
 		return (NULL);
 
 	tx->length = test->buffer_size;
 
 	for (i = 0; i < num_buffers; i++) {
 		if (test->testkind == IOAT_TEST_DMA_8K)
 			tx->buf[i] = malloc(test->buffer_size, M_IOAT_TEST,
 			    M_NOWAIT);
 		else
 			tx->buf[i] = contigmalloc(test->buffer_size,
 			    M_IOAT_TEST, M_NOWAIT, 0, BUS_SPACE_MAXADDR,
 			    PAGE_SIZE, 0);
 
 		if (tx->buf[i] == NULL) {
 			ioat_test_transaction_destroy(tx);
 			return (NULL);
 		}
 	}
 	return (tx);
 }
 
 static void
 dump_hex(void *p, size_t chunks)
 {
 	size_t i, j;
 
 	for (i = 0; i < chunks; i++) {
 		for (j = 0; j < 8; j++)
 			printf("%08x ", ((uint32_t *)p)[i * 8 + j]);
 		printf("\n");
 	}
 }
 
 static bool
 ioat_compare_ok(struct test_transaction *tx)
 {
 	struct ioat_test *test;
 	char *dst, *src;
 	uint32_t i, j;
 
 	test = tx->test;
 
 	for (i = 0; i < tx->depth; i++) {
 		dst = tx->buf[2 * i + 1];
 		src = tx->buf[2 * i];
 
 		if (test->testkind == IOAT_TEST_FILL) {
 			for (j = 0; j < tx->length; j += sizeof(uint64_t)) {
 				if (memcmp(src, &dst[j],
 					MIN(sizeof(uint64_t), tx->length - j))
 				    != 0)
 					return (false);
 			}
 		} else if (test->testkind == IOAT_TEST_DMA) {
 			if (memcmp(src, dst, tx->length) != 0)
 				return (false);
 		} else if (test->testkind == IOAT_TEST_RAW_DMA) {
 			if (test->raw_write)
 				dst = test->raw_vtarget;
 			dump_hex(dst, tx->length / 32);
 		}
 	}
 	return (true);
 }
 
 static void
 ioat_dma_test_callback(void *arg, int error)
 {
 	struct test_transaction *tx;
 	struct ioat_test *test;
 
 	if (error != 0)
 		ioat_test_log(0, "%s: Got error: %d\n", __func__, error);
 
 	tx = arg;
 	test = tx->test;
 
 	if (test->verify && !ioat_compare_ok(tx)) {
 		ioat_test_log(0, "miscompare found\n");
 		atomic_add_32(&test->status[IOAT_TEST_MISCOMPARE], tx->depth);
 	} else if (!test->too_late)
 		atomic_add_32(&test->status[IOAT_TEST_OK], tx->depth);
 
 	IT_LOCK();
 	TAILQ_REMOVE(&test->pend_q, tx, entry);
 	TAILQ_INSERT_TAIL(&test->free_q, tx, entry);
 	wakeup(&test->free_q);
 	IT_UNLOCK();
 }
 
 static int
 ioat_test_prealloc_memory(struct ioat_test *test, int index)
 {
 	uint32_t i, j, k;
 	struct test_transaction *tx;
 
 	for (i = 0; i < test->transactions; i++) {
 		tx = ioat_test_transaction_create(test, test->chain_depth * 2);
 		if (tx == NULL) {
 			ioat_test_log(0, "tx == NULL - memory exhausted\n");
 			test->status[IOAT_TEST_NO_MEMORY]++;
 			return (ENOMEM);
 		}
 
 		TAILQ_INSERT_HEAD(&test->free_q, tx, entry);
 
 		tx->test = test;
 		tx->depth = test->chain_depth;
 
 		/* fill in source buffers */
 		for (j = 0; j < (tx->length / sizeof(uint32_t)); j++) {
 			uint32_t val = j + (index << 28);
 
 			for (k = 0; k < test->chain_depth; k++) {
 				((uint32_t *)tx->buf[2*k])[j] = ~val;
 				((uint32_t *)tx->buf[2*k+1])[j] = val;
 			}
 		}
 	}
 	return (0);
 }
 
 static void
 ioat_test_release_memory(struct ioat_test *test)
 {
 	struct test_transaction *tx, *s;
 
 	TAILQ_FOREACH_SAFE(tx, &test->free_q, entry, s)
 		ioat_test_transaction_destroy(tx);
 	TAILQ_INIT(&test->free_q);
 
 	TAILQ_FOREACH_SAFE(tx, &test->pend_q, entry, s)
 		ioat_test_transaction_destroy(tx);
 	TAILQ_INIT(&test->pend_q);
 }
 
 static void
 ioat_test_submit_1_tx(struct ioat_test *test, bus_dmaengine_t dma)
 {
 	struct test_transaction *tx;
 	struct bus_dmadesc *desc;
 	bus_dmaengine_callback_t cb;
 	bus_addr_t src, dest;
 	uint64_t fillpattern;
 	uint32_t i, flags;
 
 	desc = NULL;
 
 	IT_LOCK();
 	while (TAILQ_EMPTY(&test->free_q))
 		msleep(&test->free_q, &ioat_test_lk, 0, "test_submit", 0);
 
 	tx = TAILQ_FIRST(&test->free_q);
 	TAILQ_REMOVE(&test->free_q, tx, entry);
 	TAILQ_INSERT_HEAD(&test->pend_q, tx, entry);
 	IT_UNLOCK();
 
 	if (test->testkind != IOAT_TEST_MEMCPY)
 		ioat_acquire(dma);
 	for (i = 0; i < tx->depth; i++) {
 		if (test->testkind == IOAT_TEST_MEMCPY) {
 			memcpy(tx->buf[2 * i + 1], tx->buf[2 * i], tx->length);
 			if (i == tx->depth - 1)
 				ioat_dma_test_callback(tx, 0);
 			continue;
 		}
 
 		src = vtophys((vm_offset_t)tx->buf[2*i]);
 		dest = vtophys((vm_offset_t)tx->buf[2*i+1]);
 
 		if (test->testkind == IOAT_TEST_RAW_DMA) {
 			if (test->raw_write)
 				dest = test->raw_target;
 			else
 				src = test->raw_target;
 		}
 
 		if (i == tx->depth - 1) {
 			cb = ioat_dma_test_callback;
 			flags = DMA_INT_EN;
 		} else {
 			cb = NULL;
 			flags = 0;
 		}
 
 		if (test->testkind == IOAT_TEST_DMA ||
 		    test->testkind == IOAT_TEST_RAW_DMA)
 			desc = ioat_copy(dma, dest, src, tx->length, cb, tx,
 			    flags);
 		else if (test->testkind == IOAT_TEST_FILL) {
 			fillpattern = *(uint64_t *)tx->buf[2*i];
 			desc = ioat_blockfill(dma, dest, fillpattern,
 			    tx->length, cb, tx, flags);
 		} else if (test->testkind == IOAT_TEST_DMA_8K) {
 			bus_addr_t src2, dst2;
 
 			src2 = vtophys((vm_offset_t)tx->buf[2*i] + PAGE_SIZE);
 			dst2 = vtophys((vm_offset_t)tx->buf[2*i+1] + PAGE_SIZE);
 
 			desc = ioat_copy_8k_aligned(dma, dest, dst2, src, src2,
 			    cb, tx, flags);
 		} else if (test->testkind == IOAT_TEST_DMA_8K_PB) {
 			bus_addr_t src2, dst2;
 
 			src2 = vtophys((vm_offset_t)tx->buf[2*i+1] + PAGE_SIZE);
 			dst2 = vtophys((vm_offset_t)tx->buf[2*i] + PAGE_SIZE);
 
 			desc = ioat_copy_8k_aligned(dma, dest, dst2, src, src2,
 			    cb, tx, flags);
 		} else if (test->testkind == IOAT_TEST_DMA_CRC) {
 			bus_addr_t crc;
 
 			tx->crc[i] = 0;
 			crc = vtophys((vm_offset_t)&tx->crc[i]);
 			desc = ioat_crc(dma, src, tx->length,
 			    NULL, crc, cb, tx, flags | DMA_CRC_STORE);
 		} else if (test->testkind == IOAT_TEST_DMA_CRC_COPY) {
 			bus_addr_t crc;
 
 			tx->crc[i] = 0;
 			crc = vtophys((vm_offset_t)&tx->crc[i]);
 			desc = ioat_copy_crc(dma, dest, src, tx->length,
 			    NULL, crc, cb, tx, flags | DMA_CRC_STORE);
 		}
 		if (desc == NULL)
 			break;
 	}
 	if (test->testkind == IOAT_TEST_MEMCPY)
 		return;
 	ioat_release(dma);
 
 	/*
 	 * We couldn't issue an IO -- either the device is being detached or
 	 * the HW reset.  Essentially spin until the device comes back up or
 	 * our timer expires.
 	 */
 	if (desc == NULL && tx->depth > 0) {
 		atomic_add_32(&test->status[IOAT_TEST_NO_DMA_ENGINE], tx->depth);
 		IT_LOCK();
 		TAILQ_REMOVE(&test->pend_q, tx, entry);
 		TAILQ_INSERT_HEAD(&test->free_q, tx, entry);
 		IT_UNLOCK();
 	}
 }
 
 static void
 ioat_dma_test(void *arg)
 {
 	struct ioat_softc *ioat;
 	struct ioat_test *test;
 	bus_dmaengine_t dmaengine;
 	uint32_t loops;
 	int index, rc, start, end, error;
 
 	test = arg;
 	memset(__DEVOLATILE(void *, test->status), 0, sizeof(test->status));
 
 	if ((test->testkind == IOAT_TEST_DMA_8K ||
 	    test->testkind == IOAT_TEST_DMA_8K_PB) &&
 	    test->buffer_size != 2 * PAGE_SIZE) {
 		ioat_test_log(0, "Asked for 8k test and buffer size isn't 8k\n");
 		test->status[IOAT_TEST_INVALID_INPUT]++;
 		return;
 	}
 
 	if (test->buffer_size > 1024 * 1024) {
 		ioat_test_log(0, "Buffer size too large >1MB\n");
 		test->status[IOAT_TEST_NO_MEMORY]++;
 		return;
 	}
 
 	if (test->chain_depth * 2 > IOAT_MAX_BUFS) {
 		ioat_test_log(0, "Depth too large (> %u)\n",
 		    (unsigned)IOAT_MAX_BUFS / 2);
 		test->status[IOAT_TEST_NO_MEMORY]++;
 		return;
 	}
 
 	if (btoc((uint64_t)test->buffer_size * test->chain_depth *
 	    test->transactions) > (physmem / 4)) {
 		ioat_test_log(0, "Sanity check failed -- test would "
 		    "use more than 1/4 of phys mem.\n");
 		test->status[IOAT_TEST_NO_MEMORY]++;
 		return;
 	}
 
 	if ((uint64_t)test->transactions * test->chain_depth > (1<<16)) {
 		ioat_test_log(0, "Sanity check failed -- test would "
 		    "use more than available IOAT ring space.\n");
 		test->status[IOAT_TEST_NO_MEMORY]++;
 		return;
 	}
 
 	if (test->testkind >= IOAT_NUM_TESTKINDS) {
 		ioat_test_log(0, "Invalid kind %u\n",
 		    (unsigned)test->testkind);
 		test->status[IOAT_TEST_INVALID_INPUT]++;
 		return;
 	}
 
 	dmaengine = ioat_get_dmaengine(test->channel_index, M_NOWAIT);
 	if (dmaengine == NULL) {
 		ioat_test_log(0, "Couldn't acquire dmaengine\n");
 		test->status[IOAT_TEST_NO_DMA_ENGINE]++;
 		return;
 	}
 	ioat = to_ioat_softc(dmaengine);
 
 	if (test->testkind == IOAT_TEST_FILL &&
 	    (ioat->capabilities & IOAT_DMACAP_BFILL) == 0)
 	{
 		ioat_test_log(0,
 		    "Hardware doesn't support block fill, aborting test\n");
 		test->status[IOAT_TEST_INVALID_INPUT]++;
 		goto out;
 	}
 
 	if (test->coalesce_period > ioat->intrdelay_max) {
 		ioat_test_log(0,
 		    "Hardware doesn't support intrdelay of %u us.\n",
 		    (unsigned)test->coalesce_period);
 		test->status[IOAT_TEST_INVALID_INPUT]++;
 		goto out;
 	}
 	error = ioat_set_interrupt_coalesce(dmaengine, test->coalesce_period);
 	if (error == ENODEV && test->coalesce_period == 0)
 		error = 0;
 	if (error != 0) {
 		ioat_test_log(0, "ioat_set_interrupt_coalesce: %d\n", error);
 		test->status[IOAT_TEST_INVALID_INPUT]++;
 		goto out;
 	}
 
 	if (test->zero_stats)
 		memset(&ioat->stats, 0, sizeof(ioat->stats));
 
 	if (test->testkind == IOAT_TEST_RAW_DMA) {
 		if (test->raw_is_virtual) {
 			test->raw_vtarget = (void *)test->raw_target;
 			test->raw_target = vtophys(test->raw_vtarget);
 		} else {
 			test->raw_vtarget = pmap_mapdev(test->raw_target,
 			    test->buffer_size);
 		}
 	}
 
 	index = g_thread_index++;
 	TAILQ_INIT(&test->free_q);
 	TAILQ_INIT(&test->pend_q);
 
 	if (test->duration == 0)
 		ioat_test_log(1, "Thread %d: num_loops remaining: 0x%08x\n",
 		    index, test->transactions);
 	else
 		ioat_test_log(1, "Thread %d: starting\n", index);
 
 	rc = ioat_test_prealloc_memory(test, index);
 	if (rc != 0) {
 		ioat_test_log(0, "prealloc_memory: %d\n", rc);
 		goto out;
 	}
 	wmb();
 
 	test->too_late = false;
 	start = ticks;
 	end = start + (((sbintime_t)test->duration * hz) / 1000);
 
 	for (loops = 0;; loops++) {
 		if (test->duration == 0 && loops >= test->transactions)
 			break;
 		else if (test->duration != 0 && time_after(ticks, end)) {
 			test->too_late = true;
 			break;
 		}
 
 		ioat_test_submit_1_tx(test, dmaengine);
 	}
 
 	ioat_test_log(1, "Test Elapsed: %d ticks (overrun %d), %d sec.\n",
 	    ticks - start, ticks - end, (ticks - start) / hz);
 
 	IT_LOCK();
 	while (!TAILQ_EMPTY(&test->pend_q))
 		msleep(&test->free_q, &ioat_test_lk, 0, "ioattestcompl", hz);
 	IT_UNLOCK();
 
 	ioat_test_log(1, "Test Elapsed2: %d ticks (overrun %d), %d sec.\n",
 	    ticks - start, ticks - end, (ticks - start) / hz);
 
 	ioat_test_release_memory(test);
 out:
 	if (test->testkind == IOAT_TEST_RAW_DMA && !test->raw_is_virtual)
 		pmap_unmapdev(test->raw_vtarget, test->buffer_size);
 	ioat_put_dmaengine(dmaengine);
 }
 
 static int
 ioat_test_open(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 
 	return (0);
 }
 
 static int
 ioat_test_close(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 
 	return (0);
 }
 
 static int
 ioat_test_ioctl(struct cdev *dev, unsigned long cmd, caddr_t arg, int flag,
     struct thread *td)
 {
 
 	switch (cmd) {
 	case IOAT_DMATEST:
 		ioat_dma_test(arg);
 		break;
 	default:
 		return (EINVAL);
 	}
 	return (0);
 }
 
 static struct cdevsw ioat_cdevsw = {
 	.d_version =	D_VERSION,
 	.d_flags =	0,
 	.d_open =	ioat_test_open,
 	.d_close =	ioat_test_close,
 	.d_ioctl =	ioat_test_ioctl,
 	.d_name =	"ioat_test",
 };
 
 static int
 enable_ioat_test(bool enable)
 {
 	struct make_dev_args devargs;
 	int error = 0;
 
 	if (enable && g_ioat_cdev == NULL) {
 		make_dev_args_init(&devargs);
 		devargs.mda_devsw = &ioat_cdevsw;
 		devargs.mda_uid = UID_ROOT;
 		devargs.mda_gid = GID_WHEEL;
 		devargs.mda_mode = 0600;
 		error = make_dev_s(&devargs, &g_ioat_cdev, "ioat_test");
 	} else if (!enable && g_ioat_cdev != NULL) {
 		destroy_dev(g_ioat_cdev);
 		g_ioat_cdev = NULL;
 	}
 	return (error);
 }
 
 static int
 sysctl_enable_ioat_test(SYSCTL_HANDLER_ARGS)
 {
 	int error, enabled;
 
 	enabled = (g_ioat_cdev != NULL);
 	error = sysctl_handle_int(oidp, &enabled, 0, req);
 	if (error != 0 || req->newptr == NULL)
 		return (error);
 
 	return (enable_ioat_test(enabled));
 }
 SYSCTL_PROC(_hw_ioat, OID_AUTO, enable_ioat_test,
     CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, 0,
     sysctl_enable_ioat_test, "I",
     "Non-zero: Enable the /dev/ioat_test device");
 
 void
 ioat_test_attach(void)
 {
 	char *val;
 
 	val = kern_getenv("hw.ioat.enable_ioat_test");
 	if (val != NULL && strcmp(val, "0") != 0)
 		enable_ioat_test(true);
 	freeenv(val);
 }
 
 void
 ioat_test_detach(void)
 {
 
 	enable_ioat_test(false);
 }
 
 static void
 _ioat_test_log(int verbosity, const char *fmt, ...)
 {
 	va_list argp;
 
 	if (verbosity > g_ioat_debug_level)
 		return;
 
 	va_start(argp, fmt);
 	vprintf(fmt, argp);
 	va_end(argp);
 }
diff --git a/sys/dev/isci/isci.c b/sys/dev/isci/isci.c
index 2b5d4301f6b2..1dede4e45b4c 100644
--- a/sys/dev/isci/isci.c
+++ b/sys/dev/isci/isci.c
@@ -1,677 +1,677 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * BSD LICENSE
  *
  * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  *   * Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  *   * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 #include <dev/isci/isci.h>
 
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 
 #include <cam/cam_periph.h>
 
 #include <dev/led/led.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
 #include <dev/isci/scil/scic_logger.h>
 #include <dev/isci/scil/scic_library.h>
 #include <dev/isci/scil/scic_sgpio.h>
 #include <dev/isci/scil/scic_user_callback.h>
 
 #include <dev/isci/scil/scif_controller.h>
 #include <dev/isci/scil/scif_library.h>
 #include <dev/isci/scil/scif_logger.h>
 #include <dev/isci/scil/scif_user_callback.h>
 
 MALLOC_DEFINE(M_ISCI, "isci", "isci driver memory allocations");
 
 struct isci_softc *g_isci;
 uint32_t g_isci_debug_level = 0;
 
 static int isci_probe(device_t);
 static int isci_attach(device_t);
 static int isci_detach(device_t);
 
 int isci_initialize(struct isci_softc *isci);
 
 void isci_allocate_dma_buffer_callback(void *arg, bus_dma_segment_t *seg,
     int nseg, int error);
 
 static device_method_t isci_pci_methods[] = {
 	 /* Device interface */
 	 DEVMETHOD(device_probe,  isci_probe),
 	 DEVMETHOD(device_attach, isci_attach),
 	 DEVMETHOD(device_detach, isci_detach),
 	 { 0, 0 }
 };
 
 static driver_t isci_pci_driver = {
 	 "isci",
 	 isci_pci_methods,
 	 sizeof(struct isci_softc),
 };
 
 DRIVER_MODULE(isci, pci, isci_pci_driver, 0, 0);
 MODULE_DEPEND(isci, cam, 1, 1, 1);
 
 static struct _pcsid
 {
 	 u_int32_t	type;
 	 const char	*desc;
 } pci_ids[] = {
 	 { 0x1d608086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d618086,	"Intel(R) C600 Series Chipset SAS Controller (SATA mode)"  },
 	 { 0x1d628086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d638086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d648086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d658086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d668086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d678086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d688086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d698086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d6a8086,	"Intel(R) C600 Series Chipset SAS Controller (SATA mode)"  },
 	 { 0x1d6b8086,  "Intel(R) C600 Series Chipset SAS Controller (SATA mode)"  },
 	 { 0x1d6c8086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d6d8086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d6e8086,	"Intel(R) C600 Series Chipset SAS Controller"  },
 	 { 0x1d6f8086,	"Intel(R) C600 Series Chipset SAS Controller (SATA mode)"  },
 	 { 0x00000000,	NULL				}
 };
 
 static int
 isci_probe (device_t device)
 {
 	u_int32_t	type = pci_get_devid(device);
 	struct _pcsid	*ep = pci_ids;
 
 	while (ep->type && ep->type != type)
 		++ep;
 
 	if (ep->desc)
 	{
 		device_set_desc(device, ep->desc);
 		return (BUS_PROBE_DEFAULT);
 	}
 	else
 		return (ENXIO);
 }
 
 static int
 isci_allocate_pci_memory(struct isci_softc *isci)
 {
 	int i;
 
 	for (i = 0; i < ISCI_NUM_PCI_BARS; i++)
 	{
 		struct ISCI_PCI_BAR *pci_bar = &isci->pci_bar[i];
 
 		pci_bar->resource_id = PCIR_BAR(i*2);
 		pci_bar->resource = bus_alloc_resource_any(isci->device,
 		    SYS_RES_MEMORY, &pci_bar->resource_id,
 		    RF_ACTIVE);
 
 		if(pci_bar->resource == NULL)
 			isci_log_message(0, "ISCI",
 			    "unable to allocate pci resource\n");
 		else {
 			pci_bar->bus_tag = rman_get_bustag(pci_bar->resource);
 			pci_bar->bus_handle =
 			    rman_get_bushandle(pci_bar->resource);
 		}
 	}
 
 	return (0);
 }
 
 static int
 isci_attach(device_t device)
 {
 	int error;
 	struct isci_softc *isci = DEVICE2SOFTC(device);
 
 	g_isci = isci;
 	isci->device = device;
 	pci_enable_busmaster(device);
 
 	isci_allocate_pci_memory(isci);
 
 	error = isci_initialize(isci);
 
 	if (error)
 	{
 		isci_detach(device);
 		return (error);
 	}
 
 	isci_interrupt_setup(isci);
 	isci_sysctl_initialize(isci);
 
 	return (0);
 }
 
 static int
 isci_detach(device_t device)
 {
 	struct isci_softc *isci = DEVICE2SOFTC(device);
 	int i, phy;
 
 	for (i = 0; i < isci->controller_count; i++) {
 		struct ISCI_CONTROLLER *controller = &isci->controllers[i];
 		SCI_STATUS status;
 		void *unmap_buffer;
 
 		if (controller->scif_controller_handle != NULL) {
 			scic_controller_disable_interrupts(
 			    scif_controller_get_scic_handle(controller->scif_controller_handle));
 
 			mtx_lock(&controller->lock);
 			status = scif_controller_stop(controller->scif_controller_handle, 0);
 			mtx_unlock(&controller->lock);
 
 			while (controller->is_started == TRUE) {
 				/* Now poll for interrupts until the controller stop complete
 				 *  callback is received.
 				 */
 				mtx_lock(&controller->lock);
 				isci_interrupt_poll_handler(controller);
 				mtx_unlock(&controller->lock);
 				pause("isci", 1);
 			}
 
 			if(controller->sim != NULL) {
 				mtx_lock(&controller->lock);
 				xpt_free_path(controller->path);
 				xpt_bus_deregister(cam_sim_path(controller->sim));
 				cam_sim_free(controller->sim, TRUE);
 				mtx_unlock(&controller->lock);
 			}
 		}
 
 		if (controller->timer_memory != NULL)
 			free(controller->timer_memory, M_ISCI);
 
 		if (controller->remote_device_memory != NULL)
 			free(controller->remote_device_memory, M_ISCI);
 
 		for (phy = 0; phy < SCI_MAX_PHYS; phy++) {
 			if (controller->phys[phy].cdev_fault)
 				led_destroy(controller->phys[phy].cdev_fault);
 
 			if (controller->phys[phy].cdev_locate)
 				led_destroy(controller->phys[phy].cdev_locate);
 		}
 
 		while (1) {
 			sci_pool_get(controller->unmap_buffer_pool, unmap_buffer);
 			if (unmap_buffer == NULL)
 				break;
-			contigfree(unmap_buffer, PAGE_SIZE, M_ISCI);
+			free(unmap_buffer, M_ISCI);
 		}
 	}
 
 	/* The SCIF controllers have been stopped, so we can now
 	 *  free the SCI library memory.
 	 */
 	if (isci->sci_library_memory != NULL)
 		free(isci->sci_library_memory, M_ISCI);
 
 	for (i = 0; i < ISCI_NUM_PCI_BARS; i++)
 	{
 		struct ISCI_PCI_BAR *pci_bar = &isci->pci_bar[i];
 
 		if (pci_bar->resource != NULL)
 			bus_release_resource(device, SYS_RES_MEMORY,
 			    pci_bar->resource_id, pci_bar->resource);
 	}
 
 	for (i = 0; i < isci->num_interrupts; i++)
 	{
 		struct ISCI_INTERRUPT_INFO *interrupt_info;
 
 		interrupt_info = &isci->interrupt_info[i];
 
 		if(interrupt_info->tag != NULL)
 			bus_teardown_intr(device, interrupt_info->res,
 			    interrupt_info->tag);
 
 		if(interrupt_info->res != NULL)
 			bus_release_resource(device, SYS_RES_IRQ,
 			    rman_get_rid(interrupt_info->res),
 			    interrupt_info->res);
 
 		pci_release_msi(device);
 	}
 	pci_disable_busmaster(device);
 
 	return (0);
 }
 
 int
 isci_initialize(struct isci_softc *isci)
 {
 	int error;
 	uint32_t status = 0;
 	uint32_t library_object_size;
 	uint32_t verbosity_mask;
 	uint32_t scic_log_object_mask;
 	uint32_t scif_log_object_mask;
 	uint8_t *header_buffer;
 
 	library_object_size = scif_library_get_object_size(SCI_MAX_CONTROLLERS);
 
 	isci->sci_library_memory =
 	    malloc(library_object_size, M_ISCI, M_NOWAIT | M_ZERO );
 
 	isci->sci_library_handle = scif_library_construct(
 	    isci->sci_library_memory, SCI_MAX_CONTROLLERS);
 
 	sci_object_set_association( isci->sci_library_handle, (void *)isci);
 
 	verbosity_mask = (1<<SCI_LOG_VERBOSITY_ERROR) |
 	    (1<<SCI_LOG_VERBOSITY_WARNING) | (1<<SCI_LOG_VERBOSITY_INFO) |
 	    (1<<SCI_LOG_VERBOSITY_TRACE);
 
 	scic_log_object_mask = 0xFFFFFFFF;
 	scic_log_object_mask &= ~SCIC_LOG_OBJECT_COMPLETION_QUEUE;
 	scic_log_object_mask &= ~SCIC_LOG_OBJECT_SSP_IO_REQUEST;
 	scic_log_object_mask &= ~SCIC_LOG_OBJECT_STP_IO_REQUEST;
 	scic_log_object_mask &= ~SCIC_LOG_OBJECT_SMP_IO_REQUEST;
 	scic_log_object_mask &= ~SCIC_LOG_OBJECT_CONTROLLER;
 
 	scif_log_object_mask = 0xFFFFFFFF;
 	scif_log_object_mask &= ~SCIF_LOG_OBJECT_CONTROLLER;
 	scif_log_object_mask &= ~SCIF_LOG_OBJECT_IO_REQUEST;
 
 	TUNABLE_INT_FETCH("hw.isci.debug_level", &g_isci_debug_level);
 
 	sci_logger_enable(sci_object_get_logger(isci->sci_library_handle),
 	    scif_log_object_mask, verbosity_mask);
 
 	sci_logger_enable(sci_object_get_logger(
 	    scif_library_get_scic_handle(isci->sci_library_handle)),
 	    scic_log_object_mask, verbosity_mask);
 
 	header_buffer = (uint8_t *)&isci->pci_common_header;
 	for (uint8_t i = 0; i < sizeof(isci->pci_common_header); i++)
 		header_buffer[i] = pci_read_config(isci->device, i, 1);
 
 	scic_library_set_pci_info(
 	    scif_library_get_scic_handle(isci->sci_library_handle),
 	    &isci->pci_common_header);
 
 	isci->oem_parameters_found = FALSE;
 
 	isci_get_oem_parameters(isci);
 
 	/* trigger interrupt if 32 completions occur before timeout expires */
 	isci->coalesce_number = 32;
 
 	/* trigger interrupt if 2 microseconds elapse after a completion occurs,
 	 *  regardless if "coalesce_number" completions have occurred
 	 */
 	isci->coalesce_timeout = 2;
 
 	isci->controller_count = scic_library_get_pci_device_controller_count(
 	    scif_library_get_scic_handle(isci->sci_library_handle));
 
 	for (int index = 0; index < isci->controller_count; index++) {
 		struct ISCI_CONTROLLER *controller = &isci->controllers[index];
 		SCI_CONTROLLER_HANDLE_T scif_controller_handle;
 
 		controller->index = index;
 		isci_controller_construct(controller, isci);
 
 		scif_controller_handle = controller->scif_controller_handle;
 
 		status = isci_controller_initialize(controller);
 
 		if(status != SCI_SUCCESS) {
 			isci_log_message(0, "ISCI",
 			    "isci_controller_initialize FAILED: %x\n",
 			    status);
 			return (status);
 		}
 
 		error = isci_controller_allocate_memory(controller);
 
 		if (error != 0)
 			return (error);
 
 		scif_controller_set_interrupt_coalescence(
 		    scif_controller_handle, isci->coalesce_number,
 		    isci->coalesce_timeout);
 	}
 
 	/* FreeBSD provides us a hook to ensure we get a chance to start
 	 *  our controllers and complete initial domain discovery before
 	 *  it searches for the boot device.  Once we're done, we'll
 	 *  disestablish the hook, signaling the kernel that is can proceed
 	 *  with the boot process.
 	 */
 	isci->config_hook.ich_func = &isci_controller_start;
 	isci->config_hook.ich_arg = &isci->controllers[0];
 
 	if (config_intrhook_establish(&isci->config_hook) != 0)
 		isci_log_message(0, "ISCI",
 		    "config_intrhook_establish failed!\n");
 
 	return (status);
 }
 
 void
 isci_allocate_dma_buffer_callback(void *arg, bus_dma_segment_t *seg,
     int nseg, int error)
 {
 	struct ISCI_MEMORY *memory = (struct ISCI_MEMORY *)arg;
 
 	memory->error = error;
 
 	if (nseg != 1 || error != 0)
 		isci_log_message(0, "ISCI",
 		    "Failed to allocate physically contiguous memory!\n");
 	else
 		memory->physical_address = seg->ds_addr;
 }
 
 int
 isci_allocate_dma_buffer(device_t device, struct ISCI_CONTROLLER *controller,
     struct ISCI_MEMORY *memory)
 {
 	uint32_t status;
 
 	status = bus_dma_tag_create(bus_get_dma_tag(device),
 	    0x40 /* cacheline alignment */,
 	    ISCI_DMA_BOUNDARY, BUS_SPACE_MAXADDR,
 	    BUS_SPACE_MAXADDR, NULL, NULL, memory->size,
 	    0x1 /* we want physically contiguous */,
 	    memory->size, 0, busdma_lock_mutex, &controller->lock,
 	    &memory->dma_tag);
 
 	if(status == ENOMEM) {
 		isci_log_message(0, "ISCI", "bus_dma_tag_create failed\n");
 		return (status);
 	}
 
 	status = bus_dmamem_alloc(memory->dma_tag,
 	    (void **)&memory->virtual_address, BUS_DMA_ZERO, &memory->dma_map);
 
 	if(status == ENOMEM)
 	{
 		isci_log_message(0, "ISCI", "bus_dmamem_alloc failed\n");
 		return (status);
 	}
 
 	status = bus_dmamap_load(memory->dma_tag, memory->dma_map,
 	    (void *)memory->virtual_address, memory->size,
 	    isci_allocate_dma_buffer_callback, memory, 0);
 
 	if(status == EINVAL)
 	{
 		isci_log_message(0, "ISCI", "bus_dmamap_load failed\n");
 		return (status);
 	}
 
 	return (0);
 }
 
 /**
  * @brief This callback method asks the user to associate the supplied
  *        lock with an operating environment specific locking construct.
  *
  * @param[in]  controller This parameter specifies the controller with
  *             which this lock is to be associated.
  * @param[in]  lock This parameter specifies the lock for which the
  *             user should associate an operating environment specific
  *             locking object.
  *
  * @see The SCI_LOCK_LEVEL enumeration for more information.
  *
  * @return none.
  */
 void
 scif_cb_lock_associate(SCI_CONTROLLER_HANDLE_T controller,
     SCI_LOCK_HANDLE_T lock)
 {
 
 }
 
 /**
  * @brief This callback method asks the user to de-associate the supplied
  *        lock with an operating environment specific locking construct.
  *
  * @param[in]  controller This parameter specifies the controller with
  *             which this lock is to be de-associated.
  * @param[in]  lock This parameter specifies the lock for which the
  *             user should de-associate an operating environment specific
  *             locking object.
  *
  * @see The SCI_LOCK_LEVEL enumeration for more information.
  *
  * @return none.
  */
 void
 scif_cb_lock_disassociate(SCI_CONTROLLER_HANDLE_T controller,
     SCI_LOCK_HANDLE_T lock)
 {
 
 }
 
 
 /**
  * @brief This callback method asks the user to acquire/get the lock.
  *        This method should pend until the lock has been acquired.
  *
  * @param[in]  controller This parameter specifies the controller with
  *             which this lock is associated.
  * @param[in]  lock This parameter specifies the lock to be acquired.
  *
  * @return none
  */
 void
 scif_cb_lock_acquire(SCI_CONTROLLER_HANDLE_T controller,
     SCI_LOCK_HANDLE_T lock)
 {
 
 }
 
 /**
  * @brief This callback method asks the user to release a lock.
  *
  * @param[in]  controller This parameter specifies the controller with
  *             which this lock is associated.
  * @param[in]  lock This parameter specifies the lock to be released.
  *
  * @return none
  */
 void
 scif_cb_lock_release(SCI_CONTROLLER_HANDLE_T controller,
     SCI_LOCK_HANDLE_T lock)
 {
 }
 
 /**
  * @brief This callback method creates an OS specific deferred task
  *        for internal usage. The handler to deferred task is stored by OS
  *        driver.
  *
  * @param[in] controller This parameter specifies the controller object
  *            with which this callback is associated.
  *
  * @return none
  */
 void
 scif_cb_start_internal_io_task_create(SCI_CONTROLLER_HANDLE_T controller)
 {
 
 }
 
 /**
  * @brief This callback method schedules a OS specific deferred task.
  *
  * @param[in] controller This parameter specifies the controller
  *            object with which this callback is associated.
  * @param[in] start_internal_io_task_routine This parameter specifies the
  *            sci start_internal_io routine.
  * @param[in] context This parameter specifies a handle to a parameter
  *            that will be passed into the "start_internal_io_task_routine"
  *            when it is invoked.
  *
  * @return none
  */
 void
 scif_cb_start_internal_io_task_schedule(SCI_CONTROLLER_HANDLE_T scif_controller,
     FUNCPTR start_internal_io_task_routine, void *context)
 {
 	/** @todo Use FreeBSD tasklet to defer this routine to a later time,
 	 *  rather than calling the routine inline.
 	 */
 	SCI_START_INTERNAL_IO_ROUTINE sci_start_internal_io_routine =
 	    (SCI_START_INTERNAL_IO_ROUTINE)start_internal_io_task_routine;
 
 	sci_start_internal_io_routine(context);
 }
 
 /**
  * @brief In this method the user must write to PCI memory via access.
  *        This method is used for access to memory space and IO space.
  *
  * @param[in]  controller The controller for which to read a DWORD.
  * @param[in]  address This parameter depicts the address into
  *             which to write.
  * @param[out] write_value This parameter depicts the value being written
  *             into the PCI memory location.
  *
  * @todo These PCI memory access calls likely needs to be optimized into macros?
  */
 void
 scic_cb_pci_write_dword(SCI_CONTROLLER_HANDLE_T scic_controller,
     void *address, uint32_t write_value)
 {
 	SCI_CONTROLLER_HANDLE_T scif_controller =
 	    (SCI_CONTROLLER_HANDLE_T) sci_object_get_association(scic_controller);
 	struct ISCI_CONTROLLER *isci_controller =
 	    (struct ISCI_CONTROLLER *) sci_object_get_association(scif_controller);
 	struct isci_softc *isci = isci_controller->isci;
 	uint32_t bar = (uint32_t)(((POINTER_UINT)address & 0xF0000000) >> 28);
 	bus_size_t offset = (bus_size_t)((POINTER_UINT)address & 0x0FFFFFFF);
 
 	bus_space_write_4(isci->pci_bar[bar].bus_tag,
 	    isci->pci_bar[bar].bus_handle, offset, write_value);
 }
 
 /**
  * @brief In this method the user must read from PCI memory via access.
  *        This method is used for access to memory space and IO space.
  *
  * @param[in]  controller The controller for which to read a DWORD.
  * @param[in]  address This parameter depicts the address from
  *             which to read.
  *
  * @return The value being returned from the PCI memory location.
  *
  * @todo This PCI memory access calls likely need to be optimized into macro?
  */
 uint32_t
 scic_cb_pci_read_dword(SCI_CONTROLLER_HANDLE_T scic_controller, void *address)
 {
 	SCI_CONTROLLER_HANDLE_T scif_controller =
 		(SCI_CONTROLLER_HANDLE_T)sci_object_get_association(scic_controller);
 	struct ISCI_CONTROLLER *isci_controller =
 		(struct ISCI_CONTROLLER *)sci_object_get_association(scif_controller);
 	struct isci_softc *isci = isci_controller->isci;
 	uint32_t bar = (uint32_t)(((POINTER_UINT)address & 0xF0000000) >> 28);
 	bus_size_t offset = (bus_size_t)((POINTER_UINT)address & 0x0FFFFFFF);
 
 	return (bus_space_read_4(isci->pci_bar[bar].bus_tag,
 	    isci->pci_bar[bar].bus_handle, offset));
 }
 
 /**
  * @brief This method is called when the core requires the OS driver
  *        to stall execution.  This method is utilized during initialization
  *        or non-performance paths only.
  *
  * @param[in]  microseconds This parameter specifies the number of
  *             microseconds for which to stall.  The operating system driver
  *             is allowed to round this value up where necessary.
  *
  * @return none.
  */
 void
 scic_cb_stall_execution(uint32_t microseconds)
 {
 
 	DELAY(microseconds);
 }
 
 /**
  * @brief In this method the user must return the base address register (BAR)
  *        value for the supplied base address register number.
  *
  * @param[in] controller The controller for which to retrieve the bar number.
  * @param[in] bar_number This parameter depicts the BAR index/number to be read.
  *
  * @return Return a pointer value indicating the contents of the BAR.
  * @retval NULL indicates an invalid BAR index/number was specified.
  * @retval All other values indicate a valid VIRTUAL address from the BAR.
  */
 void *
 scic_cb_pci_get_bar(SCI_CONTROLLER_HANDLE_T controller,
     uint16_t bar_number)
 {
 
 	return ((void *)(POINTER_UINT)((uint32_t)bar_number << 28));
 }
 
 /**
  * @brief This method informs the SCI Core user that a phy/link became
  *        ready, but the phy is not allowed in the port.  In some
  *        situations the underlying hardware only allows for certain phy
  *        to port mappings.  If these mappings are violated, then this
  *        API is invoked.
  *
  * @param[in] controller This parameter represents the controller which
  *            contains the port.
  * @param[in] port This parameter specifies the SCI port object for which
  *            the callback is being invoked.
  * @param[in] phy This parameter specifies the phy that came ready, but the
  *            phy can't be a valid member of the port.
  *
  * @return none
  */
 void
 scic_cb_port_invalid_link_up(SCI_CONTROLLER_HANDLE_T controller,
     SCI_PORT_HANDLE_T port, SCI_PHY_HANDLE_T phy)
 {
 
 }
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index dfcaa01d366b..7542b17e19eb 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -1,1532 +1,1531 @@
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
  *
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
  *	Bill Paul <william.paul@windriver.com>.  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.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by Bill Paul.
  * 4. Neither the name of the author nor the names of any co-contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
  * 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.
  */
 
 #include <sys/cdefs.h>
 /*
  * Level 1 LXT1001 gigabit ethernet driver for FreeBSD. Public
  * documentation not available, but ask me nicely.
  *
  * The Level 1 chip is used on some D-Link, SMC and Addtron NICs.
  * It's a 64-bit PCI part that supports TCP/IP checksum offload,
  * VLAN tagging/insertion, GMII and TBI (1000baseX) ports. There
  * are three supported methods for data transfer between host and
  * NIC: programmed I/O, traditional scatter/gather DMA and Packet
  * Propulsion Technology (tm) DMA. The latter mechanism is a form
  * of double buffer DMA where the packet data is copied to a
  * pre-allocated DMA buffer who's physical address has been loaded
  * into a table at device initialization time. The rationale is that
  * the virtual to physical address translation needed for normal
  * scatter/gather DMA is more expensive than the data copy needed
  * for double buffering. This may be true in Windows NT and the like,
  * but it isn't true for us, at least on the x86 arch. This driver
  * uses the scatter/gather I/O method for both TX and RX.
  *
  * The LXT1001 only supports TCP/IP checksum offload on receive.
  * Also, the VLAN tagging is done using a 16-entry table which allows
  * the chip to perform hardware filtering based on VLAN tags. Sadly,
  * our vlan support doesn't currently play well with this kind of
  * hardware support.
  *
  * Special thanks to:
  * - Jeff James at Intel, for arranging to have the LXT1001 manual
  *   released (at long last)
  * - Beny Chen at D-Link, for actually sending it to me
  * - Brad Short and Keith Alexis at SMC, for sending me sample
  *   SMC9462SX and SMC9462TX adapters for testing
  * - Paul Saab at Y!, for not killing me (though it remains to be seen
  *   if in fact he did me much of a favor)
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/socket.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
 
 #include <net/bpf.h>
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
 #define LGE_USEIOSPACE
 
 #include <dev/lge/if_lgereg.h>
 
 /* "device miibus" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
 
 /*
  * Various supported device vendors/types and their names.
  */
 static const struct lge_type lge_devs[] = {
 	{ LGE_VENDORID, LGE_DEVICEID, "Level 1 Gigabit Ethernet" },
 	{ 0, 0, NULL }
 };
 
 static int lge_probe(device_t);
 static int lge_attach(device_t);
 static int lge_detach(device_t);
 
 static int lge_alloc_jumbo_mem(struct lge_softc *);
 static void lge_free_jumbo_mem(struct lge_softc *);
 static void *lge_jalloc(struct lge_softc *);
 static void lge_jfree(struct mbuf *);
 
 static int lge_newbuf(struct lge_softc *, struct lge_rx_desc *, struct mbuf *);
 static int lge_encap(struct lge_softc *, struct mbuf *, u_int32_t *);
 static void lge_rxeof(struct lge_softc *, int);
 static void lge_rxeoc(struct lge_softc *);
 static void lge_txeof(struct lge_softc *);
 static void lge_intr(void *);
 static void lge_tick(void *);
 static void lge_start(if_t);
 static void lge_start_locked(if_t);
 static int lge_ioctl(if_t, u_long, caddr_t);
 static void lge_init(void *);
 static void lge_init_locked(struct lge_softc *);
 static void lge_stop(struct lge_softc *);
 static void lge_watchdog(struct lge_softc *);
 static int lge_shutdown(device_t);
 static int lge_ifmedia_upd(if_t);
 static void lge_ifmedia_upd_locked(if_t);
 static void lge_ifmedia_sts(if_t, struct ifmediareq *);
 
 static void lge_eeprom_getword(struct lge_softc *, int, u_int16_t *);
 static void lge_read_eeprom(struct lge_softc *, caddr_t, int, int, int);
 
 static int lge_miibus_readreg(device_t, int, int);
 static int lge_miibus_writereg(device_t, int, int, int);
 static void lge_miibus_statchg(device_t);
 
 static void lge_setmulti(struct lge_softc *);
 static void lge_reset(struct lge_softc *);
 static int lge_list_rx_init(struct lge_softc *);
 static int lge_list_tx_init(struct lge_softc *);
 
 #ifdef LGE_USEIOSPACE
 #define LGE_RES			SYS_RES_IOPORT
 #define LGE_RID			LGE_PCI_LOIO
 #else
 #define LGE_RES			SYS_RES_MEMORY
 #define LGE_RID			LGE_PCI_LOMEM
 #endif
 
 static device_method_t lge_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		lge_probe),
 	DEVMETHOD(device_attach,	lge_attach),
 	DEVMETHOD(device_detach,	lge_detach),
 	DEVMETHOD(device_shutdown,	lge_shutdown),
 
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	lge_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	lge_miibus_writereg),
 	DEVMETHOD(miibus_statchg,	lge_miibus_statchg),
 
 	DEVMETHOD_END
 };
 
 static driver_t lge_driver = {
 	"lge",
 	lge_methods,
 	sizeof(struct lge_softc)
 };
 
 DRIVER_MODULE(lge, pci, lge_driver, 0, 0);
 DRIVER_MODULE(miibus, lge, miibus_driver, 0, 0);
 MODULE_DEPEND(lge, pci, 1, 1, 1);
 MODULE_DEPEND(lge, ether, 1, 1, 1);
 MODULE_DEPEND(lge, miibus, 1, 1, 1);
 
 #define LGE_SETBIT(sc, reg, x)				\
 	CSR_WRITE_4(sc, reg,				\
 		CSR_READ_4(sc, reg) | (x))
 
 #define LGE_CLRBIT(sc, reg, x)				\
 	CSR_WRITE_4(sc, reg,				\
 		CSR_READ_4(sc, reg) & ~(x))
 
 #define SIO_SET(x)					\
 	CSR_WRITE_4(sc, LGE_MEAR, CSR_READ_4(sc, LGE_MEAR) | x)
 
 #define SIO_CLR(x)					\
 	CSR_WRITE_4(sc, LGE_MEAR, CSR_READ_4(sc, LGE_MEAR) & ~x)
 
 /*
  * Read a word of data stored in the EEPROM at address 'addr.'
  */
 static void
 lge_eeprom_getword(struct lge_softc *sc, int addr, u_int16_t *dest)
 {
 	int			i;
 	u_int32_t		val;
 
 	CSR_WRITE_4(sc, LGE_EECTL, LGE_EECTL_CMD_READ|
 	    LGE_EECTL_SINGLEACCESS|((addr >> 1) << 8));
 
 	for (i = 0; i < LGE_TIMEOUT; i++)
 		if (!(CSR_READ_4(sc, LGE_EECTL) & LGE_EECTL_CMD_READ))
 			break;
 
 	if (i == LGE_TIMEOUT) {
 		device_printf(sc->lge_dev, "EEPROM read timed out\n");
 		return;
 	}
 
 	val = CSR_READ_4(sc, LGE_EEDATA);
 
 	if (addr & 1)
 		*dest = (val >> 16) & 0xFFFF;
 	else
 		*dest = val & 0xFFFF;
 
 	return;
 }
 
 /*
  * Read a sequence of words from the EEPROM.
  */
 static void
 lge_read_eeprom(struct lge_softc *sc, caddr_t dest, int off, int cnt, int swap)
 {
 	int			i;
 	u_int16_t		word = 0, *ptr;
 
 	for (i = 0; i < cnt; i++) {
 		lge_eeprom_getword(sc, off + i, &word);
 		ptr = (u_int16_t *)(dest + (i * 2));
 		if (swap)
 			*ptr = ntohs(word);
 		else
 			*ptr = word;
 	}
 
 	return;
 }
 
 static int
 lge_miibus_readreg(device_t dev, int phy, int reg)
 {
 	struct lge_softc	*sc;
 	int			i;
 
 	sc = device_get_softc(dev);
 
 	/*
 	 * If we have a non-PCS PHY, pretend that the internal
 	 * autoneg stuff at PHY address 0 isn't there so that
 	 * the miibus code will find only the GMII PHY.
 	 */
 	if (sc->lge_pcs == 0 && phy == 0)
 		return(0);
 
 	CSR_WRITE_4(sc, LGE_GMIICTL, (phy << 8) | reg | LGE_GMIICMD_READ);
 
 	for (i = 0; i < LGE_TIMEOUT; i++)
 		if (!(CSR_READ_4(sc, LGE_GMIICTL) & LGE_GMIICTL_CMDBUSY))
 			break;
 
 	if (i == LGE_TIMEOUT) {
 		device_printf(sc->lge_dev, "PHY read timed out\n");
 		return(0);
 	}
 
 	return(CSR_READ_4(sc, LGE_GMIICTL) >> 16);
 }
 
 static int
 lge_miibus_writereg(device_t dev, int phy, int reg, int data)
 {
 	struct lge_softc	*sc;
 	int			i;
 
 	sc = device_get_softc(dev);
 
 	CSR_WRITE_4(sc, LGE_GMIICTL,
 	    (data << 16) | (phy << 8) | reg | LGE_GMIICMD_WRITE);
 
 	for (i = 0; i < LGE_TIMEOUT; i++)
 		if (!(CSR_READ_4(sc, LGE_GMIICTL) & LGE_GMIICTL_CMDBUSY))
 			break;
 
 	if (i == LGE_TIMEOUT) {
 		device_printf(sc->lge_dev, "PHY write timed out\n");
 		return(0);
 	}
 
 	return(0);
 }
 
 static void
 lge_miibus_statchg(device_t dev)
 {
 	struct lge_softc	*sc;
 	struct mii_data		*mii;
 
 	sc = device_get_softc(dev);
 	mii = device_get_softc(sc->lge_miibus);
 
 	LGE_CLRBIT(sc, LGE_GMIIMODE, LGE_GMIIMODE_SPEED);
 	switch (IFM_SUBTYPE(mii->mii_media_active)) {
 	case IFM_1000_T:
 	case IFM_1000_SX:
 		LGE_SETBIT(sc, LGE_GMIIMODE, LGE_SPEED_1000);
 		break;
 	case IFM_100_TX:
 		LGE_SETBIT(sc, LGE_GMIIMODE, LGE_SPEED_100);
 		break;
 	case IFM_10_T:
 		LGE_SETBIT(sc, LGE_GMIIMODE, LGE_SPEED_10);
 		break;
 	default:
 		/*
 		 * Choose something, even if it's wrong. Clearing
 		 * all the bits will hose autoneg on the internal
 		 * PHY.
 		 */
 		LGE_SETBIT(sc, LGE_GMIIMODE, LGE_SPEED_1000);
 		break;
 	}
 
 	if ((mii->mii_media_active & IFM_GMASK) == IFM_FDX) {
 		LGE_SETBIT(sc, LGE_GMIIMODE, LGE_GMIIMODE_FDX);
 	} else {
 		LGE_CLRBIT(sc, LGE_GMIIMODE, LGE_GMIIMODE_FDX);
 	}
 
 	return;
 }
 
 static u_int
 lge_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_int count)
 {
 	uint32_t h, *hashes = arg;
 
 	h = ether_crc32_be(LLADDR(sdl), ETHER_ADDR_LEN) >> 26;
 	if (h < 32)
 		hashes[0] |= (1 << h);
 	else
 		hashes[1] |= (1 << (h - 32));
 	return (1);
 }
 
 static void
 lge_setmulti(struct lge_softc *sc)
 {
 	if_t			ifp;
 	uint32_t hashes[2] = { 0, 0 };
 
 	ifp = sc->lge_ifp;
 	LGE_LOCK_ASSERT(sc);
 
 	/* Make sure multicast hash table is enabled. */
 	CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_SETRST_CTL1|LGE_MODE1_RX_MCAST);
 
 	if (if_getflags(ifp) & IFF_ALLMULTI || if_getflags(ifp) & IFF_PROMISC) {
 		CSR_WRITE_4(sc, LGE_MAR0, 0xFFFFFFFF);
 		CSR_WRITE_4(sc, LGE_MAR1, 0xFFFFFFFF);
 		return;
 	}
 
 	/* first, zot all the existing hash bits */
 	CSR_WRITE_4(sc, LGE_MAR0, 0);
 	CSR_WRITE_4(sc, LGE_MAR1, 0);
 
 	/* now program new ones */
 	if_foreach_llmaddr(ifp, lge_hash_maddr, hashes);
 
 	CSR_WRITE_4(sc, LGE_MAR0, hashes[0]);
 	CSR_WRITE_4(sc, LGE_MAR1, hashes[1]);
 
 	return;
 }
 
 static void
 lge_reset(struct lge_softc *sc)
 {
 	int			i;
 
 	LGE_SETBIT(sc, LGE_MODE1, LGE_MODE1_SETRST_CTL0|LGE_MODE1_SOFTRST);
 
 	for (i = 0; i < LGE_TIMEOUT; i++) {
 		if (!(CSR_READ_4(sc, LGE_MODE1) & LGE_MODE1_SOFTRST))
 			break;
 	}
 
 	if (i == LGE_TIMEOUT)
 		device_printf(sc->lge_dev, "reset never completed\n");
 
 	/* Wait a little while for the chip to get its brains in order. */
 	DELAY(1000);
 
 	return;
 }
 
 /*
  * Probe for a Level 1 chip. Check the PCI vendor and device
  * IDs against our list and return a device name if we find a match.
  */
 static int
 lge_probe(device_t dev)
 {
 	const struct lge_type	*t;
 
 	t = lge_devs;
 
 	while(t->lge_name != NULL) {
 		if ((pci_get_vendor(dev) == t->lge_vid) &&
 		    (pci_get_device(dev) == t->lge_did)) {
 			device_set_desc(dev, t->lge_name);
 			return(BUS_PROBE_DEFAULT);
 		}
 		t++;
 	}
 
 	return(ENXIO);
 }
 
 /*
  * Attach the interface. Allocate softc structures, do ifmedia
  * setup and ethernet/BPF attach.
  */
 static int
 lge_attach(device_t dev)
 {
 	u_char			eaddr[ETHER_ADDR_LEN];
 	struct lge_softc	*sc;
 	if_t			ifp = NULL;
 	int			error = 0, rid;
 
 	sc = device_get_softc(dev);
 	sc->lge_dev = dev;
 
 	mtx_init(&sc->lge_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF);
 	callout_init_mtx(&sc->lge_stat_callout, &sc->lge_mtx, 0);
 
 	/*
 	 * Map control/status registers.
 	 */
 	pci_enable_busmaster(dev);
 
 	rid = LGE_RID;
 	sc->lge_res = bus_alloc_resource_any(dev, LGE_RES, &rid, RF_ACTIVE);
 
 	if (sc->lge_res == NULL) {
 		device_printf(dev, "couldn't map ports/memory\n");
 		error = ENXIO;
 		goto fail;
 	}
 
 	sc->lge_btag = rman_get_bustag(sc->lge_res);
 	sc->lge_bhandle = rman_get_bushandle(sc->lge_res);
 
 	/* Allocate interrupt */
 	rid = 0;
 	sc->lge_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 	    RF_SHAREABLE | RF_ACTIVE);
 
 	if (sc->lge_irq == NULL) {
 		device_printf(dev, "couldn't map interrupt\n");
 		error = ENXIO;
 		goto fail;
 	}
 
 	/* Reset the adapter. */
 	lge_reset(sc);
 
 	/*
 	 * Get station address from the EEPROM.
 	 */
 	lge_read_eeprom(sc, (caddr_t)&eaddr[0], LGE_EE_NODEADDR_0, 1, 0);
 	lge_read_eeprom(sc, (caddr_t)&eaddr[2], LGE_EE_NODEADDR_1, 1, 0);
 	lge_read_eeprom(sc, (caddr_t)&eaddr[4], LGE_EE_NODEADDR_2, 1, 0);
 
 	sc->lge_ldata = contigmalloc(sizeof(struct lge_list_data), M_DEVBUF,
 	    M_NOWAIT | M_ZERO, 0, 0xffffffff, PAGE_SIZE, 0);
 
 	if (sc->lge_ldata == NULL) {
 		device_printf(dev, "no memory for list buffers!\n");
 		error = ENXIO;
 		goto fail;
 	}
 
 	/* Try to allocate memory for jumbo buffers. */
 	if (lge_alloc_jumbo_mem(sc)) {
 		device_printf(dev, "jumbo buffer allocation failed\n");
 		error = ENXIO;
 		goto fail;
 	}
 
 	ifp = sc->lge_ifp = if_alloc(IFT_ETHER);
 	if_setsoftc(ifp, sc);
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	if_setflags(ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);
 	if_setioctlfn(ifp, lge_ioctl);
 	if_setstartfn(ifp, lge_start);
 	if_setinitfn(ifp, lge_init);
 	if_setsendqlen(ifp, LGE_TX_LIST_CNT - 1);
 	if_setcapabilities(ifp, IFCAP_RXCSUM);
 	if_setcapenable(ifp, if_getcapabilities(ifp));
 
 	if (CSR_READ_4(sc, LGE_GMIIMODE) & LGE_GMIIMODE_PCSENH)
 		sc->lge_pcs = 1;
 	else
 		sc->lge_pcs = 0;
 
 	/*
 	 * Do MII setup.
 	 */
 	error = mii_attach(dev, &sc->lge_miibus, ifp, lge_ifmedia_upd,
 	    lge_ifmedia_sts, BMSR_DEFCAPMASK, MII_PHY_ANY, MII_OFFSET_ANY, 0);
 	if (error != 0) {
 		device_printf(dev, "attaching PHYs failed\n");
 		goto fail;
 	}
 
 	/*
 	 * Call MI attach routine.
 	 */
 	ether_ifattach(ifp, eaddr);
 
 	error = bus_setup_intr(dev, sc->lge_irq, INTR_TYPE_NET | INTR_MPSAFE,
 	    NULL, lge_intr, sc, &sc->lge_intrhand);
 
 	if (error) {
 		ether_ifdetach(ifp);
 		device_printf(dev, "couldn't set up irq\n");
 		goto fail;
 	}
 	return (0);
 
 fail:
 	lge_free_jumbo_mem(sc);
 	if (sc->lge_ldata)
-		contigfree(sc->lge_ldata,
-		    sizeof(struct lge_list_data), M_DEVBUF);
+		free(sc->lge_ldata, M_DEVBUF);
 	if (ifp)
 		if_free(ifp);
 	if (sc->lge_irq)
 		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->lge_irq);
 	if (sc->lge_res)
 		bus_release_resource(dev, LGE_RES, LGE_RID, sc->lge_res);
 	mtx_destroy(&sc->lge_mtx);
 	return(error);
 }
 
 static int
 lge_detach(device_t dev)
 {
 	struct lge_softc	*sc;
 	if_t			ifp;
 
 	sc = device_get_softc(dev);
 	ifp = sc->lge_ifp;
 
 	LGE_LOCK(sc);
 	lge_reset(sc);
 	lge_stop(sc);
 	LGE_UNLOCK(sc);
 	callout_drain(&sc->lge_stat_callout);
 	ether_ifdetach(ifp);
 
 	bus_generic_detach(dev);
 	device_delete_child(dev, sc->lge_miibus);
 
 	bus_teardown_intr(dev, sc->lge_irq, sc->lge_intrhand);
 	bus_release_resource(dev, SYS_RES_IRQ, 0, sc->lge_irq);
 	bus_release_resource(dev, LGE_RES, LGE_RID, sc->lge_res);
 
-	contigfree(sc->lge_ldata, sizeof(struct lge_list_data), M_DEVBUF);
+	free(sc->lge_ldata, M_DEVBUF);
 	if_free(ifp);
 	lge_free_jumbo_mem(sc);
 	mtx_destroy(&sc->lge_mtx);
 
 	return(0);
 }
 
 /*
  * Initialize the transmit descriptors.
  */
 static int
 lge_list_tx_init(struct lge_softc *sc)
 {
 	struct lge_list_data	*ld;
 	struct lge_ring_data	*cd;
 	int			i;
 
 	cd = &sc->lge_cdata;
 	ld = sc->lge_ldata;
 	for (i = 0; i < LGE_TX_LIST_CNT; i++) {
 		ld->lge_tx_list[i].lge_mbuf = NULL;
 		ld->lge_tx_list[i].lge_ctl = 0;
 	}
 
 	cd->lge_tx_prod = cd->lge_tx_cons = 0;
 
 	return(0);
 }
 
 
 /*
  * Initialize the RX descriptors and allocate mbufs for them. Note that
  * we arralge the descriptors in a closed ring, so that the last descriptor
  * points back to the first.
  */
 static int
 lge_list_rx_init(struct lge_softc *sc)
 {
 	struct lge_list_data	*ld;
 	struct lge_ring_data	*cd;
 	int			i;
 
 	ld = sc->lge_ldata;
 	cd = &sc->lge_cdata;
 
 	cd->lge_rx_prod = cd->lge_rx_cons = 0;
 
 	CSR_WRITE_4(sc, LGE_RXDESC_ADDR_HI, 0);
 
 	for (i = 0; i < LGE_RX_LIST_CNT; i++) {
 		if (CSR_READ_1(sc, LGE_RXCMDFREE_8BIT) == 0)
 			break;
 		if (lge_newbuf(sc, &ld->lge_rx_list[i], NULL) == ENOBUFS)
 			return(ENOBUFS);
 	}
 
 	/* Clear possible 'rx command queue empty' interrupt. */
 	CSR_READ_4(sc, LGE_ISR);
 
 	return(0);
 }
 
 /*
  * Initialize an RX descriptor and attach an MBUF cluster.
  */
 static int
 lge_newbuf(struct lge_softc *sc, struct lge_rx_desc *c, struct mbuf *m)
 {
 	struct mbuf		*m_new = NULL;
 	char			*buf = NULL;
 
 	if (m == NULL) {
 		MGETHDR(m_new, M_NOWAIT, MT_DATA);
 		if (m_new == NULL) {
 			device_printf(sc->lge_dev, "no memory for rx list "
 			    "-- packet dropped!\n");
 			return(ENOBUFS);
 		}
 
 		/* Allocate the jumbo buffer */
 		buf = lge_jalloc(sc);
 		if (buf == NULL) {
 #ifdef LGE_VERBOSE
 			device_printf(sc->lge_dev, "jumbo allocation failed "
 			    "-- packet dropped!\n");
 #endif
 			m_freem(m_new);
 			return(ENOBUFS);
 		}
 		/* Attach the buffer to the mbuf */
 		m_new->m_len = m_new->m_pkthdr.len = LGE_JUMBO_FRAMELEN;
 		m_extadd(m_new, buf, LGE_JUMBO_FRAMELEN, lge_jfree, sc, NULL,
 		    0, EXT_NET_DRV);
 	} else {
 		m_new = m;
 		m_new->m_len = m_new->m_pkthdr.len = LGE_JUMBO_FRAMELEN;
 		m_new->m_data = m_new->m_ext.ext_buf;
 	}
 
 	/*
 	 * Adjust alignment so packet payload begins on a
 	 * longword boundary. Mandatory for Alpha, useful on
 	 * x86 too.
 	*/
 	m_adj(m_new, ETHER_ALIGN);
 
 	c->lge_mbuf = m_new;
 	c->lge_fragptr_hi = 0;
 	c->lge_fragptr_lo = vtophys(mtod(m_new, caddr_t));
 	c->lge_fraglen = m_new->m_len;
 	c->lge_ctl = m_new->m_len | LGE_RXCTL_WANTINTR | LGE_FRAGCNT(1);
 	c->lge_sts = 0;
 
 	/*
 	 * Put this buffer in the RX command FIFO. To do this,
 	 * we just write the physical address of the descriptor
 	 * into the RX descriptor address registers. Note that
 	 * there are two registers, one high DWORD and one low
 	 * DWORD, which lets us specify a 64-bit address if
 	 * desired. We only use a 32-bit address for now.
 	 * Writing to the low DWORD register is what actually
 	 * causes the command to be issued, so we do that
 	 * last.
 	 */
 	CSR_WRITE_4(sc, LGE_RXDESC_ADDR_LO, vtophys(c));
 	LGE_INC(sc->lge_cdata.lge_rx_prod, LGE_RX_LIST_CNT);
 
 	return(0);
 }
 
 static int
 lge_alloc_jumbo_mem(struct lge_softc *sc)
 {
 	caddr_t			ptr;
 	int			i;
 	struct lge_jpool_entry   *entry;
 
 	/* Grab a big chunk o' storage. */
 	sc->lge_cdata.lge_jumbo_buf = contigmalloc(LGE_JMEM, M_DEVBUF,
 	    M_NOWAIT, 0, 0xffffffff, PAGE_SIZE, 0);
 
 	if (sc->lge_cdata.lge_jumbo_buf == NULL) {
 		device_printf(sc->lge_dev, "no memory for jumbo buffers!\n");
 		return(ENOBUFS);
 	}
 
 	SLIST_INIT(&sc->lge_jfree_listhead);
 	SLIST_INIT(&sc->lge_jinuse_listhead);
 
 	/*
 	 * Now divide it up into 9K pieces and save the addresses
 	 * in an array.
 	 */
 	ptr = sc->lge_cdata.lge_jumbo_buf;
 	for (i = 0; i < LGE_JSLOTS; i++) {
 		sc->lge_cdata.lge_jslots[i] = ptr;
 		ptr += LGE_JLEN;
 		entry = malloc(sizeof(struct lge_jpool_entry),
 		    M_DEVBUF, M_NOWAIT);
 		if (entry == NULL) {
 			device_printf(sc->lge_dev, "no memory for jumbo "
 			    "buffer queue!\n");
 			return(ENOBUFS);
 		}
 		entry->slot = i;
 		SLIST_INSERT_HEAD(&sc->lge_jfree_listhead,
 		    entry, jpool_entries);
 	}
 
 	return(0);
 }
 
 static void
 lge_free_jumbo_mem(struct lge_softc *sc)
 {
 	struct lge_jpool_entry	*entry;
 
 	if (sc->lge_cdata.lge_jumbo_buf == NULL)
 		return;
 
 	while ((entry = SLIST_FIRST(&sc->lge_jinuse_listhead))) {
 		device_printf(sc->lge_dev,
 		    "asked to free buffer that is in use!\n");
 		SLIST_REMOVE_HEAD(&sc->lge_jinuse_listhead, jpool_entries);
 		SLIST_INSERT_HEAD(&sc->lge_jfree_listhead, entry,
 		    jpool_entries);
 	}
 	while (!SLIST_EMPTY(&sc->lge_jfree_listhead)) {
 		entry = SLIST_FIRST(&sc->lge_jfree_listhead);
 		SLIST_REMOVE_HEAD(&sc->lge_jfree_listhead, jpool_entries);
 		free(entry, M_DEVBUF);
 	}
 
-	contigfree(sc->lge_cdata.lge_jumbo_buf, LGE_JMEM, M_DEVBUF);
+	free(sc->lge_cdata.lge_jumbo_buf, M_DEVBUF);
 
 	return;
 }
 
 /*
  * Allocate a jumbo buffer.
  */
 static void *
 lge_jalloc(struct lge_softc *sc)
 {
 	struct lge_jpool_entry   *entry;
 
 	entry = SLIST_FIRST(&sc->lge_jfree_listhead);
 
 	if (entry == NULL) {
 #ifdef LGE_VERBOSE
 		device_printf(sc->lge_dev, "no free jumbo buffers\n");
 #endif
 		return(NULL);
 	}
 
 	SLIST_REMOVE_HEAD(&sc->lge_jfree_listhead, jpool_entries);
 	SLIST_INSERT_HEAD(&sc->lge_jinuse_listhead, entry, jpool_entries);
 	return(sc->lge_cdata.lge_jslots[entry->slot]);
 }
 
 /*
  * Release a jumbo buffer.
  */
 static void
 lge_jfree(struct mbuf *m)
 {
 	struct lge_softc	*sc;
 	int		        i;
 	struct lge_jpool_entry   *entry;
 
 	/* Extract the softc struct pointer. */
 	sc = m->m_ext.ext_arg1;
 
 	if (sc == NULL)
 		panic("lge_jfree: can't find softc pointer!");
 
 	/* calculate the slot this buffer belongs to */
 	i = ((vm_offset_t)m->m_ext.ext_buf
 	     - (vm_offset_t)sc->lge_cdata.lge_jumbo_buf) / LGE_JLEN;
 
 	if ((i < 0) || (i >= LGE_JSLOTS))
 		panic("lge_jfree: asked to free buffer that we don't manage!");
 
 	entry = SLIST_FIRST(&sc->lge_jinuse_listhead);
 	if (entry == NULL)
 		panic("lge_jfree: buffer not in use!");
 	entry->slot = i;
 	SLIST_REMOVE_HEAD(&sc->lge_jinuse_listhead, jpool_entries);
 	SLIST_INSERT_HEAD(&sc->lge_jfree_listhead, entry, jpool_entries);
 }
 
 /*
  * A frame has been uploaded: pass the resulting mbuf chain up to
  * the higher level protocols.
  */
 static void
 lge_rxeof(struct lge_softc *sc, int cnt)
 {
         struct mbuf		*m;
         if_t ifp;
 	struct lge_rx_desc	*cur_rx;
 	int			c, i, total_len = 0;
 	u_int32_t		rxsts, rxctl;
 
 	ifp = sc->lge_ifp;
 
 	/* Find out how many frames were processed. */
 	c = cnt;
 	i = sc->lge_cdata.lge_rx_cons;
 
 	/* Suck them in. */
 	while(c) {
 		struct mbuf		*m0 = NULL;
 
 		cur_rx = &sc->lge_ldata->lge_rx_list[i];
 		rxctl = cur_rx->lge_ctl;
 		rxsts = cur_rx->lge_sts;
 		m = cur_rx->lge_mbuf;
 		cur_rx->lge_mbuf = NULL;
 		total_len = LGE_RXBYTES(cur_rx);
 		LGE_INC(i, LGE_RX_LIST_CNT);
 		c--;
 
 		/*
 		 * If an error occurs, update stats, clear the
 		 * status word and leave the mbuf cluster in place:
 		 * it should simply get re-used next time this descriptor
 	 	 * comes up in the ring.
 		 */
 		if (rxctl & LGE_RXCTL_ERRMASK) {
 			if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 			lge_newbuf(sc, &LGE_RXTAIL(sc), m);
 			continue;
 		}
 
 		if (lge_newbuf(sc, &LGE_RXTAIL(sc), NULL) == ENOBUFS) {
 			m0 = m_devget(mtod(m, char *), total_len, ETHER_ALIGN,
 			    ifp, NULL);
 			lge_newbuf(sc, &LGE_RXTAIL(sc), m);
 			if (m0 == NULL) {
 				device_printf(sc->lge_dev, "no receive buffers "
 				    "available -- packet dropped!\n");
 				if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
 				continue;
 			}
 			m = m0;
 		} else {
 			m->m_pkthdr.rcvif = ifp;
 			m->m_pkthdr.len = m->m_len = total_len;
 		}
 
 		if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1);
 
 		/* Do IP checksum checking. */
 		if (rxsts & LGE_RXSTS_ISIP)
 			m->m_pkthdr.csum_flags |= CSUM_IP_CHECKED;
 		if (!(rxsts & LGE_RXSTS_IPCSUMERR))
 			m->m_pkthdr.csum_flags |= CSUM_IP_VALID;
 		if ((rxsts & LGE_RXSTS_ISTCP &&
 		    !(rxsts & LGE_RXSTS_TCPCSUMERR)) ||
 		    (rxsts & LGE_RXSTS_ISUDP &&
 		    !(rxsts & LGE_RXSTS_UDPCSUMERR))) {
 			m->m_pkthdr.csum_flags |=
 			    CSUM_DATA_VALID|CSUM_PSEUDO_HDR;
 			m->m_pkthdr.csum_data = 0xffff;
 		}
 
 		LGE_UNLOCK(sc);
 		if_input(ifp, m);
 		LGE_LOCK(sc);
 	}
 
 	sc->lge_cdata.lge_rx_cons = i;
 
 	return;
 }
 
 static void
 lge_rxeoc(struct lge_softc *sc)
 {
 	if_t			ifp;
 
 	ifp = sc->lge_ifp;
 	if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING);
 	lge_init_locked(sc);
 	return;
 }
 
 /*
  * A frame was downloaded to the chip. It's safe for us to clean up
  * the list buffers.
  */
 
 static void
 lge_txeof(struct lge_softc *sc)
 {
 	struct lge_tx_desc	*cur_tx = NULL;
 	if_t			ifp;
 	u_int32_t		idx, txdone;
 
 	ifp = sc->lge_ifp;
 
 	/* Clear the timeout timer. */
 	sc->lge_timer = 0;
 
 	/*
 	 * Go through our tx list and free mbufs for those
 	 * frames that have been transmitted.
 	 */
 	idx = sc->lge_cdata.lge_tx_cons;
 	txdone = CSR_READ_1(sc, LGE_TXDMADONE_8BIT);
 
 	while (idx != sc->lge_cdata.lge_tx_prod && txdone) {
 		cur_tx = &sc->lge_ldata->lge_tx_list[idx];
 
 		if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
 		if (cur_tx->lge_mbuf != NULL) {
 			m_freem(cur_tx->lge_mbuf);
 			cur_tx->lge_mbuf = NULL;
 		}
 		cur_tx->lge_ctl = 0;
 
 		txdone--;
 		LGE_INC(idx, LGE_TX_LIST_CNT);
 		sc->lge_timer = 0;
 	}
 
 	sc->lge_cdata.lge_tx_cons = idx;
 
 	if (cur_tx != NULL)
 		if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE);
 
 	return;
 }
 
 static void
 lge_tick(void *xsc)
 {
 	struct lge_softc	*sc;
 	struct mii_data		*mii;
 	if_t			ifp;
 
 	sc = xsc;
 	ifp = sc->lge_ifp;
 	LGE_LOCK_ASSERT(sc);
 
 	CSR_WRITE_4(sc, LGE_STATSIDX, LGE_STATS_SINGLE_COLL_PKTS);
 	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, CSR_READ_4(sc, LGE_STATSVAL));
 	CSR_WRITE_4(sc, LGE_STATSIDX, LGE_STATS_MULTI_COLL_PKTS);
 	if_inc_counter(ifp, IFCOUNTER_COLLISIONS, CSR_READ_4(sc, LGE_STATSVAL));
 
 	if (!sc->lge_link) {
 		mii = device_get_softc(sc->lge_miibus);
 		mii_tick(mii);
 		if (mii->mii_media_status & IFM_ACTIVE &&
 		    IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) {
 			sc->lge_link++;
 			if (bootverbose &&
 		  	    (IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_SX||
 			    IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_T))
 				device_printf(sc->lge_dev, "gigabit link up\n");
 			if (!if_sendq_empty(ifp))
 				lge_start_locked(ifp);
 		}
 	}
 
 	if (sc->lge_timer != 0 && --sc->lge_timer == 0)
 		lge_watchdog(sc);
 	callout_reset(&sc->lge_stat_callout, hz, lge_tick, sc);
 
 	return;
 }
 
 static void
 lge_intr(void *arg)
 {
 	struct lge_softc	*sc;
 	if_t			ifp;
 	u_int32_t		status;
 
 	sc = arg;
 	ifp = sc->lge_ifp;
 	LGE_LOCK(sc);
 
 	/* Suppress unwanted interrupts */
 	if (!(if_getflags(ifp) & IFF_UP)) {
 		lge_stop(sc);
 		LGE_UNLOCK(sc);
 		return;
 	}
 
 	for (;;) {
 		/*
 		 * Reading the ISR register clears all interrupts, and
 		 * clears the 'interrupts enabled' bit in the IMR
 		 * register.
 		 */
 		status = CSR_READ_4(sc, LGE_ISR);
 
 		if ((status & LGE_INTRS) == 0)
 			break;
 
 		if ((status & (LGE_ISR_TXCMDFIFO_EMPTY|LGE_ISR_TXDMA_DONE)))
 			lge_txeof(sc);
 
 		if (status & LGE_ISR_RXDMA_DONE)
 			lge_rxeof(sc, LGE_RX_DMACNT(status));
 
 		if (status & LGE_ISR_RXCMDFIFO_EMPTY)
 			lge_rxeoc(sc);
 
 		if (status & LGE_ISR_PHY_INTR) {
 			sc->lge_link = 0;
 			callout_stop(&sc->lge_stat_callout);
 			lge_tick(sc);
 		}
 	}
 
 	/* Re-enable interrupts. */
 	CSR_WRITE_4(sc, LGE_IMR, LGE_IMR_SETRST_CTL0|LGE_IMR_INTR_ENB);
 
 	if (!if_sendq_empty(ifp))
 		lge_start_locked(ifp);
 
 	LGE_UNLOCK(sc);
 	return;
 }
 
 /*
  * Encapsulate an mbuf chain in a descriptor by coupling the mbuf data
  * pointers to the fragment pointers.
  */
 static int
 lge_encap(struct lge_softc *sc, struct mbuf *m_head, u_int32_t *txidx)
 {
 	struct lge_frag		*f = NULL;
 	struct lge_tx_desc	*cur_tx;
 	struct mbuf		*m;
 	int			frag = 0, tot_len = 0;
 
 	/*
  	 * Start packing the mbufs in this chain into
 	 * the fragment pointers. Stop when we run out
  	 * of fragments or hit the end of the mbuf chain.
 	 */
 	m = m_head;
 	cur_tx = &sc->lge_ldata->lge_tx_list[*txidx];
 	frag = 0;
 
 	for (m = m_head; m != NULL; m = m->m_next) {
 		if (m->m_len != 0) {
 			tot_len += m->m_len;
 			f = &cur_tx->lge_frags[frag];
 			f->lge_fraglen = m->m_len;
 			f->lge_fragptr_lo = vtophys(mtod(m, vm_offset_t));
 			f->lge_fragptr_hi = 0;
 			frag++;
 		}
 	}
 
 	if (m != NULL)
 		return(ENOBUFS);
 
 	cur_tx->lge_mbuf = m_head;
 	cur_tx->lge_ctl = LGE_TXCTL_WANTINTR|LGE_FRAGCNT(frag)|tot_len;
 	LGE_INC((*txidx), LGE_TX_LIST_CNT);
 
 	/* Queue for transmit */
 	CSR_WRITE_4(sc, LGE_TXDESC_ADDR_LO, vtophys(cur_tx));
 
 	return(0);
 }
 
 /*
  * Main transmit routine. To avoid having to do mbuf copies, we put pointers
  * to the mbuf data regions directly in the transmit lists. We also save a
  * copy of the pointers since the transmit list fragment pointers are
  * physical addresses.
  */
 
 static void
 lge_start(if_t ifp)
 {
 	struct lge_softc	*sc;
 
 	sc = if_getsoftc(ifp);
 	LGE_LOCK(sc);
 	lge_start_locked(ifp);
 	LGE_UNLOCK(sc);
 }
 
 static void
 lge_start_locked(if_t ifp)
 {
 	struct lge_softc	*sc;
 	struct mbuf		*m_head = NULL;
 	u_int32_t		idx;
 
 	sc = if_getsoftc(ifp);
 
 	if (!sc->lge_link)
 		return;
 
 	idx = sc->lge_cdata.lge_tx_prod;
 
 	if (if_getdrvflags(ifp) & IFF_DRV_OACTIVE)
 		return;
 
 	while(sc->lge_ldata->lge_tx_list[idx].lge_mbuf == NULL) {
 		if (CSR_READ_1(sc, LGE_TXCMDFREE_8BIT) == 0)
 			break;
 
 		m_head = if_dequeue(ifp);
 		if (m_head == NULL)
 			break;
 
 		if (lge_encap(sc, m_head, &idx)) {
 			if_sendq_prepend(ifp, m_head);
 			if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0);
 			break;
 		}
 
 		/*
 		 * If there's a BPF listener, bounce a copy of this frame
 		 * to him.
 		 */
 		BPF_MTAP(ifp, m_head);
 	}
 
 	sc->lge_cdata.lge_tx_prod = idx;
 
 	/*
 	 * Set a timeout in case the chip goes out to lunch.
 	 */
 	sc->lge_timer = 5;
 
 	return;
 }
 
 static void
 lge_init(void *xsc)
 {
 	struct lge_softc	*sc = xsc;
 
 	LGE_LOCK(sc);
 	lge_init_locked(sc);
 	LGE_UNLOCK(sc);
 }
 
 static void
 lge_init_locked(struct lge_softc *sc)
 {
 	if_t			ifp = sc->lge_ifp;
 
 	LGE_LOCK_ASSERT(sc);
 	if (if_getdrvflags(ifp) & IFF_DRV_RUNNING)
 		return;
 
 	/*
 	 * Cancel pending I/O and free all RX/TX buffers.
 	 */
 	lge_stop(sc);
 	lge_reset(sc);
 
 	/* Set MAC address */
 	CSR_WRITE_4(sc, LGE_PAR0, *(u_int32_t *)(&if_getlladdr(sc->lge_ifp)[0]));
 	CSR_WRITE_4(sc, LGE_PAR1, *(u_int32_t *)(&if_getlladdr(sc->lge_ifp)[4]));
 
 	/* Init circular RX list. */
 	if (lge_list_rx_init(sc) == ENOBUFS) {
 		device_printf(sc->lge_dev, "initialization failed: no "
 		    "memory for rx buffers\n");
 		lge_stop(sc);
 		return;
 	}
 
 	/*
 	 * Init tx descriptors.
 	 */
 	lge_list_tx_init(sc);
 
 	/* Set initial value for MODE1 register. */
 	CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_RX_UCAST|
 	    LGE_MODE1_TX_CRC|LGE_MODE1_TXPAD|
 	    LGE_MODE1_RX_FLOWCTL|LGE_MODE1_SETRST_CTL0|
 	    LGE_MODE1_SETRST_CTL1|LGE_MODE1_SETRST_CTL2);
 
 	 /* If we want promiscuous mode, set the allframes bit. */
 	if (if_getflags(ifp) & IFF_PROMISC) {
 		CSR_WRITE_4(sc, LGE_MODE1,
 		    LGE_MODE1_SETRST_CTL1|LGE_MODE1_RX_PROMISC);
 	} else {
 		CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_RX_PROMISC);
 	}
 
 	/*
 	 * Set the capture broadcast bit to capture broadcast frames.
 	 */
 	if (if_getflags(ifp) & IFF_BROADCAST) {
 		CSR_WRITE_4(sc, LGE_MODE1,
 		    LGE_MODE1_SETRST_CTL1|LGE_MODE1_RX_BCAST);
 	} else {
 		CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_RX_BCAST);
 	}
 
 	/* Packet padding workaround? */
 	CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_SETRST_CTL1|LGE_MODE1_RMVPAD);
 
 	/* No error frames */
 	CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_RX_ERRPKTS);
 
 	/* Receive large frames */
 	CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_SETRST_CTL1|LGE_MODE1_RX_GIANTS);
 
 	/* Workaround: disable RX/TX flow control */
 	CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_TX_FLOWCTL);
 	CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_RX_FLOWCTL);
 
 	/* Make sure to strip CRC from received frames */
 	CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_RX_CRC);
 
 	/* Turn off magic packet mode */
 	CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_MPACK_ENB);
 
 	/* Turn off all VLAN stuff */
 	CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_VLAN_RX|LGE_MODE1_VLAN_TX|
 	    LGE_MODE1_VLAN_STRIP|LGE_MODE1_VLAN_INSERT);
 
 	/* Workarond: FIFO overflow */
 	CSR_WRITE_2(sc, LGE_RXFIFO_HIWAT, 0x3FFF);
 	CSR_WRITE_4(sc, LGE_IMR, LGE_IMR_SETRST_CTL1|LGE_IMR_RXFIFO_WAT);
 
 	/*
 	 * Load the multicast filter.
 	 */
 	lge_setmulti(sc);
 
 	/*
 	 * Enable hardware checksum validation for all received IPv4
 	 * packets, do not reject packets with bad checksums.
 	 */
 	CSR_WRITE_4(sc, LGE_MODE2, LGE_MODE2_RX_IPCSUM|
 	    LGE_MODE2_RX_TCPCSUM|LGE_MODE2_RX_UDPCSUM|
 	    LGE_MODE2_RX_ERRCSUM);
 
 	/*
 	 * Enable the delivery of PHY interrupts based on
 	 * link/speed/duplex status chalges.
 	 */
 	CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_SETRST_CTL0|LGE_MODE1_GMIIPOLL);
 
 	/* Enable receiver and transmitter. */
 	CSR_WRITE_4(sc, LGE_RXDESC_ADDR_HI, 0);
 	CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_SETRST_CTL1|LGE_MODE1_RX_ENB);
 
 	CSR_WRITE_4(sc, LGE_TXDESC_ADDR_HI, 0);
 	CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_SETRST_CTL1|LGE_MODE1_TX_ENB);
 
 	/*
 	 * Enable interrupts.
 	 */
 	CSR_WRITE_4(sc, LGE_IMR, LGE_IMR_SETRST_CTL0|
 	    LGE_IMR_SETRST_CTL1|LGE_IMR_INTR_ENB|LGE_INTRS);
 
 	lge_ifmedia_upd_locked(ifp);
 
 	if_setdrvflagbits(ifp, IFF_DRV_RUNNING, 0);
 	if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE);
 
 	callout_reset(&sc->lge_stat_callout, hz, lge_tick, sc);
 
 	return;
 }
 
 /*
  * Set media options.
  */
 static int
 lge_ifmedia_upd(if_t ifp)
 {
 	struct lge_softc	*sc;
 
 	sc = if_getsoftc(ifp);
 	LGE_LOCK(sc);
 	lge_ifmedia_upd_locked(ifp);
 	LGE_UNLOCK(sc);
 
 	return(0);
 }
 
 static void
 lge_ifmedia_upd_locked(if_t ifp)
 {
 	struct lge_softc	*sc;
 	struct mii_data		*mii;
 	struct mii_softc	*miisc;
 
 	sc = if_getsoftc(ifp);
 
 	LGE_LOCK_ASSERT(sc);
 	mii = device_get_softc(sc->lge_miibus);
 	sc->lge_link = 0;
 	LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
 		PHY_RESET(miisc);
 	mii_mediachg(mii);
 }
 
 /*
  * Report current media status.
  */
 static void
 lge_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr)
 {
 	struct lge_softc	*sc;
 	struct mii_data		*mii;
 
 	sc = if_getsoftc(ifp);
 
 	LGE_LOCK(sc);
 	mii = device_get_softc(sc->lge_miibus);
 	mii_pollstat(mii);
 	ifmr->ifm_active = mii->mii_media_active;
 	ifmr->ifm_status = mii->mii_media_status;
 	LGE_UNLOCK(sc);
 
 	return;
 }
 
 static int
 lge_ioctl(if_t ifp, u_long command, caddr_t data)
 {
 	struct lge_softc	*sc = if_getsoftc(ifp);
 	struct ifreq		*ifr = (struct ifreq *) data;
 	struct mii_data		*mii;
 	int			error = 0;
 
 	switch(command) {
 	case SIOCSIFMTU:
 		LGE_LOCK(sc);
 		if (ifr->ifr_mtu > LGE_JUMBO_MTU)
 			error = EINVAL;
 		else
 			if_setmtu(ifp, ifr->ifr_mtu);
 		LGE_UNLOCK(sc);
 		break;
 	case SIOCSIFFLAGS:
 		LGE_LOCK(sc);
 		if (if_getflags(ifp) & IFF_UP) {
 			if (if_getdrvflags(ifp) & IFF_DRV_RUNNING &&
 			    if_getflags(ifp) & IFF_PROMISC &&
 			    !(sc->lge_if_flags & IFF_PROMISC)) {
 				CSR_WRITE_4(sc, LGE_MODE1,
 				    LGE_MODE1_SETRST_CTL1|
 				    LGE_MODE1_RX_PROMISC);
 			} else if (if_getdrvflags(ifp) & IFF_DRV_RUNNING &&
 			    !(if_getflags(ifp) & IFF_PROMISC) &&
 			    sc->lge_if_flags & IFF_PROMISC) {
 				CSR_WRITE_4(sc, LGE_MODE1,
 				    LGE_MODE1_RX_PROMISC);
 			} else {
 				if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING);
 				lge_init_locked(sc);
 			}
 		} else {
 			if (if_getdrvflags(ifp) & IFF_DRV_RUNNING)
 				lge_stop(sc);
 		}
 		sc->lge_if_flags = if_getflags(ifp);
 		LGE_UNLOCK(sc);
 		error = 0;
 		break;
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
 		LGE_LOCK(sc);
 		lge_setmulti(sc);
 		LGE_UNLOCK(sc);
 		error = 0;
 		break;
 	case SIOCGIFMEDIA:
 	case SIOCSIFMEDIA:
 		mii = device_get_softc(sc->lge_miibus);
 		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
 		break;
 	default:
 		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 
 	return(error);
 }
 
 static void
 lge_watchdog(struct lge_softc *sc)
 {
 	if_t			ifp;
 
 	LGE_LOCK_ASSERT(sc);
 	ifp = sc->lge_ifp;
 
 	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
 	if_printf(ifp, "watchdog timeout\n");
 
 	lge_stop(sc);
 	lge_reset(sc);
 	if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING);
 	lge_init_locked(sc);
 
 	if (!if_sendq_empty(ifp))
 		lge_start_locked(ifp);
 }
 
 /*
  * Stop the adapter and free any mbufs allocated to the
  * RX and TX lists.
  */
 static void
 lge_stop(struct lge_softc *sc)
 {
 	int			i;
 	if_t			ifp;
 
 	LGE_LOCK_ASSERT(sc);
 	ifp = sc->lge_ifp;
 	sc->lge_timer = 0;
 	callout_stop(&sc->lge_stat_callout);
 	CSR_WRITE_4(sc, LGE_IMR, LGE_IMR_INTR_ENB);
 
 	/* Disable receiver and transmitter. */
 	CSR_WRITE_4(sc, LGE_MODE1, LGE_MODE1_RX_ENB|LGE_MODE1_TX_ENB);
 	sc->lge_link = 0;
 
 	/*
 	 * Free data in the RX lists.
 	 */
 	for (i = 0; i < LGE_RX_LIST_CNT; i++) {
 		if (sc->lge_ldata->lge_rx_list[i].lge_mbuf != NULL) {
 			m_freem(sc->lge_ldata->lge_rx_list[i].lge_mbuf);
 			sc->lge_ldata->lge_rx_list[i].lge_mbuf = NULL;
 		}
 	}
 	bzero((char *)&sc->lge_ldata->lge_rx_list,
 		sizeof(sc->lge_ldata->lge_rx_list));
 
 	/*
 	 * Free the TX list buffers.
 	 */
 	for (i = 0; i < LGE_TX_LIST_CNT; i++) {
 		if (sc->lge_ldata->lge_tx_list[i].lge_mbuf != NULL) {
 			m_freem(sc->lge_ldata->lge_tx_list[i].lge_mbuf);
 			sc->lge_ldata->lge_tx_list[i].lge_mbuf = NULL;
 		}
 	}
 
 	bzero((char *)&sc->lge_ldata->lge_tx_list,
 		sizeof(sc->lge_ldata->lge_tx_list));
 
 	if_setdrvflagbits(ifp, 0, (IFF_DRV_RUNNING | IFF_DRV_OACTIVE));
 
 	return;
 }
 
 /*
  * Stop all chip I/O so that the kernel's probe routines don't
  * get confused by errant DMAs when rebooting.
  */
 static int
 lge_shutdown(device_t dev)
 {
 	struct lge_softc	*sc;
 
 	sc = device_get_softc(dev);
 
 	LGE_LOCK(sc);
 	lge_reset(sc);
 	lge_stop(sc);
 	LGE_UNLOCK(sc);
 
 	return (0);
 }
diff --git a/sys/dev/netmap/if_ptnet.c b/sys/dev/netmap/if_ptnet.c
index cea62517b2e6..bf14bfdb73ea 100644
--- a/sys/dev/netmap/if_ptnet.c
+++ b/sys/dev/netmap/if_ptnet.c
@@ -1,1981 +1,1981 @@
 /*-
  * Copyright (c) 2016, Vincenzo Maffione
  * 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 unmodified, 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.
  */
 
 /* Driver for ptnet paravirtualized network device. */
 
 #include <sys/cdefs.h>
 
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/taskqueue.h>
 #include <sys/smp.h>
 #include <sys/time.h>
 #include <machine/smp.h>
 
 #include <vm/uma.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/if_media.h>
 #include <net/if_vlan_var.h>
 #include <net/bpf.h>
 
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet/udp.h>
 #include <netinet/tcp.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
 
 #include <sys/selinfo.h>
 #include <net/netmap.h>
 #include <dev/netmap/netmap_kern.h>
 #include <net/netmap_virt.h>
 #include <dev/netmap/netmap_mem2.h>
 #include <dev/virtio/network/virtio_net.h>
 
 #ifdef WITH_PTNETMAP
 
 #ifndef INET
 #error "INET not defined, cannot support offloadings"
 #endif
 
 static uint64_t	ptnet_get_counter(if_t, ift_counter);
 
 //#define PTNETMAP_STATS
 //#define DEBUG
 #ifdef DEBUG
 #define DBG(x) x
 #else   /* !DEBUG */
 #define DBG(x)
 #endif  /* !DEBUG */
 
 extern int ptnet_vnet_hdr; /* Tunable parameter */
 
 struct ptnet_softc;
 
 struct ptnet_queue_stats {
 	uint64_t	packets; /* if_[io]packets */
 	uint64_t	bytes;	 /* if_[io]bytes */
 	uint64_t	errors;	 /* if_[io]errors */
 	uint64_t	iqdrops; /* if_iqdrops */
 	uint64_t	mcasts;  /* if_[io]mcasts */
 #ifdef PTNETMAP_STATS
 	uint64_t	intrs;
 	uint64_t	kicks;
 #endif /* PTNETMAP_STATS */
 };
 
 struct ptnet_queue {
 	struct ptnet_softc		*sc;
 	struct				resource *irq;
 	void				*cookie;
 	int				kring_id;
 	struct nm_csb_atok		*atok;
 	struct nm_csb_ktoa		*ktoa;
 	unsigned int			kick;
 	struct mtx			lock;
 	struct buf_ring			*bufring; /* for TX queues */
 	struct ptnet_queue_stats	stats;
 #ifdef PTNETMAP_STATS
 	struct ptnet_queue_stats	last_stats;
 #endif /* PTNETMAP_STATS */
 	struct taskqueue		*taskq;
 	struct task			task;
 	char				lock_name[16];
 };
 
 #define PTNET_Q_LOCK(_pq)	mtx_lock(&(_pq)->lock)
 #define PTNET_Q_TRYLOCK(_pq)	mtx_trylock(&(_pq)->lock)
 #define PTNET_Q_UNLOCK(_pq)	mtx_unlock(&(_pq)->lock)
 
 struct ptnet_softc {
 	device_t		dev;
 	if_t			ifp;
 	struct ifmedia		media;
 	struct mtx		lock;
 	char			lock_name[16];
 	char			hwaddr[ETHER_ADDR_LEN];
 
 	/* Mirror of PTFEAT register. */
 	uint32_t		ptfeatures;
 	unsigned int		vnet_hdr_len;
 
 	/* PCI BARs support. */
 	struct resource		*iomem;
 	struct resource		*msix_mem;
 
 	unsigned int		num_rings;
 	unsigned int		num_tx_rings;
 	struct ptnet_queue	*queues;
 	struct ptnet_queue	*rxqueues;
 	struct nm_csb_atok	*csb_gh;
 	struct nm_csb_ktoa	*csb_hg;
 
 	unsigned int		min_tx_space;
 
 	struct netmap_pt_guest_adapter *ptna;
 
 	struct callout		tick;
 #ifdef PTNETMAP_STATS
 	struct timeval		last_ts;
 #endif /* PTNETMAP_STATS */
 };
 
 #define PTNET_CORE_LOCK(_sc)	mtx_lock(&(_sc)->lock)
 #define PTNET_CORE_UNLOCK(_sc)	mtx_unlock(&(_sc)->lock)
 
 static int	ptnet_probe(device_t);
 static int	ptnet_attach(device_t);
 static int	ptnet_detach(device_t);
 static int	ptnet_suspend(device_t);
 static int	ptnet_resume(device_t);
 static int	ptnet_shutdown(device_t);
 
 static void	ptnet_init(void *opaque);
 static int	ptnet_ioctl(if_t ifp, u_long cmd, caddr_t data);
 static int	ptnet_init_locked(struct ptnet_softc *sc);
 static int	ptnet_stop(struct ptnet_softc *sc);
 static int	ptnet_transmit(if_t ifp, struct mbuf *m);
 static int	ptnet_drain_transmit_queue(struct ptnet_queue *pq,
 					   unsigned int budget,
 					   bool may_resched);
 static void	ptnet_qflush(if_t ifp);
 static void	ptnet_tx_task(void *context, int pending);
 
 static int	ptnet_media_change(if_t ifp);
 static void	ptnet_media_status(if_t ifp, struct ifmediareq *ifmr);
 #ifdef PTNETMAP_STATS
 static void	ptnet_tick(void *opaque);
 #endif
 
 static int	ptnet_irqs_init(struct ptnet_softc *sc);
 static void	ptnet_irqs_fini(struct ptnet_softc *sc);
 
 static uint32_t ptnet_nm_ptctl(struct ptnet_softc *sc, uint32_t cmd);
 static int      ptnet_nm_config(struct netmap_adapter *na,
 				struct nm_config_info *info);
 static void	ptnet_update_vnet_hdr(struct ptnet_softc *sc);
 static int	ptnet_nm_register(struct netmap_adapter *na, int onoff);
 static int	ptnet_nm_txsync(struct netmap_kring *kring, int flags);
 static int	ptnet_nm_rxsync(struct netmap_kring *kring, int flags);
 static void	ptnet_nm_intr(struct netmap_adapter *na, int onoff);
 
 static void	ptnet_tx_intr(void *opaque);
 static void	ptnet_rx_intr(void *opaque);
 
 static unsigned	ptnet_rx_discard(struct netmap_kring *kring,
 				 unsigned int head);
 static int	ptnet_rx_eof(struct ptnet_queue *pq, unsigned int budget,
 			     bool may_resched);
 static void	ptnet_rx_task(void *context, int pending);
 
 #ifdef DEVICE_POLLING
 static poll_handler_t ptnet_poll;
 #endif
 
 static device_method_t ptnet_methods[] = {
 	DEVMETHOD(device_probe,			ptnet_probe),
 	DEVMETHOD(device_attach,		ptnet_attach),
 	DEVMETHOD(device_detach,		ptnet_detach),
 	DEVMETHOD(device_suspend,		ptnet_suspend),
 	DEVMETHOD(device_resume,		ptnet_resume),
 	DEVMETHOD(device_shutdown,		ptnet_shutdown),
 	DEVMETHOD_END
 };
 
 static driver_t ptnet_driver = {
 	"ptnet",
 	ptnet_methods,
 	sizeof(struct ptnet_softc)
 };
 
 /* We use (SI_ORDER_MIDDLE+2) here, see DEV_MODULE_ORDERED() invocation. */
 DRIVER_MODULE_ORDERED(ptnet, pci, ptnet_driver, NULL, NULL,
 		      SI_ORDER_MIDDLE + 2);
 
 static int
 ptnet_probe(device_t dev)
 {
 	if (pci_get_vendor(dev) != PTNETMAP_PCI_VENDOR_ID ||
 		pci_get_device(dev) != PTNETMAP_PCI_NETIF_ID) {
 		return (ENXIO);
 	}
 
 	device_set_desc(dev, "ptnet network adapter");
 
 	return (BUS_PROBE_DEFAULT);
 }
 
 static inline void ptnet_kick(struct ptnet_queue *pq)
 {
 #ifdef PTNETMAP_STATS
 	pq->stats.kicks ++;
 #endif /* PTNETMAP_STATS */
 	bus_write_4(pq->sc->iomem, pq->kick, 0);
 }
 
 #define PTNET_BUF_RING_SIZE	4096
 #define PTNET_RX_BUDGET		512
 #define PTNET_RX_BATCH		1
 #define PTNET_TX_BUDGET		512
 #define PTNET_TX_BATCH		64
 #define PTNET_HDR_SIZE		sizeof(struct virtio_net_hdr_mrg_rxbuf)
 #define PTNET_MAX_PKT_SIZE	65536
 
 #define PTNET_CSUM_OFFLOAD	(CSUM_TCP | CSUM_UDP)
 #define PTNET_CSUM_OFFLOAD_IPV6	(CSUM_TCP_IPV6 | CSUM_UDP_IPV6)
 #define PTNET_ALL_OFFLOAD	(CSUM_TSO | PTNET_CSUM_OFFLOAD |\
 				 PTNET_CSUM_OFFLOAD_IPV6)
 
 static int
 ptnet_attach(device_t dev)
 {
 	uint32_t ptfeatures = 0;
 	unsigned int num_rx_rings, num_tx_rings;
 	struct netmap_adapter na_arg;
 	unsigned int nifp_offset;
 	struct ptnet_softc *sc;
 	if_t ifp;
 	uint32_t macreg;
 	int err, rid;
 	int i;
 
 	sc = device_get_softc(dev);
 	sc->dev = dev;
 
 	/* Setup PCI resources. */
 	pci_enable_busmaster(dev);
 
 	rid = PCIR_BAR(PTNETMAP_IO_PCI_BAR);
 	sc->iomem = bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid,
 					   RF_ACTIVE);
 	if (sc->iomem == NULL) {
 		device_printf(dev, "Failed to map I/O BAR\n");
 		return (ENXIO);
 	}
 
 	/* Negotiate features with the hypervisor. */
 	if (ptnet_vnet_hdr) {
 		ptfeatures |= PTNETMAP_F_VNET_HDR;
 	}
 	bus_write_4(sc->iomem, PTNET_IO_PTFEAT, ptfeatures); /* wanted */
 	ptfeatures = bus_read_4(sc->iomem, PTNET_IO_PTFEAT); /* acked */
 	sc->ptfeatures = ptfeatures;
 
 	num_tx_rings = bus_read_4(sc->iomem, PTNET_IO_NUM_TX_RINGS);
 	num_rx_rings = bus_read_4(sc->iomem, PTNET_IO_NUM_RX_RINGS);
 	sc->num_rings = num_tx_rings + num_rx_rings;
 	sc->num_tx_rings = num_tx_rings;
 
 	if (sc->num_rings * sizeof(struct nm_csb_atok) > PAGE_SIZE) {
 		device_printf(dev, "CSB cannot handle that many rings (%u)\n",
 				sc->num_rings);
 		err = ENOMEM;
 		goto err_path;
 	}
 
 	/* Allocate CSB and carry out CSB allocation protocol. */
 	sc->csb_gh = contigmalloc(2*PAGE_SIZE, M_DEVBUF, M_NOWAIT | M_ZERO,
 				  (size_t)0, -1UL, PAGE_SIZE, 0);
 	if (sc->csb_gh == NULL) {
 		device_printf(dev, "Failed to allocate CSB\n");
 		err = ENOMEM;
 		goto err_path;
 	}
 	sc->csb_hg = (struct nm_csb_ktoa *)(((char *)sc->csb_gh) + PAGE_SIZE);
 
 	{
 		/*
 		 * We use uint64_t rather than vm_paddr_t since we
 		 * need 64 bit addresses even on 32 bit platforms.
 		 */
 		uint64_t paddr = vtophys(sc->csb_gh);
 
 		/* CSB allocation protocol: write to BAH first, then
 		 * to BAL (for both GH and HG sections). */
 		bus_write_4(sc->iomem, PTNET_IO_CSB_GH_BAH,
 				(paddr >> 32) & 0xffffffff);
 		bus_write_4(sc->iomem, PTNET_IO_CSB_GH_BAL,
 				paddr & 0xffffffff);
 		paddr = vtophys(sc->csb_hg);
 		bus_write_4(sc->iomem, PTNET_IO_CSB_HG_BAH,
 				(paddr >> 32) & 0xffffffff);
 		bus_write_4(sc->iomem, PTNET_IO_CSB_HG_BAL,
 				paddr & 0xffffffff);
 	}
 
 	/* Allocate and initialize per-queue data structures. */
 	sc->queues = malloc(sizeof(struct ptnet_queue) * sc->num_rings,
 			    M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (sc->queues == NULL) {
 		err = ENOMEM;
 		goto err_path;
 	}
 	sc->rxqueues = sc->queues + num_tx_rings;
 
 	for (i = 0; i < sc->num_rings; i++) {
 		struct ptnet_queue *pq = sc->queues + i;
 
 		pq->sc = sc;
 		pq->kring_id = i;
 		pq->kick = PTNET_IO_KICK_BASE + 4 * i;
 		pq->atok = sc->csb_gh + i;
 		pq->ktoa = sc->csb_hg + i;
 		snprintf(pq->lock_name, sizeof(pq->lock_name), "%s-%d",
 			 device_get_nameunit(dev), i);
 		mtx_init(&pq->lock, pq->lock_name, NULL, MTX_DEF);
 		if (i >= num_tx_rings) {
 			/* RX queue: fix kring_id. */
 			pq->kring_id -= num_tx_rings;
 		} else {
 			/* TX queue: allocate buf_ring. */
 			pq->bufring = buf_ring_alloc(PTNET_BUF_RING_SIZE,
 						M_DEVBUF, M_NOWAIT, &pq->lock);
 			if (pq->bufring == NULL) {
 				err = ENOMEM;
 				goto err_path;
 			}
 		}
 	}
 
 	sc->min_tx_space = 64; /* Safe initial value. */
 
 	err = ptnet_irqs_init(sc);
 	if (err) {
 		goto err_path;
 	}
 
 	/* Setup Ethernet interface. */
 	sc->ifp = ifp = if_alloc(IFT_ETHER);
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	if_setbaudrate(ifp, IF_Gbps(10));
 	if_setsoftc(ifp, sc);
 	if_setflags(ifp, IFF_BROADCAST | IFF_MULTICAST | IFF_SIMPLEX);
 	if_setinitfn(ifp, ptnet_init);
 	if_setioctlfn(ifp, ptnet_ioctl);
 	if_setget_counter(ifp, ptnet_get_counter);
 	if_settransmitfn(ifp, ptnet_transmit);
 	if_setqflushfn(ifp, ptnet_qflush);
 
 	ifmedia_init(&sc->media, IFM_IMASK, ptnet_media_change,
 		     ptnet_media_status);
 	ifmedia_add(&sc->media, IFM_ETHER | IFM_10G_T | IFM_FDX, 0, NULL);
 	ifmedia_set(&sc->media, IFM_ETHER | IFM_10G_T | IFM_FDX);
 
 	macreg = bus_read_4(sc->iomem, PTNET_IO_MAC_HI);
 	sc->hwaddr[0] = (macreg >> 8) & 0xff;
 	sc->hwaddr[1] = macreg & 0xff;
 	macreg = bus_read_4(sc->iomem, PTNET_IO_MAC_LO);
 	sc->hwaddr[2] = (macreg >> 24) & 0xff;
 	sc->hwaddr[3] = (macreg >> 16) & 0xff;
 	sc->hwaddr[4] = (macreg >> 8) & 0xff;
 	sc->hwaddr[5] = macreg & 0xff;
 
 	ether_ifattach(ifp, sc->hwaddr);
 
 	if_setifheaderlen(ifp, sizeof(struct ether_vlan_header));
 	if_setcapabilitiesbit(ifp, IFCAP_JUMBO_MTU | IFCAP_VLAN_MTU, 0);
 
 	if (sc->ptfeatures & PTNETMAP_F_VNET_HDR) {
 		/* Similarly to what the vtnet driver does, we can emulate
 		 * VLAN offloadings by inserting and removing the 802.1Q
 		 * header during transmit and receive. We are then able
 		 * to do checksum offloading of VLAN frames. */
 		if_setcapabilitiesbit(ifp, IFCAP_HWCSUM | IFCAP_HWCSUM_IPV6
 					| IFCAP_VLAN_HWCSUM
 					| IFCAP_TSO | IFCAP_LRO
 					| IFCAP_VLAN_HWTSO
 					| IFCAP_VLAN_HWTAGGING, 0);
 	}
 
 	if_setcapenable(ifp, if_getcapabilities(ifp));
 #ifdef DEVICE_POLLING
 	/* Don't enable polling by default. */
 	if_setcapabilitiesbit(ifp, IFCAP_POLLING, 0);
 #endif
 	snprintf(sc->lock_name, sizeof(sc->lock_name),
 		 "%s", device_get_nameunit(dev));
 	mtx_init(&sc->lock, sc->lock_name, "ptnet core lock", MTX_DEF);
 	callout_init_mtx(&sc->tick, &sc->lock, 0);
 
 	/* Prepare a netmap_adapter struct instance to do netmap_attach(). */
 	nifp_offset = bus_read_4(sc->iomem, PTNET_IO_NIFP_OFS);
 	memset(&na_arg, 0, sizeof(na_arg));
 	na_arg.ifp = ifp;
 	na_arg.num_tx_desc = bus_read_4(sc->iomem, PTNET_IO_NUM_TX_SLOTS);
 	na_arg.num_rx_desc = bus_read_4(sc->iomem, PTNET_IO_NUM_RX_SLOTS);
 	na_arg.num_tx_rings = num_tx_rings;
 	na_arg.num_rx_rings = num_rx_rings;
 	na_arg.nm_config = ptnet_nm_config;
 	na_arg.nm_krings_create = ptnet_nm_krings_create;
 	na_arg.nm_krings_delete = ptnet_nm_krings_delete;
 	na_arg.nm_dtor = ptnet_nm_dtor;
 	na_arg.nm_intr = ptnet_nm_intr;
 	na_arg.nm_register = ptnet_nm_register;
 	na_arg.nm_txsync = ptnet_nm_txsync;
 	na_arg.nm_rxsync = ptnet_nm_rxsync;
 
 	netmap_pt_guest_attach(&na_arg, nifp_offset,
                                 bus_read_4(sc->iomem, PTNET_IO_HOSTMEMID));
 
 	/* Now a netmap adapter for this ifp has been allocated, and it
 	 * can be accessed through NA(ifp). We also have to initialize the CSB
 	 * pointer. */
 	sc->ptna = (struct netmap_pt_guest_adapter *)NA(ifp);
 
 	/* If virtio-net header was negotiated, set the virt_hdr_len field in
 	 * the netmap adapter, to inform users that this netmap adapter requires
 	 * the application to deal with the headers. */
 	ptnet_update_vnet_hdr(sc);
 
 	device_printf(dev, "%s() completed\n", __func__);
 
 	return (0);
 
 err_path:
 	ptnet_detach(dev);
 	return err;
 }
 
 /* Stop host sync-kloop if it was running. */
 static void
 ptnet_device_shutdown(struct ptnet_softc *sc)
 {
 	ptnet_nm_ptctl(sc, PTNETMAP_PTCTL_DELETE);
 	bus_write_4(sc->iomem, PTNET_IO_CSB_GH_BAH, 0);
 	bus_write_4(sc->iomem, PTNET_IO_CSB_GH_BAL, 0);
 	bus_write_4(sc->iomem, PTNET_IO_CSB_HG_BAH, 0);
 	bus_write_4(sc->iomem, PTNET_IO_CSB_HG_BAL, 0);
 }
 
 static int
 ptnet_detach(device_t dev)
 {
 	struct ptnet_softc *sc = device_get_softc(dev);
 	int i;
 
 	ptnet_device_shutdown(sc);
 
 #ifdef DEVICE_POLLING
 	if (if_getcapenable(sc->ifp) & IFCAP_POLLING) {
 		ether_poll_deregister(sc->ifp);
 	}
 #endif
 	callout_drain(&sc->tick);
 
 	if (sc->queues) {
 		/* Drain taskqueues before calling if_detach. */
 		for (i = 0; i < sc->num_rings; i++) {
 			struct ptnet_queue *pq = sc->queues + i;
 
 			if (pq->taskq) {
 				taskqueue_drain(pq->taskq, &pq->task);
 			}
 		}
 	}
 
 	if (sc->ifp) {
 		ether_ifdetach(sc->ifp);
 
 		/* Uninitialize netmap adapters for this device. */
 		netmap_detach(sc->ifp);
 
 		ifmedia_removeall(&sc->media);
 		if_free(sc->ifp);
 		sc->ifp = NULL;
 	}
 
 	ptnet_irqs_fini(sc);
 
 	if (sc->csb_gh) {
-		contigfree(sc->csb_gh, 2*PAGE_SIZE, M_DEVBUF);
+		free(sc->csb_gh, M_DEVBUF);
 		sc->csb_gh = NULL;
 		sc->csb_hg = NULL;
 	}
 
 	if (sc->queues) {
 		for (i = 0; i < sc->num_rings; i++) {
 			struct ptnet_queue *pq = sc->queues + i;
 
 			if (mtx_initialized(&pq->lock)) {
 				mtx_destroy(&pq->lock);
 			}
 			if (pq->bufring != NULL) {
 				buf_ring_free(pq->bufring, M_DEVBUF);
 			}
 		}
 		free(sc->queues, M_DEVBUF);
 		sc->queues = NULL;
 	}
 
 	if (sc->iomem) {
 		bus_release_resource(dev, SYS_RES_IOPORT,
 				     PCIR_BAR(PTNETMAP_IO_PCI_BAR), sc->iomem);
 		sc->iomem = NULL;
 	}
 
 	mtx_destroy(&sc->lock);
 
 	device_printf(dev, "%s() completed\n", __func__);
 
 	return (0);
 }
 
 static int
 ptnet_suspend(device_t dev)
 {
 	struct ptnet_softc *sc = device_get_softc(dev);
 
 	(void)sc;
 
 	return (0);
 }
 
 static int
 ptnet_resume(device_t dev)
 {
 	struct ptnet_softc *sc = device_get_softc(dev);
 
 	(void)sc;
 
 	return (0);
 }
 
 static int
 ptnet_shutdown(device_t dev)
 {
 	struct ptnet_softc *sc = device_get_softc(dev);
 
 	ptnet_device_shutdown(sc);
 
 	return (0);
 }
 
 static int
 ptnet_irqs_init(struct ptnet_softc *sc)
 {
 	int rid = PCIR_BAR(PTNETMAP_MSIX_PCI_BAR);
 	int nvecs = sc->num_rings;
 	device_t dev = sc->dev;
 	int err = ENOSPC;
 	int cpu_cur;
 	int i;
 
 	if (pci_find_cap(dev, PCIY_MSIX, NULL) != 0)  {
 		device_printf(dev, "Could not find MSI-X capability\n");
 		return (ENXIO);
 	}
 
 	sc->msix_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
 					      &rid, RF_ACTIVE);
 	if (sc->msix_mem == NULL) {
 		device_printf(dev, "Failed to allocate MSIX PCI BAR\n");
 		return (ENXIO);
 	}
 
 	if (pci_msix_count(dev) < nvecs) {
 		device_printf(dev, "Not enough MSI-X vectors\n");
 		goto err_path;
 	}
 
 	err = pci_alloc_msix(dev, &nvecs);
 	if (err) {
 		device_printf(dev, "Failed to allocate MSI-X vectors\n");
 		goto err_path;
 	}
 
 	for (i = 0; i < nvecs; i++) {
 		struct ptnet_queue *pq = sc->queues + i;
 
 		rid = i + 1;
 		pq->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
 						 RF_ACTIVE);
 		if (pq->irq == NULL) {
 			device_printf(dev, "Failed to allocate interrupt "
 					   "for queue #%d\n", i);
 			err = ENOSPC;
 			goto err_path;
 		}
 	}
 
 	cpu_cur = CPU_FIRST();
 	for (i = 0; i < nvecs; i++) {
 		struct ptnet_queue *pq = sc->queues + i;
 		void (*handler)(void *) = ptnet_tx_intr;
 
 		if (i >= sc->num_tx_rings) {
 			handler = ptnet_rx_intr;
 		}
 		err = bus_setup_intr(dev, pq->irq, INTR_TYPE_NET | INTR_MPSAFE,
 				     NULL /* intr_filter */, handler,
 				     pq, &pq->cookie);
 		if (err) {
 			device_printf(dev, "Failed to register intr handler "
 					   "for queue #%d\n", i);
 			goto err_path;
 		}
 
 		bus_describe_intr(dev, pq->irq, pq->cookie, "q%d", i);
 #if 0
 		bus_bind_intr(sc->dev, pq->irq, cpu_cur);
 #endif
 		cpu_cur = CPU_NEXT(cpu_cur);
 	}
 
 	device_printf(dev, "Allocated %d MSI-X vectors\n", nvecs);
 
 	cpu_cur = CPU_FIRST();
 	for (i = 0; i < nvecs; i++) {
 		struct ptnet_queue *pq = sc->queues + i;
 
 		if (i < sc->num_tx_rings)
 			TASK_INIT(&pq->task, 0, ptnet_tx_task, pq);
 		else
 			NET_TASK_INIT(&pq->task, 0, ptnet_rx_task, pq);
 
 		pq->taskq = taskqueue_create_fast("ptnet_queue", M_NOWAIT,
 					taskqueue_thread_enqueue, &pq->taskq);
 		taskqueue_start_threads(&pq->taskq, 1, PI_NET, "%s-pq-%d",
 					device_get_nameunit(sc->dev), cpu_cur);
 		cpu_cur = CPU_NEXT(cpu_cur);
 	}
 
 	return 0;
 err_path:
 	ptnet_irqs_fini(sc);
 	return err;
 }
 
 static void
 ptnet_irqs_fini(struct ptnet_softc *sc)
 {
 	device_t dev = sc->dev;
 	int i;
 
 	for (i = 0; i < sc->num_rings; i++) {
 		struct ptnet_queue *pq = sc->queues + i;
 
 		if (pq->taskq) {
 			taskqueue_free(pq->taskq);
 			pq->taskq = NULL;
 		}
 
 		if (pq->cookie) {
 			bus_teardown_intr(dev, pq->irq, pq->cookie);
 			pq->cookie = NULL;
 		}
 
 		if (pq->irq) {
 			bus_release_resource(dev, SYS_RES_IRQ, i + 1, pq->irq);
 			pq->irq = NULL;
 		}
 	}
 
 	if (sc->msix_mem) {
 		pci_release_msi(dev);
 
 		bus_release_resource(dev, SYS_RES_MEMORY,
 				     PCIR_BAR(PTNETMAP_MSIX_PCI_BAR),
 				     sc->msix_mem);
 		sc->msix_mem = NULL;
 	}
 }
 
 static void
 ptnet_init(void *opaque)
 {
 	struct ptnet_softc *sc = opaque;
 
 	PTNET_CORE_LOCK(sc);
 	ptnet_init_locked(sc);
 	PTNET_CORE_UNLOCK(sc);
 }
 
 static int
 ptnet_ioctl(if_t ifp, u_long cmd, caddr_t data)
 {
 	struct ptnet_softc *sc = if_getsoftc(ifp);
 	device_t dev = sc->dev;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int mask __unused, err = 0;
 
 	switch (cmd) {
 	case SIOCSIFFLAGS:
 		device_printf(dev, "SIOCSIFFLAGS %x\n", if_getflags(ifp));
 		PTNET_CORE_LOCK(sc);
 		if (if_getflags(ifp) & IFF_UP) {
 			/* Network stack wants the iff to be up. */
 			err = ptnet_init_locked(sc);
 		} else {
 			/* Network stack wants the iff to be down. */
 			err = ptnet_stop(sc);
 		}
 		/* We don't need to do nothing to support IFF_PROMISC,
 		 * since that is managed by the backend port. */
 		PTNET_CORE_UNLOCK(sc);
 		break;
 
 	case SIOCSIFCAP:
 		device_printf(dev, "SIOCSIFCAP %x %x\n",
 			      ifr->ifr_reqcap, if_getcapenable(ifp));
 		mask = ifr->ifr_reqcap ^ if_getcapenable(ifp);
 #ifdef DEVICE_POLLING
 		if (mask & IFCAP_POLLING) {
 			struct ptnet_queue *pq;
 			int i;
 
 			if (ifr->ifr_reqcap & IFCAP_POLLING) {
 				err = ether_poll_register(ptnet_poll, ifp);
 				if (err) {
 					break;
 				}
 				/* Stop queues and sync with taskqueues. */
 				if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING);
 				for (i = 0; i < sc->num_rings; i++) {
 					pq = sc-> queues + i;
 					/* Make sure the worker sees the
 					 * IFF_DRV_RUNNING down. */
 					PTNET_Q_LOCK(pq);
 					pq->atok->appl_need_kick = 0;
 					PTNET_Q_UNLOCK(pq);
 					/* Wait for rescheduling to finish. */
 					if (pq->taskq) {
 						taskqueue_drain(pq->taskq,
 								&pq->task);
 					}
 				}
 				if_setdrvflagbits(ifp, IFF_DRV_RUNNING, 0);
 			} else {
 				err = ether_poll_deregister(ifp);
 				for (i = 0; i < sc->num_rings; i++) {
 					pq = sc-> queues + i;
 					PTNET_Q_LOCK(pq);
 					pq->atok->appl_need_kick = 1;
 					PTNET_Q_UNLOCK(pq);
 				}
 			}
 		}
 #endif  /* DEVICE_POLLING */
 		if_setcapenable(ifp, ifr->ifr_reqcap);
 		break;
 
 	case SIOCSIFMTU:
 		/* We support any reasonable MTU. */
 		if (ifr->ifr_mtu < ETHERMIN ||
 				ifr->ifr_mtu > PTNET_MAX_PKT_SIZE) {
 			err = EINVAL;
 		} else {
 			PTNET_CORE_LOCK(sc);
 			if_setmtu(ifp, ifr->ifr_mtu);
 			PTNET_CORE_UNLOCK(sc);
 		}
 		break;
 
 	case SIOCSIFMEDIA:
 	case SIOCGIFMEDIA:
 		err = ifmedia_ioctl(ifp, ifr, &sc->media, cmd);
 		break;
 
 	default:
 		err = ether_ioctl(ifp, cmd, data);
 		break;
 	}
 
 	return err;
 }
 
 static int
 ptnet_init_locked(struct ptnet_softc *sc)
 {
 	if_t ifp = sc->ifp;
 	struct netmap_adapter *na_dr = &sc->ptna->dr.up;
 	struct netmap_adapter *na_nm = &sc->ptna->hwup.up;
 	unsigned int nm_buf_size;
 	int ret;
 
 	if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
 		return 0; /* nothing to do */
 	}
 
 	device_printf(sc->dev, "%s\n", __func__);
 
 	/* Translate offload capabilities according to if_capenable. */
 	if_sethwassist(ifp, 0);
 	if (if_getcapenable(ifp) & IFCAP_TXCSUM)
 		if_sethwassistbits(ifp, PTNET_CSUM_OFFLOAD, 0);
 	if (if_getcapenable(ifp) & IFCAP_TXCSUM_IPV6)
 		if_sethwassistbits(ifp, PTNET_CSUM_OFFLOAD_IPV6, 0);
 	if (if_getcapenable(ifp) & IFCAP_TSO4)
 		if_sethwassistbits(ifp, CSUM_IP_TSO, 0);
 	if (if_getcapenable(ifp) & IFCAP_TSO6)
 		if_sethwassistbits(ifp, CSUM_IP6_TSO, 0);
 
 	/*
 	 * Prepare the interface for netmap mode access.
 	 */
 	netmap_update_config(na_dr);
 
 	ret = netmap_mem_finalize(na_dr->nm_mem, na_dr);
 	if (ret) {
 		device_printf(sc->dev, "netmap_mem_finalize() failed\n");
 		return ret;
 	}
 
 	if (sc->ptna->backend_users == 0) {
 		ret = ptnet_nm_krings_create(na_nm);
 		if (ret) {
 			device_printf(sc->dev, "ptnet_nm_krings_create() "
 					       "failed\n");
 			goto err_mem_finalize;
 		}
 
 		ret = netmap_mem_rings_create(na_dr);
 		if (ret) {
 			device_printf(sc->dev, "netmap_mem_rings_create() "
 					       "failed\n");
 			goto err_rings_create;
 		}
 
 		ret = netmap_mem_get_lut(na_dr->nm_mem, &na_dr->na_lut);
 		if (ret) {
 			device_printf(sc->dev, "netmap_mem_get_lut() "
 					       "failed\n");
 			goto err_get_lut;
 		}
 	}
 
 	ret = ptnet_nm_register(na_dr, 1 /* on */);
 	if (ret) {
 		goto err_register;
 	}
 
 	nm_buf_size = NETMAP_BUF_SIZE(na_dr);
 
 	KASSERT(nm_buf_size > 0, ("Invalid netmap buffer size"));
 	sc->min_tx_space = PTNET_MAX_PKT_SIZE / nm_buf_size + 2;
 	device_printf(sc->dev, "%s: min_tx_space = %u\n", __func__,
 		      sc->min_tx_space);
 #ifdef PTNETMAP_STATS
 	callout_reset(&sc->tick, hz, ptnet_tick, sc);
 #endif
 
 	if_setdrvflagbits(ifp, IFF_DRV_RUNNING, 0);
 
 	return 0;
 
 err_register:
 	memset(&na_dr->na_lut, 0, sizeof(na_dr->na_lut));
 err_get_lut:
 	netmap_mem_rings_delete(na_dr);
 err_rings_create:
 	ptnet_nm_krings_delete(na_nm);
 err_mem_finalize:
 	netmap_mem_deref(na_dr->nm_mem, na_dr);
 
 	return ret;
 }
 
 /* To be called under core lock. */
 static int
 ptnet_stop(struct ptnet_softc *sc)
 {
 	if_t ifp = sc->ifp;
 	struct netmap_adapter *na_dr = &sc->ptna->dr.up;
 	struct netmap_adapter *na_nm = &sc->ptna->hwup.up;
 	int i;
 
 	device_printf(sc->dev, "%s\n", __func__);
 
 	if (!(if_getdrvflags(ifp) & IFF_DRV_RUNNING)) {
 		return 0; /* nothing to do */
 	}
 
 	/* Clear the driver-ready flag, and synchronize with all the queues,
 	 * so that after this loop we are sure nobody is working anymore with
 	 * the device. This scheme is taken from the vtnet driver. */
 	if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING);
 	callout_stop(&sc->tick);
 	for (i = 0; i < sc->num_rings; i++) {
 		PTNET_Q_LOCK(sc->queues + i);
 		PTNET_Q_UNLOCK(sc->queues + i);
 	}
 
 	ptnet_nm_register(na_dr, 0 /* off */);
 
 	if (sc->ptna->backend_users == 0) {
 		netmap_mem_rings_delete(na_dr);
 		ptnet_nm_krings_delete(na_nm);
 	}
 	netmap_mem_deref(na_dr->nm_mem, na_dr);
 
 	return 0;
 }
 
 static void
 ptnet_qflush(if_t ifp)
 {
 	struct ptnet_softc *sc = if_getsoftc(ifp);
 	int i;
 
 	/* Flush all the bufrings and do the interface flush. */
 	for (i = 0; i < sc->num_rings; i++) {
 		struct ptnet_queue *pq = sc->queues + i;
 		struct mbuf *m;
 
 		PTNET_Q_LOCK(pq);
 		if (pq->bufring) {
 			while ((m = buf_ring_dequeue_sc(pq->bufring))) {
 				m_freem(m);
 			}
 		}
 		PTNET_Q_UNLOCK(pq);
 	}
 
 	if_qflush(ifp);
 }
 
 static int
 ptnet_media_change(if_t ifp)
 {
 	struct ptnet_softc *sc = if_getsoftc(ifp);
 	struct ifmedia *ifm = &sc->media;
 
 	if (IFM_TYPE(ifm->ifm_media) != IFM_ETHER) {
 		return EINVAL;
 	}
 
 	return 0;
 }
 
 static uint64_t
 ptnet_get_counter(if_t ifp, ift_counter cnt)
 {
 	struct ptnet_softc *sc = if_getsoftc(ifp);
 	struct ptnet_queue_stats stats[2];
 	int i;
 
 	/* Accumulate statistics over the queues. */
 	memset(stats, 0, sizeof(stats));
 	for (i = 0; i < sc->num_rings; i++) {
 		struct ptnet_queue *pq = sc->queues + i;
 		int idx = (i < sc->num_tx_rings) ? 0 : 1;
 
 		stats[idx].packets	+= pq->stats.packets;
 		stats[idx].bytes	+= pq->stats.bytes;
 		stats[idx].errors	+= pq->stats.errors;
 		stats[idx].iqdrops	+= pq->stats.iqdrops;
 		stats[idx].mcasts	+= pq->stats.mcasts;
 	}
 
 	switch (cnt) {
 	case IFCOUNTER_IPACKETS:
 		return (stats[1].packets);
 	case IFCOUNTER_IQDROPS:
 		return (stats[1].iqdrops);
 	case IFCOUNTER_IERRORS:
 		return (stats[1].errors);
 	case IFCOUNTER_OPACKETS:
 		return (stats[0].packets);
 	case IFCOUNTER_OBYTES:
 		return (stats[0].bytes);
 	case IFCOUNTER_OMCASTS:
 		return (stats[0].mcasts);
 	default:
 		return (if_get_counter_default(ifp, cnt));
 	}
 }
 
 
 #ifdef PTNETMAP_STATS
 /* Called under core lock. */
 static void
 ptnet_tick(void *opaque)
 {
 	struct ptnet_softc *sc = opaque;
 	int i;
 
 	for (i = 0; i < sc->num_rings; i++) {
 		struct ptnet_queue *pq = sc->queues + i;
 		struct ptnet_queue_stats cur = pq->stats;
 		struct timeval now;
 		unsigned int delta;
 
 		microtime(&now);
 		delta = now.tv_usec - sc->last_ts.tv_usec +
 			(now.tv_sec - sc->last_ts.tv_sec) * 1000000;
 		delta /= 1000; /* in milliseconds */
 
 		if (delta == 0)
 			continue;
 
 		device_printf(sc->dev, "#%d[%u ms]:pkts %lu, kicks %lu, "
 			      "intr %lu\n", i, delta,
 			      (cur.packets - pq->last_stats.packets),
 			      (cur.kicks - pq->last_stats.kicks),
 			      (cur.intrs - pq->last_stats.intrs));
 		pq->last_stats = cur;
 	}
 	microtime(&sc->last_ts);
 	callout_schedule(&sc->tick, hz);
 }
 #endif /* PTNETMAP_STATS */
 
 static void
 ptnet_media_status(if_t ifp, struct ifmediareq *ifmr)
 {
 	/* We are always active, as the backend netmap port is
 	 * always open in netmap mode. */
 	ifmr->ifm_status = IFM_AVALID | IFM_ACTIVE;
 	ifmr->ifm_active = IFM_ETHER | IFM_10G_T | IFM_FDX;
 }
 
 static uint32_t
 ptnet_nm_ptctl(struct ptnet_softc *sc, uint32_t cmd)
 {
 	/*
 	 * Write a command and read back error status,
 	 * with zero meaning success.
 	 */
 	bus_write_4(sc->iomem, PTNET_IO_PTCTL, cmd);
 	return bus_read_4(sc->iomem, PTNET_IO_PTCTL);
 }
 
 static int
 ptnet_nm_config(struct netmap_adapter *na, struct nm_config_info *info)
 {
 	struct ptnet_softc *sc = if_getsoftc(na->ifp);
 
 	info->num_tx_rings = bus_read_4(sc->iomem, PTNET_IO_NUM_TX_RINGS);
 	info->num_rx_rings = bus_read_4(sc->iomem, PTNET_IO_NUM_RX_RINGS);
 	info->num_tx_descs = bus_read_4(sc->iomem, PTNET_IO_NUM_TX_SLOTS);
 	info->num_rx_descs = bus_read_4(sc->iomem, PTNET_IO_NUM_RX_SLOTS);
 	info->rx_buf_maxsize = NETMAP_BUF_SIZE(na);
 
 	device_printf(sc->dev, "txr %u, rxr %u, txd %u, rxd %u, rxbufsz %u\n",
 			info->num_tx_rings, info->num_rx_rings,
 			info->num_tx_descs, info->num_rx_descs,
 			info->rx_buf_maxsize);
 
 	return 0;
 }
 
 static void
 ptnet_sync_from_csb(struct ptnet_softc *sc, struct netmap_adapter *na)
 {
 	int i;
 
 	/* Sync krings from the host, reading from
 	 * CSB. */
 	for (i = 0; i < sc->num_rings; i++) {
 		struct nm_csb_atok *atok = sc->queues[i].atok;
 		struct nm_csb_ktoa *ktoa = sc->queues[i].ktoa;
 		struct netmap_kring *kring;
 
 		if (i < na->num_tx_rings) {
 			kring = na->tx_rings[i];
 		} else {
 			kring = na->rx_rings[i - na->num_tx_rings];
 		}
 		kring->rhead = kring->ring->head = atok->head;
 		kring->rcur = kring->ring->cur = atok->cur;
 		kring->nr_hwcur = ktoa->hwcur;
 		kring->nr_hwtail = kring->rtail =
 			kring->ring->tail = ktoa->hwtail;
 
 		nm_prdis("%d,%d: csb {hc %u h %u c %u ht %u}", t, i,
 		   ktoa->hwcur, atok->head, atok->cur,
 		   ktoa->hwtail);
 		nm_prdis("%d,%d: kring {hc %u rh %u rc %u h %u c %u ht %u rt %u t %u}",
 		   t, i, kring->nr_hwcur, kring->rhead, kring->rcur,
 		   kring->ring->head, kring->ring->cur, kring->nr_hwtail,
 		   kring->rtail, kring->ring->tail);
 	}
 }
 
 static void
 ptnet_update_vnet_hdr(struct ptnet_softc *sc)
 {
 	unsigned int wanted_hdr_len = ptnet_vnet_hdr ? PTNET_HDR_SIZE : 0;
 
 	bus_write_4(sc->iomem, PTNET_IO_VNET_HDR_LEN, wanted_hdr_len);
 	sc->vnet_hdr_len = bus_read_4(sc->iomem, PTNET_IO_VNET_HDR_LEN);
 	sc->ptna->hwup.up.virt_hdr_len = sc->vnet_hdr_len;
 }
 
 static int
 ptnet_nm_register(struct netmap_adapter *na, int onoff)
 {
 	/* device-specific */
 	if_t ifp = na->ifp;
 	struct ptnet_softc *sc = if_getsoftc(ifp);
 	int native = (na == &sc->ptna->hwup.up);
 	struct ptnet_queue *pq;
 	int ret = 0;
 	int i;
 
 	if (!onoff) {
 		sc->ptna->backend_users--;
 	}
 
 	/* If this is the last netmap client, guest interrupt enable flags may
 	 * be in arbitrary state. Since these flags are going to be used also
 	 * by the netdevice driver, we have to make sure to start with
 	 * notifications enabled. Also, schedule NAPI to flush pending packets
 	 * in the RX rings, since we will not receive further interrupts
 	 * until these will be processed. */
 	if (native && !onoff && na->active_fds == 0) {
 		nm_prinf("Exit netmap mode, re-enable interrupts");
 		for (i = 0; i < sc->num_rings; i++) {
 			pq = sc->queues + i;
 			pq->atok->appl_need_kick = 1;
 		}
 	}
 
 	if (onoff) {
 		if (sc->ptna->backend_users == 0) {
 			/* Initialize notification enable fields in the CSB. */
 			for (i = 0; i < sc->num_rings; i++) {
 				pq = sc->queues + i;
 				pq->ktoa->kern_need_kick = 1;
 				pq->atok->appl_need_kick =
 					(!(if_getcapenable(ifp) & IFCAP_POLLING)
 						&& i >= sc->num_tx_rings);
 			}
 
 			/* Set the virtio-net header length. */
 			ptnet_update_vnet_hdr(sc);
 
 			/* Make sure the host adapter passed through is ready
 			 * for txsync/rxsync. */
 			ret = ptnet_nm_ptctl(sc, PTNETMAP_PTCTL_CREATE);
 			if (ret) {
 				return ret;
 			}
 
 			/* Align the guest krings and rings to the state stored
 			 * in the CSB. */
 			ptnet_sync_from_csb(sc, na);
 		}
 
 		/* If not native, don't call nm_set_native_flags, since we don't want
 		 * to replace if_transmit method, nor set NAF_NETMAP_ON */
 		if (native) {
 			netmap_krings_mode_commit(na, onoff);
 			nm_set_native_flags(na);
 		}
 
 	} else {
 		if (native) {
 			nm_clear_native_flags(na);
 			netmap_krings_mode_commit(na, onoff);
 		}
 
 		if (sc->ptna->backend_users == 0) {
 			ret = ptnet_nm_ptctl(sc, PTNETMAP_PTCTL_DELETE);
 		}
 	}
 
 	if (onoff) {
 		sc->ptna->backend_users++;
 	}
 
 	return ret;
 }
 
 static int
 ptnet_nm_txsync(struct netmap_kring *kring, int flags)
 {
 	struct ptnet_softc *sc = if_getsoftc(kring->na->ifp);
 	struct ptnet_queue *pq = sc->queues + kring->ring_id;
 	bool notify;
 
 	notify = netmap_pt_guest_txsync(pq->atok, pq->ktoa, kring, flags);
 	if (notify) {
 		ptnet_kick(pq);
 	}
 
 	return 0;
 }
 
 static int
 ptnet_nm_rxsync(struct netmap_kring *kring, int flags)
 {
 	struct ptnet_softc *sc = if_getsoftc(kring->na->ifp);
 	struct ptnet_queue *pq = sc->rxqueues + kring->ring_id;
 	bool notify;
 
 	notify = netmap_pt_guest_rxsync(pq->atok, pq->ktoa, kring, flags);
 	if (notify) {
 		ptnet_kick(pq);
 	}
 
 	return 0;
 }
 
 static void
 ptnet_nm_intr(struct netmap_adapter *na, int onoff)
 {
 	struct ptnet_softc *sc = if_getsoftc(na->ifp);
 	int i;
 
 	for (i = 0; i < sc->num_rings; i++) {
 		struct ptnet_queue *pq = sc->queues + i;
 		pq->atok->appl_need_kick = onoff;
 	}
 }
 
 static void
 ptnet_tx_intr(void *opaque)
 {
 	struct ptnet_queue *pq = opaque;
 	struct ptnet_softc *sc = pq->sc;
 
 	DBG(device_printf(sc->dev, "Tx interrupt #%d\n", pq->kring_id));
 #ifdef PTNETMAP_STATS
 	pq->stats.intrs ++;
 #endif /* PTNETMAP_STATS */
 
 	if (netmap_tx_irq(sc->ifp, pq->kring_id) != NM_IRQ_PASS) {
 		return;
 	}
 
 	/* Schedule the tasqueue to flush process transmissions requests.
 	 * However, vtnet, if_em and if_igb just call ptnet_transmit() here,
 	 * at least when using MSI-X interrupts. The if_em driver, instead
 	 * schedule taskqueue when using legacy interrupts. */
 	taskqueue_enqueue(pq->taskq, &pq->task);
 }
 
 static void
 ptnet_rx_intr(void *opaque)
 {
 	struct ptnet_queue *pq = opaque;
 	struct ptnet_softc *sc = pq->sc;
 	unsigned int unused;
 
 	DBG(device_printf(sc->dev, "Rx interrupt #%d\n", pq->kring_id));
 #ifdef PTNETMAP_STATS
 	pq->stats.intrs ++;
 #endif /* PTNETMAP_STATS */
 
 	if (netmap_rx_irq(sc->ifp, pq->kring_id, &unused) != NM_IRQ_PASS) {
 		return;
 	}
 
 	/* Like vtnet, if_igb and if_em drivers when using MSI-X interrupts,
 	 * receive-side processing is executed directly in the interrupt
 	 * service routine. Alternatively, we may schedule the taskqueue. */
 	ptnet_rx_eof(pq, PTNET_RX_BUDGET, true);
 }
 
 static void
 ptnet_vlan_tag_remove(struct mbuf *m)
 {
 	struct ether_vlan_header *evh;
 
 	evh = mtod(m, struct ether_vlan_header *);
 	m->m_pkthdr.ether_vtag = ntohs(evh->evl_tag);
 	m->m_flags |= M_VLANTAG;
 
 	/* Strip the 802.1Q header. */
 	bcopy((char *) evh, (char *) evh + ETHER_VLAN_ENCAP_LEN,
 	    ETHER_HDR_LEN - ETHER_TYPE_LEN);
 	m_adj(m, ETHER_VLAN_ENCAP_LEN);
 }
 
 static void
 ptnet_ring_update(struct ptnet_queue *pq, struct netmap_kring *kring,
 		  unsigned int head, unsigned int sync_flags)
 {
 	struct netmap_ring *ring = kring->ring;
 	struct nm_csb_atok *atok = pq->atok;
 	struct nm_csb_ktoa *ktoa = pq->ktoa;
 
 	/* Some packets have been pushed to the netmap ring. We have
 	 * to tell the host to process the new packets, updating cur
 	 * and head in the CSB. */
 	ring->head = ring->cur = head;
 
 	/* Mimic nm_txsync_prologue/nm_rxsync_prologue. */
 	kring->rcur = kring->rhead = head;
 
 	nm_sync_kloop_appl_write(atok, kring->rcur, kring->rhead);
 
 	/* Kick the host if needed. */
 	if (NM_ACCESS_ONCE(ktoa->kern_need_kick)) {
 		atok->sync_flags = sync_flags;
 		ptnet_kick(pq);
 	}
 }
 
 #define PTNET_TX_NOSPACE(_h, _k, _min)	\
 	((((_h) < (_k)->rtail) ? 0 : (_k)->nkr_num_slots) + \
 		(_k)->rtail - (_h)) < (_min)
 
 /* This function may be called by the network stack, or by
  * by the taskqueue thread. */
 static int
 ptnet_drain_transmit_queue(struct ptnet_queue *pq, unsigned int budget,
 			   bool may_resched)
 {
 	struct ptnet_softc *sc = pq->sc;
 	bool have_vnet_hdr = sc->vnet_hdr_len;
 	struct netmap_adapter *na = &sc->ptna->dr.up;
 	if_t ifp = sc->ifp;
 	unsigned int batch_count = 0;
 	struct nm_csb_atok *atok;
 	struct nm_csb_ktoa *ktoa;
 	struct netmap_kring *kring;
 	struct netmap_ring *ring;
 	struct netmap_slot *slot;
 	unsigned int count = 0;
 	unsigned int minspace;
 	unsigned int head;
 	unsigned int lim;
 	struct mbuf *mhead;
 	struct mbuf *mf;
 	int nmbuf_bytes;
 	uint8_t *nmbuf;
 
 	if (!PTNET_Q_TRYLOCK(pq)) {
 		/* We failed to acquire the lock, schedule the taskqueue. */
 		nm_prlim(1, "Deferring TX work");
 		if (may_resched) {
 			taskqueue_enqueue(pq->taskq, &pq->task);
 		}
 
 		return 0;
 	}
 
 	if (unlikely(!(if_getdrvflags(ifp) & IFF_DRV_RUNNING))) {
 		PTNET_Q_UNLOCK(pq);
 		nm_prlim(1, "Interface is down");
 		return ENETDOWN;
 	}
 
 	atok = pq->atok;
 	ktoa = pq->ktoa;
 	kring = na->tx_rings[pq->kring_id];
 	ring = kring->ring;
 	lim = kring->nkr_num_slots - 1;
 	head = ring->head;
 	minspace = sc->min_tx_space;
 
 	while (count < budget) {
 		if (PTNET_TX_NOSPACE(head, kring, minspace)) {
 			/* We ran out of slot, let's see if the host has
 			 * freed up some, by reading hwcur and hwtail from
 			 * the CSB. */
 			ptnet_sync_tail(ktoa, kring);
 
 			if (PTNET_TX_NOSPACE(head, kring, minspace)) {
 				/* Still no slots available. Reactivate the
 				 * interrupts so that we can be notified
 				 * when some free slots are made available by
 				 * the host. */
 				atok->appl_need_kick = 1;
 
 				/* Double check. We need a full barrier to
 				 * prevent the store to atok->appl_need_kick
 				 * to be reordered with the load from
 				 * ktoa->hwcur and ktoa->hwtail (store-load
 				 * barrier). */
 				nm_stld_barrier();
 				ptnet_sync_tail(ktoa, kring);
 				if (likely(PTNET_TX_NOSPACE(head, kring,
 							    minspace))) {
 					break;
 				}
 
 				nm_prlim(1, "Found more slots by doublecheck");
 				/* More slots were freed before reactivating
 				 * the interrupts. */
 				atok->appl_need_kick = 0;
 			}
 		}
 
 		mhead = drbr_peek(ifp, pq->bufring);
 		if (!mhead) {
 			break;
 		}
 
 		/* Initialize transmission state variables. */
 		slot = ring->slot + head;
 		nmbuf = NMB(na, slot);
 		nmbuf_bytes = 0;
 
 		/* If needed, prepare the virtio-net header at the beginning
 		 * of the first slot. */
 		if (have_vnet_hdr) {
 			struct virtio_net_hdr *vh =
 					(struct virtio_net_hdr *)nmbuf;
 
 			/* For performance, we could replace this memset() with
 			 * two 8-bytes-wide writes. */
 			memset(nmbuf, 0, PTNET_HDR_SIZE);
 			if (mhead->m_pkthdr.csum_flags & PTNET_ALL_OFFLOAD) {
 				mhead = virtio_net_tx_offload(ifp, mhead, false,
 							 vh);
 				if (unlikely(!mhead)) {
 					/* Packet dropped because errors
 					 * occurred while preparing the vnet
 					 * header. Let's go ahead with the next
 					 * packet. */
 					pq->stats.errors ++;
 					drbr_advance(ifp, pq->bufring);
 					continue;
 				}
 			}
 			nm_prdis(1, "%s: [csum_flags %lX] vnet hdr: flags %x "
 			      "csum_start %u csum_ofs %u hdr_len = %u "
 			      "gso_size %u gso_type %x", __func__,
 			      mhead->m_pkthdr.csum_flags, vh->flags,
 			      vh->csum_start, vh->csum_offset, vh->hdr_len,
 			      vh->gso_size, vh->gso_type);
 
 			nmbuf += PTNET_HDR_SIZE;
 			nmbuf_bytes += PTNET_HDR_SIZE;
 		}
 
 		for (mf = mhead; mf; mf = mf->m_next) {
 			uint8_t *mdata = mf->m_data;
 			int mlen = mf->m_len;
 
 			for (;;) {
 				int copy = NETMAP_BUF_SIZE(na) - nmbuf_bytes;
 
 				if (mlen < copy) {
 					copy = mlen;
 				}
 				memcpy(nmbuf, mdata, copy);
 
 				mdata += copy;
 				mlen -= copy;
 				nmbuf += copy;
 				nmbuf_bytes += copy;
 
 				if (!mlen) {
 					break;
 				}
 
 				slot->len = nmbuf_bytes;
 				slot->flags = NS_MOREFRAG;
 
 				head = nm_next(head, lim);
 				KASSERT(head != ring->tail,
 					("Unexpectedly run out of TX space"));
 				slot = ring->slot + head;
 				nmbuf = NMB(na, slot);
 				nmbuf_bytes = 0;
 			}
 		}
 
 		/* Complete last slot and update head. */
 		slot->len = nmbuf_bytes;
 		slot->flags = 0;
 		head = nm_next(head, lim);
 
 		/* Consume the packet just processed. */
 		drbr_advance(ifp, pq->bufring);
 
 		/* Copy the packet to listeners. */
 		ETHER_BPF_MTAP(ifp, mhead);
 
 		pq->stats.packets ++;
 		pq->stats.bytes += mhead->m_pkthdr.len;
 		if (mhead->m_flags & M_MCAST) {
 			pq->stats.mcasts ++;
 		}
 
 		m_freem(mhead);
 
 		count ++;
 		if (++batch_count == PTNET_TX_BATCH) {
 			ptnet_ring_update(pq, kring, head, NAF_FORCE_RECLAIM);
 			batch_count = 0;
 		}
 	}
 
 	if (batch_count) {
 		ptnet_ring_update(pq, kring, head, NAF_FORCE_RECLAIM);
 	}
 
 	if (count >= budget && may_resched) {
 		DBG(nm_prlim(1, "out of budget: resched, %d mbufs pending\n",
 					drbr_inuse(ifp, pq->bufring)));
 		taskqueue_enqueue(pq->taskq, &pq->task);
 	}
 
 	PTNET_Q_UNLOCK(pq);
 
 	return count;
 }
 
 static int
 ptnet_transmit(if_t ifp, struct mbuf *m)
 {
 	struct ptnet_softc *sc = if_getsoftc(ifp);
 	struct ptnet_queue *pq;
 	unsigned int queue_idx;
 	int err;
 
 	DBG(device_printf(sc->dev, "transmit %p\n", m));
 
 	/* Insert 802.1Q header if needed. */
 	if (m->m_flags & M_VLANTAG) {
 		m = ether_vlanencap(m, m->m_pkthdr.ether_vtag);
 		if (m == NULL) {
 			return ENOBUFS;
 		}
 		m->m_flags &= ~M_VLANTAG;
 	}
 
 	/* Get the flow-id if available. */
 	queue_idx = (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) ?
 		    m->m_pkthdr.flowid : curcpu;
 
 	if (unlikely(queue_idx >= sc->num_tx_rings)) {
 		queue_idx %= sc->num_tx_rings;
 	}
 
 	pq = sc->queues + queue_idx;
 
 	err = drbr_enqueue(ifp, pq->bufring, m);
 	if (err) {
 		/* ENOBUFS when the bufring is full */
 		nm_prlim(1, "%s: drbr_enqueue() failed %d\n",
 			__func__, err);
 		pq->stats.errors ++;
 		return err;
 	}
 
 	if (if_getcapenable(ifp) & IFCAP_POLLING) {
 		/* If polling is on, the transmit queues will be
 		 * drained by the poller. */
 		return 0;
 	}
 
 	err = ptnet_drain_transmit_queue(pq, PTNET_TX_BUDGET, true);
 
 	return (err < 0) ? err : 0;
 }
 
 static unsigned int
 ptnet_rx_discard(struct netmap_kring *kring, unsigned int head)
 {
 	struct netmap_ring *ring = kring->ring;
 	struct netmap_slot *slot = ring->slot + head;
 
 	for (;;) {
 		head = nm_next(head, kring->nkr_num_slots - 1);
 		if (!(slot->flags & NS_MOREFRAG) || head == ring->tail) {
 			break;
 		}
 		slot = ring->slot + head;
 	}
 
 	return head;
 }
 
 static inline struct mbuf *
 ptnet_rx_slot(struct mbuf *mtail, uint8_t *nmbuf, unsigned int nmbuf_len)
 {
 	uint8_t *mdata = mtod(mtail, uint8_t *) + mtail->m_len;
 
 	do {
 		unsigned int copy;
 
 		if (mtail->m_len == MCLBYTES) {
 			struct mbuf *mf;
 
 			mf = m_getcl(M_NOWAIT, MT_DATA, 0);
 			if (unlikely(!mf)) {
 				return NULL;
 			}
 
 			mtail->m_next = mf;
 			mtail = mf;
 			mdata = mtod(mtail, uint8_t *);
 			mtail->m_len = 0;
 		}
 
 		copy = MCLBYTES - mtail->m_len;
 		if (nmbuf_len < copy) {
 			copy = nmbuf_len;
 		}
 
 		memcpy(mdata, nmbuf, copy);
 
 		nmbuf += copy;
 		nmbuf_len -= copy;
 		mdata += copy;
 		mtail->m_len += copy;
 	} while (nmbuf_len);
 
 	return mtail;
 }
 
 static int
 ptnet_rx_eof(struct ptnet_queue *pq, unsigned int budget, bool may_resched)
 {
 	struct ptnet_softc *sc = pq->sc;
 	bool have_vnet_hdr = sc->vnet_hdr_len;
 	struct nm_csb_atok *atok = pq->atok;
 	struct nm_csb_ktoa *ktoa = pq->ktoa;
 	struct netmap_adapter *na = &sc->ptna->dr.up;
 	struct netmap_kring *kring = na->rx_rings[pq->kring_id];
 	struct netmap_ring *ring = kring->ring;
 	unsigned int const lim = kring->nkr_num_slots - 1;
 	unsigned int batch_count = 0;
 	if_t ifp = sc->ifp;
 	unsigned int count = 0;
 	uint32_t head;
 
 	PTNET_Q_LOCK(pq);
 
 	if (unlikely(!(if_getdrvflags(ifp) & IFF_DRV_RUNNING))) {
 		goto unlock;
 	}
 
 	kring->nr_kflags &= ~NKR_PENDINTR;
 
 	head = ring->head;
 	while (count < budget) {
 		uint32_t prev_head = head;
 		struct mbuf *mhead, *mtail;
 		struct virtio_net_hdr *vh;
 		struct netmap_slot *slot;
 		unsigned int nmbuf_len;
 		uint8_t *nmbuf;
 		int deliver = 1; /* the mbuf to the network stack. */
 host_sync:
 		if (head == ring->tail) {
 			/* We ran out of slot, let's see if the host has
 			 * added some, by reading hwcur and hwtail from
 			 * the CSB. */
 			ptnet_sync_tail(ktoa, kring);
 
 			if (head == ring->tail) {
 				/* Still no slots available. Reactivate
 				 * interrupts as they were disabled by the
 				 * host thread right before issuing the
 				 * last interrupt. */
 				atok->appl_need_kick = 1;
 
 				/* Double check for more completed RX slots.
 				 * We need a full barrier to prevent the store
 				 * to atok->appl_need_kick to be reordered with
 				 * the load from ktoa->hwcur and ktoa->hwtail
 				 * (store-load barrier). */
 				nm_stld_barrier();
 				ptnet_sync_tail(ktoa, kring);
 				if (likely(head == ring->tail)) {
 					break;
 				}
 				atok->appl_need_kick = 0;
 			}
 		}
 
 		/* Initialize ring state variables, possibly grabbing the
 		 * virtio-net header. */
 		slot = ring->slot + head;
 		nmbuf = NMB(na, slot);
 		nmbuf_len = slot->len;
 
 		vh = (struct virtio_net_hdr *)nmbuf;
 		if (have_vnet_hdr) {
 			if (unlikely(nmbuf_len < PTNET_HDR_SIZE)) {
 				/* There is no good reason why host should
 				 * put the header in multiple netmap slots.
 				 * If this is the case, discard. */
 				nm_prlim(1, "Fragmented vnet-hdr: dropping");
 				head = ptnet_rx_discard(kring, head);
 				pq->stats.iqdrops ++;
 				deliver = 0;
 				goto skip;
 			}
 			nm_prdis(1, "%s: vnet hdr: flags %x csum_start %u "
 			      "csum_ofs %u hdr_len = %u gso_size %u "
 			      "gso_type %x", __func__, vh->flags,
 			      vh->csum_start, vh->csum_offset, vh->hdr_len,
 			      vh->gso_size, vh->gso_type);
 			nmbuf += PTNET_HDR_SIZE;
 			nmbuf_len -= PTNET_HDR_SIZE;
 		}
 
 		/* Allocate the head of a new mbuf chain.
 		 * We use m_getcl() to allocate an mbuf with standard cluster
 		 * size (MCLBYTES). In the future we could use m_getjcl()
 		 * to choose different sizes. */
 		mhead = mtail = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 		if (unlikely(mhead == NULL)) {
 			device_printf(sc->dev, "%s: failed to allocate mbuf "
 				      "head\n", __func__);
 			pq->stats.errors ++;
 			break;
 		}
 
 		/* Initialize the mbuf state variables. */
 		mhead->m_pkthdr.len = nmbuf_len;
 		mtail->m_len = 0;
 
 		/* Scan all the netmap slots containing the current packet. */
 		for (;;) {
 			DBG(device_printf(sc->dev, "%s: h %u t %u rcv frag "
 					  "len %u, flags %u\n", __func__,
 					  head, ring->tail, slot->len,
 					  slot->flags));
 
 			mtail = ptnet_rx_slot(mtail, nmbuf, nmbuf_len);
 			if (unlikely(!mtail)) {
 				/* Ouch. We ran out of memory while processing
 				 * a packet. We have to restore the previous
 				 * head position, free the mbuf chain, and
 				 * schedule the taskqueue to give the packet
 				 * another chance. */
 				device_printf(sc->dev, "%s: failed to allocate"
 					" mbuf frag, reset head %u --> %u\n",
 					__func__, head, prev_head);
 				head = prev_head;
 				m_freem(mhead);
 				pq->stats.errors ++;
 				if (may_resched) {
 					taskqueue_enqueue(pq->taskq,
 							  &pq->task);
 				}
 				goto escape;
 			}
 
 			/* We have to increment head irrespective of the
 			 * NS_MOREFRAG being set or not. */
 			head = nm_next(head, lim);
 
 			if (!(slot->flags & NS_MOREFRAG)) {
 				break;
 			}
 
 			if (unlikely(head == ring->tail)) {
 				/* The very last slot prepared by the host has
 				 * the NS_MOREFRAG set. Drop it and continue
 				 * the outer cycle (to do the double-check). */
 				nm_prlim(1, "Incomplete packet: dropping");
 				m_freem(mhead);
 				pq->stats.iqdrops ++;
 				goto host_sync;
 			}
 
 			slot = ring->slot + head;
 			nmbuf = NMB(na, slot);
 			nmbuf_len = slot->len;
 			mhead->m_pkthdr.len += nmbuf_len;
 		}
 
 		mhead->m_pkthdr.rcvif = ifp;
 		mhead->m_pkthdr.csum_flags = 0;
 
 		/* Store the queue idx in the packet header. */
 		mhead->m_pkthdr.flowid = pq->kring_id;
 		M_HASHTYPE_SET(mhead, M_HASHTYPE_OPAQUE);
 
 		if (if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING) {
 			struct ether_header *eh;
 
 			eh = mtod(mhead, struct ether_header *);
 			if (eh->ether_type == htons(ETHERTYPE_VLAN)) {
 				ptnet_vlan_tag_remove(mhead);
 				/*
 				 * With the 802.1Q header removed, update the
 				 * checksum starting location accordingly.
 				 */
 				if (vh->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM)
 					vh->csum_start -= ETHER_VLAN_ENCAP_LEN;
 			}
 		}
 
 		if (unlikely(have_vnet_hdr && virtio_net_rx_csum(mhead, vh))) {
 			m_freem(mhead);
 			nm_prlim(1, "Csum offload error: dropping");
 			pq->stats.iqdrops ++;
 			deliver = 0;
 		}
 
 skip:
 		count ++;
 		if (++batch_count >= PTNET_RX_BATCH) {
 			/* Some packets have been (or will be) pushed to the network
 			 * stack. We need to update the CSB to tell the host about
 			 * the new ring->cur and ring->head (RX buffer refill). */
 			ptnet_ring_update(pq, kring, head, NAF_FORCE_READ);
 			batch_count = 0;
 		}
 
 		if (likely(deliver))  {
 			pq->stats.packets ++;
 			pq->stats.bytes += mhead->m_pkthdr.len;
 
 			PTNET_Q_UNLOCK(pq);
 			if_input(ifp, mhead);
 			PTNET_Q_LOCK(pq);
 			/* The ring->head index (and related indices) are
 			 * updated under pq lock by ptnet_ring_update().
 			 * Since we dropped the lock to call if_input(), we
 			 * must reload ring->head and restart processing the
 			 * ring from there. */
 			head = ring->head;
 
 			if (unlikely(!(if_getdrvflags(ifp) & IFF_DRV_RUNNING))) {
 				/* The interface has gone down while we didn't
 				 * have the lock. Stop any processing and exit. */
 				goto unlock;
 			}
 		}
 	}
 escape:
 	if (batch_count) {
 		ptnet_ring_update(pq, kring, head, NAF_FORCE_READ);
 
 	}
 
 	if (count >= budget && may_resched) {
 		/* If we ran out of budget or the double-check found new
 		 * slots to process, schedule the taskqueue. */
 		DBG(nm_prlim(1, "out of budget: resched h %u t %u\n",
 					head, ring->tail));
 		taskqueue_enqueue(pq->taskq, &pq->task);
 	}
 unlock:
 	PTNET_Q_UNLOCK(pq);
 
 	return count;
 }
 
 static void
 ptnet_rx_task(void *context, int pending)
 {
 	struct ptnet_queue *pq = context;
 
 	DBG(nm_prlim(1, "%s: pq #%u\n", __func__, pq->kring_id));
 	ptnet_rx_eof(pq, PTNET_RX_BUDGET, true);
 }
 
 static void
 ptnet_tx_task(void *context, int pending)
 {
 	struct ptnet_queue *pq = context;
 
 	DBG(nm_prlim(1, "%s: pq #%u\n", __func__, pq->kring_id));
 	ptnet_drain_transmit_queue(pq, PTNET_TX_BUDGET, true);
 }
 
 #ifdef DEVICE_POLLING
 /* We don't need to handle differently POLL_AND_CHECK_STATUS and
  * POLL_ONLY, since we don't have an Interrupt Status Register. */
 static int
 ptnet_poll(if_t ifp, enum poll_cmd cmd, int budget)
 {
 	struct ptnet_softc *sc = if_getsoftc(ifp);
 	unsigned int queue_budget;
 	unsigned int count = 0;
 	bool borrow = false;
 	int i;
 
 	KASSERT(sc->num_rings > 0, ("Found no queues in while polling ptnet"));
 	queue_budget = MAX(budget / sc->num_rings, 1);
 	nm_prlim(1, "Per-queue budget is %d", queue_budget);
 
 	while (budget) {
 		unsigned int rcnt = 0;
 
 		for (i = 0; i < sc->num_rings; i++) {
 			struct ptnet_queue *pq = sc->queues + i;
 
 			if (borrow) {
 				queue_budget = MIN(queue_budget, budget);
 				if (queue_budget == 0) {
 					break;
 				}
 			}
 
 			if (i < sc->num_tx_rings) {
 				rcnt += ptnet_drain_transmit_queue(pq,
 						   queue_budget, false);
 			} else {
 				rcnt += ptnet_rx_eof(pq, queue_budget,
 						      false);
 			}
 		}
 
 		if (!rcnt) {
 			/* A scan of the queues gave no result, we can
 			 * stop here. */
 			break;
 		}
 
 		if (rcnt > budget) {
 			/* This may happen when initial budget < sc->num_rings,
 			 * since one packet budget is given to each queue
 			 * anyway. Just pretend we didn't eat "so much". */
 			rcnt = budget;
 		}
 		count += rcnt;
 		budget -= rcnt;
 		borrow = true;
 	}
 
 
 	return count;
 }
 #endif /* DEVICE_POLLING */
 #endif /* WITH_PTNETMAP */
diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c
index 23954b377f9b..473b252e7329 100644
--- a/sys/dev/netmap/netmap_mem2.c
+++ b/sys/dev/netmap/netmap_mem2.c
@@ -1,2969 +1,2966 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (C) 2012-2014 Matteo Landi
  * Copyright (C) 2012-2016 Luigi Rizzo
  * Copyright (C) 2012-2016 Giuseppe Lettieri
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *   1. Redistributions of source code must retain the above copyright
  *      notice, this list of conditions and the following disclaimer.
  *   2. Redistributions in binary form must reproduce the above copyright
  *      notice, this list of conditions and the following disclaimer in the
  *      documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifdef linux
 #include "bsd_glue.h"
 #endif /* linux */
 
 #ifdef __APPLE__
 #include "osx_glue.h"
 #endif /* __APPLE__ */
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h> /* prerequisite */
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>		/* MALLOC_DEFINE */
 #include <sys/proc.h>
 #include <vm/vm.h>	/* vtophys */
 #include <vm/pmap.h>	/* vtophys */
 #include <sys/socket.h> /* sockaddrs */
 #include <sys/selinfo.h>
 #include <sys/sysctl.h>
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/vnet.h>
 #include <machine/bus.h>	/* bus_dmamap_* */
 
 /* M_NETMAP only used in here */
 MALLOC_DECLARE(M_NETMAP);
 MALLOC_DEFINE(M_NETMAP, "netmap", "Network memory map");
 
 #endif /* __FreeBSD__ */
 
 #ifdef _WIN32
 #include <win_glue.h>
 #endif
 
 #include <net/netmap.h>
 #include <dev/netmap/netmap_kern.h>
 #include <net/netmap_virt.h>
 #include "netmap_mem2.h"
 
 #ifdef _WIN32_USE_SMALL_GENERIC_DEVICES_MEMORY
 #define NETMAP_BUF_MAX_NUM  8*4096      /* if too big takes too much time to allocate */
 #else
 #define NETMAP_BUF_MAX_NUM 20*4096*2	/* large machine */
 #endif
 
 #define NETMAP_POOL_MAX_NAMSZ	32
 
 
 enum {
 	NETMAP_IF_POOL   = 0,
 	NETMAP_RING_POOL,
 	NETMAP_BUF_POOL,
 	NETMAP_POOLS_NR
 };
 
 
 struct netmap_obj_params {
 	u_int size;
 	u_int num;
 
 	u_int last_size;
 	u_int last_num;
 };
 
 struct netmap_obj_pool {
 	char name[NETMAP_POOL_MAX_NAMSZ];	/* name of the allocator */
 
 	/* ---------------------------------------------------*/
 	/* these are only meaningful if the pool is finalized */
 	/* (see 'finalized' field in netmap_mem_d)            */
 	size_t memtotal;	/* actual total memory space */
 
 	struct lut_entry *lut;  /* virt,phys addresses, objtotal entries */
 	uint32_t *bitmap;       /* one bit per buffer, 1 means free */
 	uint32_t *invalid_bitmap;/* one bit per buffer, 1 means invalid */
 	uint32_t bitmap_slots;	/* number of uint32 entries in bitmap */
 
 	u_int objtotal;         /* actual total number of objects. */
 	u_int numclusters;	/* actual number of clusters */
 	u_int objfree;          /* number of free objects. */
 
 	int	alloc_done;	/* we have allocated the memory */
 	/* ---------------------------------------------------*/
 
 	/* limits */
 	u_int objminsize;	/* minimum object size */
 	u_int objmaxsize;	/* maximum object size */
 	u_int nummin;		/* minimum number of objects */
 	u_int nummax;		/* maximum number of objects */
 
 	/* these are changed only by config */
 	u_int _objtotal;	/* total number of objects */
 	u_int _objsize;		/* object size */
 	u_int _clustsize;       /* cluster size */
 	u_int _clustentries;    /* objects per cluster */
 	u_int _numclusters;	/* number of clusters */
 
 	/* requested values */
 	u_int r_objtotal;
 	u_int r_objsize;
 };
 
 #define NMA_LOCK_T		NM_MTX_T
 #define NMA_LOCK_INIT(n)	NM_MTX_INIT((n)->nm_mtx)
 #define NMA_LOCK_DESTROY(n)	NM_MTX_DESTROY((n)->nm_mtx)
 #define NMA_LOCK(n)		NM_MTX_LOCK((n)->nm_mtx)
 #define NMA_SPINLOCK(n)         NM_MTX_SPINLOCK((n)->nm_mtx)
 #define NMA_UNLOCK(n)		NM_MTX_UNLOCK((n)->nm_mtx)
 
 struct netmap_mem_ops {
 	int (*nmd_get_lut)(struct netmap_mem_d *, struct netmap_lut*);
 	int  (*nmd_get_info)(struct netmap_mem_d *, uint64_t *size,
 			u_int *memflags, uint16_t *id);
 
 	vm_paddr_t (*nmd_ofstophys)(struct netmap_mem_d *, vm_ooffset_t);
 	int (*nmd_config)(struct netmap_mem_d *);
 	int (*nmd_finalize)(struct netmap_mem_d *, struct netmap_adapter *);
 	void (*nmd_deref)(struct netmap_mem_d *, struct netmap_adapter *);
 	ssize_t  (*nmd_if_offset)(struct netmap_mem_d *, const void *vaddr);
 	void (*nmd_delete)(struct netmap_mem_d *);
 
 	struct netmap_if * (*nmd_if_new)(struct netmap_mem_d *,
 			struct netmap_adapter *, struct netmap_priv_d *);
 	void (*nmd_if_delete)(struct netmap_mem_d *,
 			struct netmap_adapter *, struct netmap_if *);
 	int  (*nmd_rings_create)(struct netmap_mem_d *,
 			struct netmap_adapter *);
 	void (*nmd_rings_delete)(struct netmap_mem_d *,
 			struct netmap_adapter *);
 };
 
 struct netmap_mem_d {
 	NMA_LOCK_T nm_mtx;  /* protect the allocator */
 	size_t nm_totalsize; /* shorthand */
 
 	u_int flags;
 #define NETMAP_MEM_FINALIZED	0x1	/* preallocation done */
 #define NETMAP_MEM_HIDDEN	0x8	/* being prepared */
 #define NETMAP_MEM_NOMAP	0x10	/* do not map/unmap pdevs */
 	int lasterr;		/* last error for curr config */
 	int active;		/* active users */
 	int refcount;
 	/* the three allocators */
 	struct netmap_obj_pool pools[NETMAP_POOLS_NR];
 
 	nm_memid_t nm_id;	/* allocator identifier */
 	int nm_grp;	/* iommu group id */
 
 	/* list of all existing allocators, sorted by nm_id */
 	struct netmap_mem_d *prev, *next;
 
 	struct netmap_mem_ops *ops;
 
 	struct netmap_obj_params params[NETMAP_POOLS_NR];
 
 #define NM_MEM_NAMESZ	16
 	char name[NM_MEM_NAMESZ];
 };
 
 int
 netmap_mem_get_lut(struct netmap_mem_d *nmd, struct netmap_lut *lut)
 {
 	int rv;
 
 	NMA_LOCK(nmd);
 	rv = nmd->ops->nmd_get_lut(nmd, lut);
 	NMA_UNLOCK(nmd);
 
 	return rv;
 }
 
 int
 netmap_mem_get_info(struct netmap_mem_d *nmd, uint64_t *size,
 		u_int *memflags, nm_memid_t *memid)
 {
 	int rv;
 
 	NMA_LOCK(nmd);
 	rv = nmd->ops->nmd_get_info(nmd, size, memflags, memid);
 	NMA_UNLOCK(nmd);
 
 	return rv;
 }
 
 vm_paddr_t
 netmap_mem_ofstophys(struct netmap_mem_d *nmd, vm_ooffset_t off)
 {
 	vm_paddr_t pa;
 
 #if defined(__FreeBSD__)
 	/* This function is called by netmap_dev_pager_fault(), which holds a
 	 * non-sleepable lock since FreeBSD 12. Since we cannot sleep, we
 	 * spin on the trylock. */
 	NMA_SPINLOCK(nmd);
 #else
 	NMA_LOCK(nmd);
 #endif
 	pa = nmd->ops->nmd_ofstophys(nmd, off);
 	NMA_UNLOCK(nmd);
 
 	return pa;
 }
 
 static int
 netmap_mem_config(struct netmap_mem_d *nmd)
 {
 	if (nmd->active) {
 		/* already in use. Not fatal, but we
 		 * cannot change the configuration
 		 */
 		return 0;
 	}
 
 	return nmd->ops->nmd_config(nmd);
 }
 
 ssize_t
 netmap_mem_if_offset(struct netmap_mem_d *nmd, const void *off)
 {
 	ssize_t rv;
 
 	NMA_LOCK(nmd);
 	rv = nmd->ops->nmd_if_offset(nmd, off);
 	NMA_UNLOCK(nmd);
 
 	return rv;
 }
 
 static void
 netmap_mem_delete(struct netmap_mem_d *nmd)
 {
 	nmd->ops->nmd_delete(nmd);
 }
 
 struct netmap_if *
 netmap_mem_if_new(struct netmap_adapter *na, struct netmap_priv_d *priv)
 {
 	struct netmap_if *nifp;
 	struct netmap_mem_d *nmd = na->nm_mem;
 
 	NMA_LOCK(nmd);
 	nifp = nmd->ops->nmd_if_new(nmd, na, priv);
 	NMA_UNLOCK(nmd);
 
 	return nifp;
 }
 
 void
 netmap_mem_if_delete(struct netmap_adapter *na, struct netmap_if *nif)
 {
 	struct netmap_mem_d *nmd = na->nm_mem;
 
 	NMA_LOCK(nmd);
 	nmd->ops->nmd_if_delete(nmd, na, nif);
 	NMA_UNLOCK(nmd);
 }
 
 int
 netmap_mem_rings_create(struct netmap_adapter *na)
 {
 	int rv;
 	struct netmap_mem_d *nmd = na->nm_mem;
 
 	NMA_LOCK(nmd);
 	rv = nmd->ops->nmd_rings_create(nmd, na);
 	NMA_UNLOCK(nmd);
 
 	return rv;
 }
 
 void
 netmap_mem_rings_delete(struct netmap_adapter *na)
 {
 	struct netmap_mem_d *nmd = na->nm_mem;
 
 	NMA_LOCK(nmd);
 	nmd->ops->nmd_rings_delete(nmd, na);
 	NMA_UNLOCK(nmd);
 }
 
 static int netmap_mem_map(struct netmap_obj_pool *, struct netmap_adapter *);
 static int netmap_mem_unmap(struct netmap_obj_pool *, struct netmap_adapter *);
 static int nm_mem_check_group(struct netmap_mem_d *, bus_dma_tag_t);
 static void nm_mem_release_id(struct netmap_mem_d *);
 
 nm_memid_t
 netmap_mem_get_id(struct netmap_mem_d *nmd)
 {
 	return nmd->nm_id;
 }
 
 #ifdef NM_DEBUG_MEM_PUTGET
 #define NM_DBG_REFC(nmd, func, line)	\
 	nm_prinf("%s:%d mem[%d:%d] -> %d", func, line, (nmd)->nm_id, (nmd)->nm_grp, (nmd)->refcount);
 #else
 #define NM_DBG_REFC(nmd, func, line)
 #endif
 
 /* circular list of all existing allocators */
 static struct netmap_mem_d *netmap_last_mem_d = &nm_mem;
 static NM_MTX_T nm_mem_list_lock;
 
 struct netmap_mem_d *
 __netmap_mem_get(struct netmap_mem_d *nmd, const char *func, int line)
 {
 	NM_MTX_LOCK(nm_mem_list_lock);
 	nmd->refcount++;
 	NM_DBG_REFC(nmd, func, line);
 	NM_MTX_UNLOCK(nm_mem_list_lock);
 	return nmd;
 }
 
 void
 __netmap_mem_put(struct netmap_mem_d *nmd, const char *func, int line)
 {
 	int last;
 	NM_MTX_LOCK(nm_mem_list_lock);
 	last = (--nmd->refcount == 0);
 	if (last)
 		nm_mem_release_id(nmd);
 	NM_DBG_REFC(nmd, func, line);
 	NM_MTX_UNLOCK(nm_mem_list_lock);
 	if (last)
 		netmap_mem_delete(nmd);
 }
 
 int
 netmap_mem_finalize(struct netmap_mem_d *nmd, struct netmap_adapter *na)
 {
 	int lasterr = 0;
 	if (nm_mem_check_group(nmd, na->pdev) < 0) {
 		return ENOMEM;
 	}
 
 	NMA_LOCK(nmd);
 
 	if (netmap_mem_config(nmd))
 		goto out;
 
 	nmd->active++;
 
 	nmd->lasterr = nmd->ops->nmd_finalize(nmd, na);
 
 	if (!nmd->lasterr && !(nmd->flags & NETMAP_MEM_NOMAP)) {
 		nmd->lasterr = netmap_mem_map(&nmd->pools[NETMAP_BUF_POOL], na);
 	}
 
 out:
 	lasterr = nmd->lasterr;
 	NMA_UNLOCK(nmd);
 
 	if (lasterr)
 		netmap_mem_deref(nmd, na);
 
 	return lasterr;
 }
 
 static int
 nm_isset(uint32_t *bitmap, u_int i)
 {
 	return bitmap[ (i>>5) ] & ( 1U << (i & 31U) );
 }
 
 
 static int
 netmap_init_obj_allocator_bitmap(struct netmap_obj_pool *p)
 {
 	u_int n, j;
 
 	if (p->bitmap == NULL) {
 		/* Allocate the bitmap */
 		n = (p->objtotal + 31) / 32;
 		p->bitmap = nm_os_malloc(sizeof(p->bitmap[0]) * n);
 		if (p->bitmap == NULL) {
 			nm_prerr("Unable to create bitmap (%d entries) for allocator '%s'", (int)n,
 			    p->name);
 			return ENOMEM;
 		}
 		p->bitmap_slots = n;
 	} else {
 		memset(p->bitmap, 0, p->bitmap_slots * sizeof(p->bitmap[0]));
 	}
 
 	p->objfree = 0;
 	/*
 	 * Set all the bits in the bitmap that have
 	 * corresponding buffers to 1 to indicate they are
 	 * free.
 	 */
 	for (j = 0; j < p->objtotal; j++) {
 		if (p->invalid_bitmap && nm_isset(p->invalid_bitmap, j)) {
 			if (netmap_debug & NM_DEBUG_MEM)
 				nm_prinf("skipping %s %d", p->name, j);
 			continue;
 		}
 		p->bitmap[ (j>>5) ] |=  ( 1U << (j & 31U) );
 		p->objfree++;
 	}
 
 	if (netmap_verbose)
 		nm_prinf("%s free %u", p->name, p->objfree);
 	if (p->objfree == 0) {
 		if (netmap_verbose)
 			nm_prerr("%s: no objects available", p->name);
 		return ENOMEM;
 	}
 
 	return 0;
 }
 
 static int
 netmap_mem_init_bitmaps(struct netmap_mem_d *nmd)
 {
 	int i, error = 0;
 
 	for (i = 0; i < NETMAP_POOLS_NR; i++) {
 		struct netmap_obj_pool *p = &nmd->pools[i];
 
 		error = netmap_init_obj_allocator_bitmap(p);
 		if (error)
 			return error;
 	}
 
 	/*
 	 * buffers 0 and 1 are reserved
 	 */
 	if (nmd->pools[NETMAP_BUF_POOL].objfree < 2) {
 		nm_prerr("%s: not enough buffers", nmd->pools[NETMAP_BUF_POOL].name);
 		return ENOMEM;
 	}
 
 	nmd->pools[NETMAP_BUF_POOL].objfree -= 2;
 	if (nmd->pools[NETMAP_BUF_POOL].bitmap) {
 		/* XXX This check is a workaround that prevents a
 		 * NULL pointer crash which currently happens only
 		 * with ptnetmap guests.
 		 * Removed shared-info --> is the bug still there? */
 		nmd->pools[NETMAP_BUF_POOL].bitmap[0] = ~3U;
 	}
 	return 0;
 }
 
 int
 netmap_mem_deref(struct netmap_mem_d *nmd, struct netmap_adapter *na)
 {
 	int last_user = 0;
 	NMA_LOCK(nmd);
 	if (na->active_fds <= 0 && !(nmd->flags & NETMAP_MEM_NOMAP))
 		netmap_mem_unmap(&nmd->pools[NETMAP_BUF_POOL], na);
 	if (nmd->active == 1) {
 		last_user = 1;
 		/*
 		 * Reset the allocator when it falls out of use so that any
 		 * pool resources leaked by unclean application exits are
 		 * reclaimed.
 		 */
 		netmap_mem_init_bitmaps(nmd);
 	}
 	nmd->ops->nmd_deref(nmd, na);
 
 	nmd->active--;
 	if (last_user) {
 		nmd->lasterr = 0;
 	}
 
 	NMA_UNLOCK(nmd);
 	return last_user;
 }
 
 
 /* accessor functions */
 static int
 netmap_mem2_get_lut(struct netmap_mem_d *nmd, struct netmap_lut *lut)
 {
 	lut->lut = nmd->pools[NETMAP_BUF_POOL].lut;
 #ifdef __FreeBSD__
 	lut->plut = lut->lut;
 #endif
 	lut->objtotal = nmd->pools[NETMAP_BUF_POOL].objtotal;
 	lut->objsize = nmd->pools[NETMAP_BUF_POOL]._objsize;
 
 	return 0;
 }
 
 static struct netmap_obj_params netmap_min_priv_params[NETMAP_POOLS_NR] = {
 	[NETMAP_IF_POOL] = {
 		.size = 1024,
 		.num  = 2,
 	},
 	[NETMAP_RING_POOL] = {
 		.size = 5*PAGE_SIZE,
 		.num  = 4,
 	},
 	[NETMAP_BUF_POOL] = {
 		.size = 2048,
 		.num  = 4098,
 	},
 };
 
 
 /*
  * nm_mem is the memory allocator used for all physical interfaces
  * running in netmap mode.
  * Virtual (VALE) ports will have each its own allocator.
  */
 extern struct netmap_mem_ops netmap_mem_global_ops; /* forward */
 struct netmap_mem_d nm_mem = {	/* Our memory allocator. */
 	.pools = {
 		[NETMAP_IF_POOL] = {
 			.name 	= "netmap_if",
 			.objminsize = sizeof(struct netmap_if),
 			.objmaxsize = 4096,
 			.nummin     = 10,	/* don't be stingy */
 			.nummax	    = 10000,	/* XXX very large */
 		},
 		[NETMAP_RING_POOL] = {
 			.name 	= "netmap_ring",
 			.objminsize = sizeof(struct netmap_ring),
 			.objmaxsize = 32*PAGE_SIZE,
 			.nummin     = 2,
 			.nummax	    = 1024,
 		},
 		[NETMAP_BUF_POOL] = {
 			.name	= "netmap_buf",
 			.objminsize = 64,
 			.objmaxsize = 65536,
 			.nummin     = 4,
 			.nummax	    = 1000000, /* one million! */
 		},
 	},
 
 	.params = {
 		[NETMAP_IF_POOL] = {
 			.size = 1024,
 			.num  = 100,
 		},
 		[NETMAP_RING_POOL] = {
 			.size = 9*PAGE_SIZE,
 			.num  = 200,
 		},
 		[NETMAP_BUF_POOL] = {
 			.size = 2048,
 			.num  = NETMAP_BUF_MAX_NUM,
 		},
 	},
 
 	.nm_id = 1,
 	.nm_grp = -1,
 
 	.prev = &nm_mem,
 	.next = &nm_mem,
 
 	.ops = &netmap_mem_global_ops,
 
 	.name = "1"
 };
 
 static struct netmap_mem_d nm_mem_blueprint;
 
 /* blueprint for the private memory allocators */
 /* XXX clang is not happy about using name as a print format */
 static const struct netmap_mem_d nm_blueprint = {
 	.pools = {
 		[NETMAP_IF_POOL] = {
 			.name 	= "%s_if",
 			.objminsize = sizeof(struct netmap_if),
 			.objmaxsize = 4096,
 			.nummin     = 1,
 			.nummax	    = 100,
 		},
 		[NETMAP_RING_POOL] = {
 			.name 	= "%s_ring",
 			.objminsize = sizeof(struct netmap_ring),
 			.objmaxsize = 32*PAGE_SIZE,
 			.nummin     = 2,
 			.nummax	    = 1024,
 		},
 		[NETMAP_BUF_POOL] = {
 			.name	= "%s_buf",
 			.objminsize = 64,
 			.objmaxsize = 65536,
 			.nummin     = 4,
 			.nummax	    = 1000000, /* one million! */
 		},
 	},
 
 	.nm_grp = -1,
 
 	.flags = NETMAP_MEM_PRIVATE,
 
 	.ops = &netmap_mem_global_ops,
 };
 
 /* memory allocator related sysctls */
 
 #define STRINGIFY(x) #x
 
 
 #define DECLARE_SYSCTLS(id, name) \
 	SYSBEGIN(mem2_ ## name); \
 	SYSCTL_INT(_dev_netmap, OID_AUTO, name##_size, \
 	    CTLFLAG_RW, &nm_mem.params[id].size, 0, "Requested size of netmap " STRINGIFY(name) "s"); \
 	SYSCTL_INT(_dev_netmap, OID_AUTO, name##_curr_size, \
 	    CTLFLAG_RD, &nm_mem.pools[id]._objsize, 0, "Current size of netmap " STRINGIFY(name) "s"); \
 	SYSCTL_INT(_dev_netmap, OID_AUTO, name##_num, \
 	    CTLFLAG_RW, &nm_mem.params[id].num, 0, "Requested number of netmap " STRINGIFY(name) "s"); \
 	SYSCTL_INT(_dev_netmap, OID_AUTO, name##_curr_num, \
 	    CTLFLAG_RD, &nm_mem.pools[id].objtotal, 0, "Current number of netmap " STRINGIFY(name) "s"); \
 	SYSCTL_INT(_dev_netmap, OID_AUTO, priv_##name##_size, \
 	    CTLFLAG_RW, &netmap_min_priv_params[id].size, 0, \
 	    "Default size of private netmap " STRINGIFY(name) "s"); \
 	SYSCTL_INT(_dev_netmap, OID_AUTO, priv_##name##_num, \
 	    CTLFLAG_RW, &netmap_min_priv_params[id].num, 0, \
 	    "Default number of private netmap " STRINGIFY(name) "s");	\
 	SYSEND
 
 SYSCTL_DECL(_dev_netmap);
 DECLARE_SYSCTLS(NETMAP_IF_POOL, if);
 DECLARE_SYSCTLS(NETMAP_RING_POOL, ring);
 DECLARE_SYSCTLS(NETMAP_BUF_POOL, buf);
 
 /* call with nm_mem_list_lock held */
 static int
 nm_mem_assign_id_locked(struct netmap_mem_d *nmd, int grp_id)
 {
 	nm_memid_t id;
 	struct netmap_mem_d *scan = netmap_last_mem_d;
 	int error = ENOMEM;
 
 	do {
 		/* we rely on unsigned wrap around */
 		id = scan->nm_id + 1;
 		if (id == 0) /* reserve 0 as error value */
 			id = 1;
 		scan = scan->next;
 		if (id != scan->nm_id) {
 			nmd->nm_id = id;
 			nmd->nm_grp = grp_id;
 			nmd->prev = scan->prev;
 			nmd->next = scan;
 			scan->prev->next = nmd;
 			scan->prev = nmd;
 			netmap_last_mem_d = nmd;
 			nmd->refcount = 1;
 			NM_DBG_REFC(nmd, __FUNCTION__, __LINE__);
 			error = 0;
 			break;
 		}
 	} while (scan != netmap_last_mem_d);
 
 	return error;
 }
 
 /* call with nm_mem_list_lock *not* held */
 static int
 nm_mem_assign_id(struct netmap_mem_d *nmd, int grp_id)
 {
 	int ret;
 
 	NM_MTX_LOCK(nm_mem_list_lock);
 	ret = nm_mem_assign_id_locked(nmd, grp_id);
 	NM_MTX_UNLOCK(nm_mem_list_lock);
 
 	return ret;
 }
 
 /* call with nm_mem_list_lock held */
 static void
 nm_mem_release_id(struct netmap_mem_d *nmd)
 {
 	nmd->prev->next = nmd->next;
 	nmd->next->prev = nmd->prev;
 
 	if (netmap_last_mem_d == nmd)
 		netmap_last_mem_d = nmd->prev;
 
 	nmd->prev = nmd->next = NULL;
 }
 
 struct netmap_mem_d *
 netmap_mem_find(nm_memid_t id)
 {
 	struct netmap_mem_d *nmd;
 
 	NM_MTX_LOCK(nm_mem_list_lock);
 	nmd = netmap_last_mem_d;
 	do {
 		if (!(nmd->flags & NETMAP_MEM_HIDDEN) && nmd->nm_id == id) {
 			nmd->refcount++;
 			NM_DBG_REFC(nmd, __FUNCTION__, __LINE__);
 			NM_MTX_UNLOCK(nm_mem_list_lock);
 			return nmd;
 		}
 		nmd = nmd->next;
 	} while (nmd != netmap_last_mem_d);
 	NM_MTX_UNLOCK(nm_mem_list_lock);
 	return NULL;
 }
 
 static int
 nm_mem_check_group(struct netmap_mem_d *nmd, bus_dma_tag_t dev)
 {
 	int err = 0, id;
 
 	/* Skip not hw adapters.
 	 * Vale port can use particular allocator through vale-ctl -m option
 	 */
 	if (!dev)
 		return 0;
 	id = nm_iommu_group_id(dev);
 	if (netmap_debug & NM_DEBUG_MEM)
 		nm_prinf("iommu_group %d", id);
 
 	NMA_LOCK(nmd);
 
 	if (nmd->nm_grp != id) {
 		if (netmap_verbose)
 			nm_prerr("iommu group mismatch: %d vs %d",
 					nmd->nm_grp, id);
 		nmd->lasterr = err = ENOMEM;
 	}
 
 	NMA_UNLOCK(nmd);
 	return err;
 }
 
 static struct lut_entry *
 nm_alloc_lut(u_int nobj)
 {
 	size_t n = sizeof(struct lut_entry) * nobj;
 	struct lut_entry *lut;
 #ifdef linux
 	lut = vmalloc(n);
 #else
 	lut = nm_os_malloc(n);
 #endif
 	return lut;
 }
 
 static void
 nm_free_lut(struct lut_entry *lut, u_int objtotal)
 {
 	bzero(lut, sizeof(struct lut_entry) * objtotal);
 #ifdef linux
 	vfree(lut);
 #else
 	nm_os_free(lut);
 #endif
 }
 
 #if defined(linux) || defined(_WIN32)
 static struct plut_entry *
 nm_alloc_plut(u_int nobj)
 {
 	size_t n = sizeof(struct plut_entry) * nobj;
 	struct plut_entry *lut;
 	lut = vmalloc(n);
 	return lut;
 }
 
 static void
 nm_free_plut(struct plut_entry * lut)
 {
 	vfree(lut);
 }
 #endif /* linux or _WIN32 */
 
 
 /*
  * First, find the allocator that contains the requested offset,
  * then locate the cluster through a lookup table.
  */
 static vm_paddr_t
 netmap_mem2_ofstophys(struct netmap_mem_d* nmd, vm_ooffset_t offset)
 {
 	int i;
 	vm_ooffset_t o = offset;
 	vm_paddr_t pa;
 	struct netmap_obj_pool *p;
 
 	p = nmd->pools;
 
 	for (i = 0; i < NETMAP_POOLS_NR; offset -= p[i].memtotal, i++) {
 		if (offset >= p[i].memtotal)
 			continue;
 		// now lookup the cluster's address
 #ifndef _WIN32
 		pa = vtophys(p[i].lut[offset / p[i]._objsize].vaddr) +
 			offset % p[i]._objsize;
 #else
 		pa = vtophys(p[i].lut[offset / p[i]._objsize].vaddr);
 		pa.QuadPart += offset % p[i]._objsize;
 #endif
 		return pa;
 	}
 	/* this is only in case of errors */
 	nm_prerr("invalid ofs 0x%x out of 0x%zx 0x%zx 0x%zx", (u_int)o,
 		p[NETMAP_IF_POOL].memtotal,
 		p[NETMAP_IF_POOL].memtotal
 			+ p[NETMAP_RING_POOL].memtotal,
 		p[NETMAP_IF_POOL].memtotal
 			+ p[NETMAP_RING_POOL].memtotal
 			+ p[NETMAP_BUF_POOL].memtotal);
 #ifndef _WIN32
 	return 0; /* bad address */
 #else
 	vm_paddr_t res;
 	res.QuadPart = 0;
 	return res;
 #endif
 }
 
 #ifdef _WIN32
 
 /*
  * win32_build_virtual_memory_for_userspace
  *
  * This function get all the object making part of the pools and maps
  * a contiguous virtual memory space for the userspace
  * It works this way
  * 1 - allocate a Memory Descriptor List wide as the sum
  *		of the memory needed for the pools
  * 2 - cycle all the objects in every pool and for every object do
  *
  *		2a - cycle all the objects in every pool, get the list
  *				of the physical address descriptors
  *		2b - calculate the offset in the array of pages descriptor in the
  *				main MDL
  *		2c - copy the descriptors of the object in the main MDL
  *
  * 3 - return the resulting MDL that needs to be mapped in userland
  *
  * In this way we will have an MDL that describes all the memory for the
  * objects in a single object
 */
 
 PMDL
 win32_build_user_vm_map(struct netmap_mem_d* nmd)
 {
 	u_int memflags, ofs = 0;
 	PMDL mainMdl, tempMdl;
 	uint64_t memsize;
 	int i, j;
 
 	if (netmap_mem_get_info(nmd, &memsize, &memflags, NULL)) {
 		nm_prerr("memory not finalised yet");
 		return NULL;
 	}
 
 	mainMdl = IoAllocateMdl(NULL, memsize, FALSE, FALSE, NULL);
 	if (mainMdl == NULL) {
 		nm_prerr("failed to allocate mdl");
 		return NULL;
 	}
 
 	NMA_LOCK(nmd);
 	for (i = 0; i < NETMAP_POOLS_NR; i++) {
 		struct netmap_obj_pool *p = &nmd->pools[i];
 		int clsz = p->_clustsize;
 		int clobjs = p->_clustentries; /* objects per cluster */
 		int mdl_len = sizeof(PFN_NUMBER) * BYTES_TO_PAGES(clsz);
 		PPFN_NUMBER pSrc, pDst;
 
 		/* each pool has a different cluster size so we need to reallocate */
 		tempMdl = IoAllocateMdl(p->lut[0].vaddr, clsz, FALSE, FALSE, NULL);
 		if (tempMdl == NULL) {
 			NMA_UNLOCK(nmd);
 			nm_prerr("fail to allocate tempMdl");
 			IoFreeMdl(mainMdl);
 			return NULL;
 		}
 		pSrc = MmGetMdlPfnArray(tempMdl);
 		/* create one entry per cluster, the lut[] has one entry per object */
 		for (j = 0; j < p->numclusters; j++, ofs += clsz) {
 			pDst = &MmGetMdlPfnArray(mainMdl)[BYTES_TO_PAGES(ofs)];
 			MmInitializeMdl(tempMdl, p->lut[j*clobjs].vaddr, clsz);
 			MmBuildMdlForNonPagedPool(tempMdl); /* compute physical page addresses */
 			RtlCopyMemory(pDst, pSrc, mdl_len); /* copy the page descriptors */
 			mainMdl->MdlFlags = tempMdl->MdlFlags; /* XXX what is in here ? */
 		}
 		IoFreeMdl(tempMdl);
 	}
 	NMA_UNLOCK(nmd);
 	return mainMdl;
 }
 
 #endif /* _WIN32 */
 
 /*
  * helper function for OS-specific mmap routines (currently only windows).
  * Given an nmd and a pool index, returns the cluster size and number of clusters.
  * Returns 0 if memory is finalised and the pool is valid, otherwise 1.
  * It should be called under NMA_LOCK(nmd) otherwise the underlying info can change.
  */
 
 int
 netmap_mem2_get_pool_info(struct netmap_mem_d* nmd, u_int pool, u_int *clustsize, u_int *numclusters)
 {
 	if (!nmd || !clustsize || !numclusters || pool >= NETMAP_POOLS_NR)
 		return 1; /* invalid arguments */
 	// NMA_LOCK_ASSERT(nmd);
 	if (!(nmd->flags & NETMAP_MEM_FINALIZED)) {
 		*clustsize = *numclusters = 0;
 		return 1; /* not ready yet */
 	}
 	*clustsize = nmd->pools[pool]._clustsize;
 	*numclusters = nmd->pools[pool].numclusters;
 	return 0; /* success */
 }
 
 static int
 netmap_mem2_get_info(struct netmap_mem_d* nmd, uint64_t* size,
 			u_int *memflags, nm_memid_t *id)
 {
 	int error = 0;
 	error = netmap_mem_config(nmd);
 	if (error)
 		goto out;
 	if (size) {
 		if (nmd->flags & NETMAP_MEM_FINALIZED) {
 			*size = nmd->nm_totalsize;
 		} else {
 			int i;
 			*size = 0;
 			for (i = 0; i < NETMAP_POOLS_NR; i++) {
 				struct netmap_obj_pool *p = nmd->pools + i;
 				*size += ((size_t)p->_numclusters * (size_t)p->_clustsize);
 			}
 		}
 	}
 	if (memflags)
 		*memflags = nmd->flags;
 	if (id)
 		*id = nmd->nm_id;
 out:
 	return error;
 }
 
 /*
  * we store objects by kernel address, need to find the offset
  * within the pool to export the value to userspace.
  * Algorithm: scan until we find the cluster, then add the
  * actual offset in the cluster
  */
 static ssize_t
 netmap_obj_offset(struct netmap_obj_pool *p, const void *vaddr)
 {
 	int i, k = p->_clustentries, n = p->objtotal;
 	ssize_t ofs = 0;
 
 	for (i = 0; i < n; i += k, ofs += p->_clustsize) {
 		const char *base = p->lut[i].vaddr;
 		ssize_t relofs = (const char *) vaddr - base;
 
 		if (relofs < 0 || relofs >= p->_clustsize)
 			continue;
 
 		ofs = ofs + relofs;
 		nm_prdis("%s: return offset %d (cluster %d) for pointer %p",
 		    p->name, ofs, i, vaddr);
 		return ofs;
 	}
 	nm_prerr("address %p is not contained inside any cluster (%s)",
 	    vaddr, p->name);
 	return 0; /* An error occurred */
 }
 
 /* Helper functions which convert virtual addresses to offsets */
 #define netmap_if_offset(n, v)					\
 	netmap_obj_offset(&(n)->pools[NETMAP_IF_POOL], (v))
 
 #define netmap_ring_offset(n, v)				\
     ((n)->pools[NETMAP_IF_POOL].memtotal + 			\
 	netmap_obj_offset(&(n)->pools[NETMAP_RING_POOL], (v)))
 
 static ssize_t
 netmap_mem2_if_offset(struct netmap_mem_d *nmd, const void *addr)
 {
 	return netmap_if_offset(nmd, addr);
 }
 
 /*
  * report the index, and use start position as a hint,
  * otherwise buffer allocation becomes terribly expensive.
  */
 static void *
 netmap_obj_malloc(struct netmap_obj_pool *p, u_int len, uint32_t *start, uint32_t *index)
 {
 	uint32_t i = 0;			/* index in the bitmap */
 	uint32_t mask, j = 0;		/* slot counter */
 	void *vaddr = NULL;
 
 	if (len > p->_objsize) {
 		nm_prerr("%s request size %d too large", p->name, len);
 		return NULL;
 	}
 
 	if (p->objfree == 0) {
 		nm_prerr("no more %s objects", p->name);
 		return NULL;
 	}
 	if (start)
 		i = *start;
 
 	/* termination is guaranteed by p->free, but better check bounds on i */
 	while (vaddr == NULL && i < p->bitmap_slots)  {
 		uint32_t cur = p->bitmap[i];
 		if (cur == 0) { /* bitmask is fully used */
 			i++;
 			continue;
 		}
 		/* locate a slot */
 		for (j = 0, mask = 1; (cur & mask) == 0; j++, mask <<= 1)
 			;
 
 		p->bitmap[i] &= ~mask; /* mark object as in use */
 		p->objfree--;
 
 		vaddr = p->lut[i * 32 + j].vaddr;
 		if (index)
 			*index = i * 32 + j;
 	}
 	nm_prdis("%s allocator: allocated object @ [%d][%d]: vaddr %p",p->name, i, j, vaddr);
 
 	if (start)
 		*start = i;
 	return vaddr;
 }
 
 
 /*
  * free by index, not by address.
  * XXX should we also cleanup the content ?
  */
 static int
 netmap_obj_free(struct netmap_obj_pool *p, uint32_t j)
 {
 	uint32_t *ptr, mask;
 
 	if (j >= p->objtotal) {
 		nm_prerr("invalid index %u, max %u", j, p->objtotal);
 		return 1;
 	}
 	ptr = &p->bitmap[j / 32];
 	mask = (1 << (j % 32));
 	if (*ptr & mask) {
 		nm_prerr("ouch, double free on buffer %d", j);
 		return 1;
 	} else {
 		*ptr |= mask;
 		p->objfree++;
 		return 0;
 	}
 }
 
 /*
  * free by address. This is slow but is only used for a few
  * objects (rings, nifp)
  */
 static void
 netmap_obj_free_va(struct netmap_obj_pool *p, void *vaddr)
 {
 	u_int i, j, n = p->numclusters;
 
 	for (i = 0, j = 0; i < n; i++, j += p->_clustentries) {
 		void *base = p->lut[i * p->_clustentries].vaddr;
 		ssize_t relofs = (ssize_t) vaddr - (ssize_t) base;
 
 		/* Given address, is out of the scope of the current cluster.*/
 		if (base == NULL || vaddr < base || relofs >= p->_clustsize)
 			continue;
 
 		j = j + relofs / p->_objsize;
 		/* KASSERT(j != 0, ("Cannot free object 0")); */
 		netmap_obj_free(p, j);
 		return;
 	}
 	nm_prerr("address %p is not contained inside any cluster (%s)",
 	    vaddr, p->name);
 }
 
 unsigned
 netmap_mem_bufsize(struct netmap_mem_d *nmd)
 {
 	return nmd->pools[NETMAP_BUF_POOL]._objsize;
 }
 
 #define netmap_if_malloc(n, len)	netmap_obj_malloc(&(n)->pools[NETMAP_IF_POOL], len, NULL, NULL)
 #define netmap_if_free(n, v)		netmap_obj_free_va(&(n)->pools[NETMAP_IF_POOL], (v))
 #define netmap_ring_malloc(n, len)	netmap_obj_malloc(&(n)->pools[NETMAP_RING_POOL], len, NULL, NULL)
 #define netmap_ring_free(n, v)		netmap_obj_free_va(&(n)->pools[NETMAP_RING_POOL], (v))
 #define netmap_buf_malloc(n, _pos, _index)			\
 	netmap_obj_malloc(&(n)->pools[NETMAP_BUF_POOL], netmap_mem_bufsize(n), _pos, _index)
 
 
 #if 0 /* currently unused */
 /* Return the index associated to the given packet buffer */
 #define netmap_buf_index(n, v)						\
     (netmap_obj_offset(&(n)->pools[NETMAP_BUF_POOL], (v)) / NETMAP_BDG_BUF_SIZE(n))
 #endif
 
 /*
  * allocate extra buffers in a linked list.
  * returns the actual number.
  */
 uint32_t
 netmap_extra_alloc(struct netmap_adapter *na, uint32_t *head, uint32_t n)
 {
 	struct netmap_mem_d *nmd = na->nm_mem;
 	uint32_t i, pos = 0; /* opaque, scan position in the bitmap */
 
 	NMA_LOCK(nmd);
 
 	*head = 0;	/* default, 'null' index ie empty list */
 	for (i = 0 ; i < n; i++) {
 		uint32_t cur = *head;	/* save current head */
 		uint32_t *p = netmap_buf_malloc(nmd, &pos, head);
 		if (p == NULL) {
 			nm_prerr("no more buffers after %d of %d", i, n);
 			*head = cur; /* restore */
 			break;
 		}
 		nm_prdis(5, "allocate buffer %d -> %d", *head, cur);
 		*p = cur; /* link to previous head */
 	}
 
 	NMA_UNLOCK(nmd);
 
 	return i;
 }
 
 static void
 netmap_extra_free(struct netmap_adapter *na, uint32_t head)
 {
 	struct lut_entry *lut = na->na_lut.lut;
 	struct netmap_mem_d *nmd = na->nm_mem;
 	struct netmap_obj_pool *p = &nmd->pools[NETMAP_BUF_POOL];
 	uint32_t i, cur, *buf;
 
 	nm_prdis("freeing the extra list");
 	for (i = 0; head >=2 && head < p->objtotal; i++) {
 		cur = head;
 		buf = lut[head].vaddr;
 		head = *buf;
 		*buf = 0;
 		if (netmap_obj_free(p, cur))
 			break;
 	}
 	if (head != 0)
 		nm_prerr("breaking with head %d", head);
 	if (netmap_debug & NM_DEBUG_MEM)
 		nm_prinf("freed %d buffers", i);
 }
 
 
 /* Return nonzero on error */
 static int
 netmap_new_bufs(struct netmap_mem_d *nmd, struct netmap_slot *slot, u_int n)
 {
 	struct netmap_obj_pool *p = &nmd->pools[NETMAP_BUF_POOL];
 	u_int i = 0;	/* slot counter */
 	uint32_t pos = 0;	/* slot in p->bitmap */
 	uint32_t index = 0;	/* buffer index */
 
 	for (i = 0; i < n; i++) {
 		void *vaddr = netmap_buf_malloc(nmd, &pos, &index);
 		if (vaddr == NULL) {
 			nm_prerr("no more buffers after %d of %d", i, n);
 			goto cleanup;
 		}
 		slot[i].buf_idx = index;
 		slot[i].len = p->_objsize;
 		slot[i].flags = 0;
 		slot[i].ptr = 0;
 	}
 
 	nm_prdis("%s: allocated %d buffers, %d available, first at %d", p->name, n, p->objfree, pos);
 	return (0);
 
 cleanup:
 	while (i > 0) {
 		i--;
 		netmap_obj_free(p, slot[i].buf_idx);
 	}
 	bzero(slot, n * sizeof(slot[0]));
 	return (ENOMEM);
 }
 
 static void
 netmap_mem_set_ring(struct netmap_mem_d *nmd, struct netmap_slot *slot, u_int n, uint32_t index)
 {
 	struct netmap_obj_pool *p = &nmd->pools[NETMAP_BUF_POOL];
 	u_int i;
 
 	for (i = 0; i < n; i++) {
 		slot[i].buf_idx = index;
 		slot[i].len = p->_objsize;
 		slot[i].flags = 0;
 	}
 }
 
 
 static void
 netmap_free_buf(struct netmap_mem_d *nmd, uint32_t i)
 {
 	struct netmap_obj_pool *p = &nmd->pools[NETMAP_BUF_POOL];
 
 	if (i < 2 || i >= p->objtotal) {
 		nm_prerr("Cannot free buf#%d: should be in [2, %d[", i, p->objtotal);
 		return;
 	}
 	netmap_obj_free(p, i);
 }
 
 
 static void
 netmap_free_bufs(struct netmap_mem_d *nmd, struct netmap_slot *slot, u_int n)
 {
 	u_int i;
 
 	for (i = 0; i < n; i++) {
 		if (slot[i].buf_idx > 1)
 			netmap_free_buf(nmd, slot[i].buf_idx);
 	}
 	nm_prdis("%s: released some buffers, available: %u",
 			p->name, p->objfree);
 }
 
 static void
 netmap_reset_obj_allocator(struct netmap_obj_pool *p)
 {
 
 	if (p == NULL)
 		return;
 	if (p->bitmap)
 		nm_os_free(p->bitmap);
 	p->bitmap = NULL;
 	if (p->invalid_bitmap)
 		nm_os_free(p->invalid_bitmap);
 	p->invalid_bitmap = NULL;
 	if (!p->alloc_done) {
 		/* allocation was done by somebody else.
 		 * Let them clean up after themselves.
 		 */
 		return;
 	}
 	if (p->lut) {
 		u_int i;
 
 		/*
 		 * Free each cluster allocated in
 		 * netmap_finalize_obj_allocator().  The cluster start
 		 * addresses are stored at multiples of p->_clusterentries
 		 * in the lut.
 		 */
 		for (i = 0; i < p->objtotal; i += p->_clustentries) {
-			contigfree(p->lut[i].vaddr, p->_clustsize, M_NETMAP);
+			free(p->lut[i].vaddr, M_NETMAP);
 		}
 		nm_free_lut(p->lut, p->objtotal);
 	}
 	p->lut = NULL;
 	p->objtotal = 0;
 	p->memtotal = 0;
 	p->numclusters = 0;
 	p->objfree = 0;
 	p->alloc_done = 0;
 }
 
 /*
  * Free all resources related to an allocator.
  */
 static void
 netmap_destroy_obj_allocator(struct netmap_obj_pool *p)
 {
 	if (p == NULL)
 		return;
 	netmap_reset_obj_allocator(p);
 }
 
 /*
  * We receive a request for objtotal objects, of size objsize each.
  * Internally we may round up both numbers, as we allocate objects
  * in small clusters multiple of the page size.
  * We need to keep track of objtotal and clustentries,
  * as they are needed when freeing memory.
  *
  * XXX note -- userspace needs the buffers to be contiguous,
  *	so we cannot afford gaps at the end of a cluster.
  */
 
 
 /* call with NMA_LOCK held */
 static int
 netmap_config_obj_allocator(struct netmap_obj_pool *p, u_int objtotal, u_int objsize)
 {
 	int i;
 	u_int clustsize;	/* the cluster size, multiple of page size */
 	u_int clustentries;	/* how many objects per entry */
 
 	/* we store the current request, so we can
 	 * detect configuration changes later */
 	p->r_objtotal = objtotal;
 	p->r_objsize = objsize;
 
 #define MAX_CLUSTSIZE	(1<<22)		// 4 MB
 #define LINE_ROUND	NM_BUF_ALIGN	// 64
 	if (objsize >= MAX_CLUSTSIZE) {
 		/* we could do it but there is no point */
 		nm_prerr("unsupported allocation for %d bytes", objsize);
 		return EINVAL;
 	}
 	/* make sure objsize is a multiple of LINE_ROUND */
 	i = (objsize & (LINE_ROUND - 1));
 	if (i) {
 		nm_prinf("aligning object by %d bytes", LINE_ROUND - i);
 		objsize += LINE_ROUND - i;
 	}
 	if (objsize < p->objminsize || objsize > p->objmaxsize) {
 		nm_prerr("requested objsize %d out of range [%d, %d]",
 			objsize, p->objminsize, p->objmaxsize);
 		return EINVAL;
 	}
 	if (objtotal < p->nummin || objtotal > p->nummax) {
 		nm_prerr("requested objtotal %d out of range [%d, %d]",
 			objtotal, p->nummin, p->nummax);
 		return EINVAL;
 	}
 	/*
 	 * Compute number of objects using a brute-force approach:
 	 * given a max cluster size,
 	 * we try to fill it with objects keeping track of the
 	 * wasted space to the next page boundary.
 	 */
 	for (clustentries = 0, i = 1;; i++) {
 		u_int delta, used = i * objsize;
 		if (used > MAX_CLUSTSIZE)
 			break;
 		delta = used % PAGE_SIZE;
 		if (delta == 0) { // exact solution
 			clustentries = i;
 			break;
 		}
 	}
 	/* exact solution not found */
 	if (clustentries == 0) {
 		nm_prerr("unsupported allocation for %d bytes", objsize);
 		return EINVAL;
 	}
 	/* compute clustsize */
 	clustsize = clustentries * objsize;
 	if (netmap_debug & NM_DEBUG_MEM)
 		nm_prinf("objsize %d clustsize %d objects %d",
 			objsize, clustsize, clustentries);
 
 	/*
 	 * The number of clusters is n = ceil(objtotal/clustentries)
 	 * objtotal' = n * clustentries
 	 */
 	p->_clustentries = clustentries;
 	p->_clustsize = clustsize;
 	p->_numclusters = (objtotal + clustentries - 1) / clustentries;
 
 	/* actual values (may be larger than requested) */
 	p->_objsize = objsize;
 	p->_objtotal = p->_numclusters * clustentries;
 
 	return 0;
 }
 
 /* call with NMA_LOCK held */
 static int
 netmap_finalize_obj_allocator(struct netmap_obj_pool *p)
 {
 	int i; /* must be signed */
-	size_t n;
 
 	if (p->lut) {
 		/* if the lut is already there we assume that also all the
 		 * clusters have already been allocated, possibly by somebody
 		 * else (e.g., extmem). In the latter case, the alloc_done flag
 		 * will remain at zero, so that we will not attempt to
 		 * deallocate the clusters by ourselves in
 		 * netmap_reset_obj_allocator.
 		 */
 		return 0;
 	}
 
 	/* optimistically assume we have enough memory */
 	p->numclusters = p->_numclusters;
 	p->objtotal = p->_objtotal;
 	p->alloc_done = 1;
 
 	p->lut = nm_alloc_lut(p->objtotal);
 	if (p->lut == NULL) {
 		nm_prerr("Unable to create lookup table for '%s'", p->name);
 		goto clean;
 	}
 
 	/*
 	 * Allocate clusters, init pointers
 	 */
 
-	n = p->_clustsize;
 	for (i = 0; i < (int)p->objtotal;) {
 		int lim = i + p->_clustentries;
 		char *clust;
 
 		/*
 		 * XXX Note, we only need contigmalloc() for buffers attached
 		 * to native interfaces. In all other cases (nifp, netmap rings
 		 * and even buffers for VALE ports or emulated interfaces) we
 		 * can live with standard malloc, because the hardware will not
 		 * access the pages directly.
 		 */
-		clust = contigmalloc(n, M_NETMAP, M_NOWAIT | M_ZERO,
+		clust = contigmalloc(p->_clustsize, M_NETMAP, M_NOWAIT | M_ZERO,
 		    (size_t)0, -1UL, PAGE_SIZE, 0);
 		if (clust == NULL) {
 			/*
 			 * If we get here, there is a severe memory shortage,
 			 * so halve the allocated memory to reclaim some.
 			 */
 			nm_prerr("Unable to create cluster at %d for '%s' allocator",
 			    i, p->name);
 			if (i < 2) /* nothing to halve */
 				goto out;
 			lim = i / 2;
 			for (i--; i >= lim; i--) {
 				if (i % p->_clustentries == 0 && p->lut[i].vaddr)
-					contigfree(p->lut[i].vaddr,
-						n, M_NETMAP);
+					free(p->lut[i].vaddr, M_NETMAP);
 				p->lut[i].vaddr = NULL;
 			}
 		out:
 			p->objtotal = i;
 			/* we may have stopped in the middle of a cluster */
 			p->numclusters = (i + p->_clustentries - 1) / p->_clustentries;
 			break;
 		}
 		/*
 		 * Set lut state for all buffers in the current cluster.
 		 *
 		 * [i, lim) is the set of buffer indexes that cover the
 		 * current cluster.
 		 *
 		 * 'clust' is really the address of the current buffer in
 		 * the current cluster as we index through it with a stride
 		 * of p->_objsize.
 		 */
 		for (; i < lim; i++, clust += p->_objsize) {
 			p->lut[i].vaddr = clust;
 #if !defined(linux) && !defined(_WIN32)
 			p->lut[i].paddr = vtophys(clust);
 #endif
 		}
 	}
 	p->memtotal = (size_t)p->numclusters * (size_t)p->_clustsize;
 	if (netmap_verbose)
 		nm_prinf("Pre-allocated %d clusters (%d/%zuKB) for '%s'",
 		    p->numclusters, p->_clustsize >> 10,
 		    p->memtotal >> 10, p->name);
 
 	return 0;
 
 clean:
 	netmap_reset_obj_allocator(p);
 	return ENOMEM;
 }
 
 /* call with lock held */
 static int
 netmap_mem_params_changed(struct netmap_obj_params* p)
 {
 	int i, rv = 0;
 
 	for (i = 0; i < NETMAP_POOLS_NR; i++) {
 		if (p[i].last_size != p[i].size || p[i].last_num != p[i].num) {
 			p[i].last_size = p[i].size;
 			p[i].last_num = p[i].num;
 			rv = 1;
 		}
 	}
 	return rv;
 }
 
 static void
 netmap_mem_reset_all(struct netmap_mem_d *nmd)
 {
 	int i;
 
 	if (netmap_debug & NM_DEBUG_MEM)
 		nm_prinf("resetting %p", nmd);
 	for (i = 0; i < NETMAP_POOLS_NR; i++) {
 		netmap_reset_obj_allocator(&nmd->pools[i]);
 	}
 	nmd->flags  &= ~NETMAP_MEM_FINALIZED;
 }
 
 static int
 netmap_mem_unmap(struct netmap_obj_pool *p, struct netmap_adapter *na)
 {
 	int i, lim = p->objtotal;
 	struct netmap_lut *lut;
 	if (na == NULL || na->pdev == NULL)
 		return 0;
 
 	lut = &na->na_lut;
 
 
 
 #if defined(__FreeBSD__)
 	/* On FreeBSD mapping and unmapping is performed by the txsync
 	 * and rxsync routine, packet by packet. */
 	(void)i;
 	(void)lim;
 	(void)lut;
 #elif defined(_WIN32)
 	(void)i;
 	(void)lim;
 	(void)lut;
 	nm_prerr("unsupported on Windows");
 #else /* linux */
 	nm_prdis("unmapping and freeing plut for %s", na->name);
 	if (lut->plut == NULL || na->pdev == NULL)
 		return 0;
 	for (i = 0; i < lim; i += p->_clustentries) {
 		if (lut->plut[i].paddr)
 			netmap_unload_map(na, (bus_dma_tag_t) na->pdev, &lut->plut[i].paddr, p->_clustsize);
 	}
 	nm_free_plut(lut->plut);
 	lut->plut = NULL;
 #endif /* linux */
 
 	return 0;
 }
 
 static int
 netmap_mem_map(struct netmap_obj_pool *p, struct netmap_adapter *na)
 {
 	int error = 0;
 	int i, lim = p->objtotal;
 	struct netmap_lut *lut = &na->na_lut;
 
 	if (na->pdev == NULL)
 		return 0;
 
 #if defined(__FreeBSD__)
 	/* On FreeBSD mapping and unmapping is performed by the txsync
 	 * and rxsync routine, packet by packet. */
 	(void)i;
 	(void)lim;
 	(void)lut;
 #elif defined(_WIN32)
 	(void)i;
 	(void)lim;
 	(void)lut;
 	nm_prerr("unsupported on Windows");
 #else /* linux */
 
 	if (lut->plut != NULL) {
 		nm_prdis("plut already allocated for %s", na->name);
 		return 0;
 	}
 
 	nm_prdis("allocating physical lut for %s", na->name);
 	lut->plut = nm_alloc_plut(lim);
 	if (lut->plut == NULL) {
 		nm_prerr("Failed to allocate physical lut for %s", na->name);
 		return ENOMEM;
 	}
 
 	for (i = 0; i < lim; i += p->_clustentries) {
 		lut->plut[i].paddr = 0;
 	}
 
 	for (i = 0; i < lim; i += p->_clustentries) {
 		int j;
 
 		if (p->lut[i].vaddr == NULL)
 			continue;
 
 		error = netmap_load_map(na, (bus_dma_tag_t) na->pdev, &lut->plut[i].paddr,
 				p->lut[i].vaddr, p->_clustsize);
 		if (error) {
 			nm_prerr("Failed to map cluster #%d from the %s pool", i, p->name);
 			break;
 		}
 
 		for (j = 1; j < p->_clustentries; j++) {
 			lut->plut[i + j].paddr = lut->plut[i + j - 1].paddr + p->_objsize;
 		}
 	}
 
 	if (error)
 		netmap_mem_unmap(p, na);
 
 #endif /* linux */
 
 	return error;
 }
 
 static int
 netmap_mem_finalize_all(struct netmap_mem_d *nmd)
 {
 	int i;
 	if (nmd->flags & NETMAP_MEM_FINALIZED)
 		return 0;
 	nmd->lasterr = 0;
 	nmd->nm_totalsize = 0;
 	for (i = 0; i < NETMAP_POOLS_NR; i++) {
 		nmd->lasterr = netmap_finalize_obj_allocator(&nmd->pools[i]);
 		if (nmd->lasterr)
 			goto error;
 		nmd->nm_totalsize += nmd->pools[i].memtotal;
 	}
 	nmd->nm_totalsize = (nmd->nm_totalsize + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1);
 	nmd->lasterr = netmap_mem_init_bitmaps(nmd);
 	if (nmd->lasterr)
 		goto error;
 
 	nmd->flags |= NETMAP_MEM_FINALIZED;
 
 	if (netmap_verbose)
 		nm_prinf("interfaces %zd KB, rings %zd KB, buffers %zd MB",
 		    nmd->pools[NETMAP_IF_POOL].memtotal >> 10,
 		    nmd->pools[NETMAP_RING_POOL].memtotal >> 10,
 		    nmd->pools[NETMAP_BUF_POOL].memtotal >> 20);
 
 	if (netmap_verbose)
 		nm_prinf("Free buffers: %d", nmd->pools[NETMAP_BUF_POOL].objfree);
 
 
 	return 0;
 error:
 	netmap_mem_reset_all(nmd);
 	return nmd->lasterr;
 }
 
 /*
  * allocator for private memory
  */
 static void *
 _netmap_mem_private_new(size_t size, struct netmap_obj_params *p, int grp_id,
 		struct netmap_mem_ops *ops, uint64_t memtotal, int *perr)
 {
 	struct netmap_mem_d *d = NULL;
 	int i, err = 0;
 	int checksz = 0;
 
 	/* if memtotal is !=0 we check that the request fits the available
 	 * memory. Moreover, any surprlus memory is assigned to buffers.
 	 */
 	checksz = (memtotal > 0);
 
 	d = nm_os_malloc(size);
 	if (d == NULL) {
 		err = ENOMEM;
 		goto error;
 	}
 
 	*d = nm_blueprint;
 	d->ops = ops;
 
 	err = nm_mem_assign_id(d, grp_id);
 	if (err)
 		goto error_free;
 	snprintf(d->name, NM_MEM_NAMESZ, "%d", d->nm_id);
 
 	for (i = 0; i < NETMAP_POOLS_NR; i++) {
 		snprintf(d->pools[i].name, NETMAP_POOL_MAX_NAMSZ,
 				nm_blueprint.pools[i].name,
 				d->name);
 		if (checksz) {
 			uint64_t poolsz = (uint64_t)p[i].num * p[i].size;
 			if (memtotal < poolsz) {
 				nm_prerr("%s: request too large", d->pools[i].name);
 				err = ENOMEM;
 				goto error_rel_id;
 			}
 			memtotal -= poolsz;
 		}
 		d->params[i].num = p[i].num;
 		d->params[i].size = p[i].size;
 	}
 	if (checksz && memtotal > 0) {
 		uint64_t sz = d->params[NETMAP_BUF_POOL].size;
 		uint64_t n = (memtotal + sz - 1) / sz;
 
 		if (n) {
 			if (netmap_verbose) {
 				nm_prinf("%s: adding %llu more buffers",
 				    d->pools[NETMAP_BUF_POOL].name,
 				    (unsigned long long)n);
 			}
 			d->params[NETMAP_BUF_POOL].num += n;
 		}
 	}
 
 	NMA_LOCK_INIT(d);
 
 	err = netmap_mem_config(d);
 	if (err)
 		goto error_destroy_lock;
 
 	d->flags &= ~NETMAP_MEM_FINALIZED;
 
 	return d;
 
 error_destroy_lock:
 	NMA_LOCK_DESTROY(d);
 error_rel_id:
 	nm_mem_release_id(d);
 error_free:
 	nm_os_free(d);
 error:
 	if (perr)
 		*perr = err;
 	return NULL;
 }
 
 struct netmap_mem_d *
 netmap_mem_private_new(u_int txr, u_int txd, u_int rxr, u_int rxd,
 		u_int extra_bufs, u_int npipes, int *perr)
 {
 	struct netmap_mem_d *d = NULL;
 	struct netmap_obj_params p[NETMAP_POOLS_NR];
 	int i;
 	u_int v, maxd;
 	/* account for the fake host rings */
 	txr++;
 	rxr++;
 
 	/* copy the min values */
 	for (i = 0; i < NETMAP_POOLS_NR; i++) {
 		p[i] = netmap_min_priv_params[i];
 	}
 
 	/* possibly increase them to fit user request */
 	v = sizeof(struct netmap_if) + sizeof(ssize_t) * (txr + rxr);
 	if (p[NETMAP_IF_POOL].size < v)
 		p[NETMAP_IF_POOL].size = v;
 	v = 2 + 4 * npipes;
 	if (p[NETMAP_IF_POOL].num < v)
 		p[NETMAP_IF_POOL].num = v;
 	maxd = (txd > rxd) ? txd : rxd;
 	v = sizeof(struct netmap_ring) + sizeof(struct netmap_slot) * maxd;
 	if (p[NETMAP_RING_POOL].size < v)
 		p[NETMAP_RING_POOL].size = v;
 	/* each pipe endpoint needs two tx rings (1 normal + 1 host, fake)
 	 * and two rx rings (again, 1 normal and 1 fake host)
 	 */
 	v = txr + rxr + 8 * npipes;
 	if (p[NETMAP_RING_POOL].num < v)
 		p[NETMAP_RING_POOL].num = v;
 	/* for each pipe we only need the buffers for the 4 "real" rings.
 	 * On the other end, the pipe ring dimension may be different from
 	 * the parent port ring dimension. As a compromise, we allocate twice the
 	 * space actually needed if the pipe rings were the same size as the parent rings
 	 */
 	v = (4 * npipes + rxr) * rxd + (4 * npipes + txr) * txd + 2 + extra_bufs;
 		/* the +2 is for the tx and rx fake buffers (indices 0 and 1) */
 	if (p[NETMAP_BUF_POOL].num < v)
 		p[NETMAP_BUF_POOL].num = v;
 
 	if (netmap_verbose)
 		nm_prinf("req if %d*%d ring %d*%d buf %d*%d",
 			p[NETMAP_IF_POOL].num,
 			p[NETMAP_IF_POOL].size,
 			p[NETMAP_RING_POOL].num,
 			p[NETMAP_RING_POOL].size,
 			p[NETMAP_BUF_POOL].num,
 			p[NETMAP_BUF_POOL].size);
 
 	d = _netmap_mem_private_new(sizeof(*d), p, -1, &netmap_mem_global_ops, 0, perr);
 
 	return d;
 }
 
 /* Reference iommu allocator - find existing or create new,
  * for not hw addapeters fallback to global allocator.
  */
 struct netmap_mem_d *
 netmap_mem_get_iommu(struct netmap_adapter *na)
 {
 	int i, err, grp_id;
 	struct netmap_mem_d *nmd;
 
 	if (na == NULL || na->pdev == NULL)
 		return netmap_mem_get(&nm_mem);
 
 	grp_id = nm_iommu_group_id(na->pdev);
 
 	NM_MTX_LOCK(nm_mem_list_lock);
 	nmd = netmap_last_mem_d;
 	do {
 		if (!(nmd->flags & NETMAP_MEM_HIDDEN) && nmd->nm_grp == grp_id) {
 			nmd->refcount++;
 			NM_DBG_REFC(nmd, __FUNCTION__, __LINE__);
 			NM_MTX_UNLOCK(nm_mem_list_lock);
 			return nmd;
 		}
 		nmd = nmd->next;
 	} while (nmd != netmap_last_mem_d);
 
 	nmd = nm_os_malloc(sizeof(*nmd));
 	if (nmd == NULL)
 		goto error;
 
 	*nmd = nm_mem_blueprint;
 
 	err = nm_mem_assign_id_locked(nmd, grp_id);
 	if (err)
 		goto error_free;
 
 	snprintf(nmd->name, sizeof(nmd->name), "%d", nmd->nm_id);
 
 	for (i = 0; i < NETMAP_POOLS_NR; i++) {
 		snprintf(nmd->pools[i].name, NETMAP_POOL_MAX_NAMSZ, "%s-%s",
 			nm_mem_blueprint.pools[i].name, nmd->name);
 	}
 
 	NMA_LOCK_INIT(nmd);
 
 	NM_MTX_UNLOCK(nm_mem_list_lock);
 	return nmd;
 
 error_free:
 	nm_os_free(nmd);
 error:
 	NM_MTX_UNLOCK(nm_mem_list_lock);
 	return NULL;
 }
 
 /* call with lock held */
 static int
 netmap_mem2_config(struct netmap_mem_d *nmd)
 {
 	int i;
 
 	if (!netmap_mem_params_changed(nmd->params))
 		goto out;
 
 	nm_prdis("reconfiguring");
 
 	if (nmd->flags & NETMAP_MEM_FINALIZED) {
 		/* reset previous allocation */
 		for (i = 0; i < NETMAP_POOLS_NR; i++) {
 			netmap_reset_obj_allocator(&nmd->pools[i]);
 		}
 		nmd->flags &= ~NETMAP_MEM_FINALIZED;
 	}
 
 	for (i = 0; i < NETMAP_POOLS_NR; i++) {
 		nmd->lasterr = netmap_config_obj_allocator(&nmd->pools[i],
 				nmd->params[i].num, nmd->params[i].size);
 		if (nmd->lasterr)
 			goto out;
 	}
 
 out:
 
 	return nmd->lasterr;
 }
 
 static int
 netmap_mem2_finalize(struct netmap_mem_d *nmd, struct netmap_adapter *na)
 {
 	if (nmd->flags & NETMAP_MEM_FINALIZED)
 		goto out;
 
 	if (netmap_mem_finalize_all(nmd))
 		goto out;
 
 	nmd->lasterr = 0;
 
 out:
 	return nmd->lasterr;
 }
 
 static void
 netmap_mem2_delete(struct netmap_mem_d *nmd)
 {
 	int i;
 
 	for (i = 0; i < NETMAP_POOLS_NR; i++) {
 	    netmap_destroy_obj_allocator(&nmd->pools[i]);
 	}
 
 	NMA_LOCK_DESTROY(nmd);
 	if (nmd != &nm_mem)
 		nm_os_free(nmd);
 }
 
 #ifdef WITH_EXTMEM
 /* doubly linekd list of all existing external allocators */
 static struct netmap_mem_ext *netmap_mem_ext_list = NULL;
 NM_MTX_T nm_mem_ext_list_lock;
 #endif /* WITH_EXTMEM */
 
 int
 netmap_mem_init(void)
 {
 	nm_mem_blueprint = nm_mem;
 	NM_MTX_INIT(nm_mem_list_lock);
 	NMA_LOCK_INIT(&nm_mem);
 	netmap_mem_get(&nm_mem);
 #ifdef WITH_EXTMEM
 	NM_MTX_INIT(nm_mem_ext_list_lock);
 #endif /* WITH_EXTMEM */
 	return (0);
 }
 
 void
 netmap_mem_fini(void)
 {
 	netmap_mem_put(&nm_mem);
 }
 
 static int
 netmap_mem_ring_needed(struct netmap_kring *kring)
 {
 	return kring->ring == NULL &&
 		(kring->users > 0 ||
 		 (kring->nr_kflags & NKR_NEEDRING));
 }
 
 static int
 netmap_mem_ring_todelete(struct netmap_kring *kring)
 {
 	return kring->ring != NULL &&
 		kring->users == 0 &&
 		!(kring->nr_kflags & NKR_NEEDRING);
 }
 
 
 /* call with NMA_LOCK held *
  *
  * Allocate netmap rings and buffers for this card
  * The rings are contiguous, but have variable size.
  * The kring array must follow the layout described
  * in netmap_krings_create().
  */
 static int
 netmap_mem2_rings_create(struct netmap_mem_d *nmd, struct netmap_adapter *na)
 {
 	enum txrx t;
 
 	for_rx_tx(t) {
 		u_int i;
 
 		for (i = 0; i < netmap_all_rings(na, t); i++) {
 			struct netmap_kring *kring = NMR(na, t)[i];
 			struct netmap_ring *ring = kring->ring;
 			u_int len, ndesc;
 
 			if (!netmap_mem_ring_needed(kring)) {
 				/* unneeded, or already created by somebody else */
 				if (netmap_debug & NM_DEBUG_MEM)
 					nm_prinf("NOT creating ring %s (ring %p, users %d neekring %d)",
 						kring->name, ring, kring->users, kring->nr_kflags & NKR_NEEDRING);
 				continue;
 			}
 			if (netmap_debug & NM_DEBUG_MEM)
 				nm_prinf("creating %s", kring->name);
 			ndesc = kring->nkr_num_slots;
 			len = sizeof(struct netmap_ring) +
 				  ndesc * sizeof(struct netmap_slot);
 			ring = netmap_ring_malloc(nmd, len);
 			if (ring == NULL) {
 				nm_prerr("Cannot allocate %s_ring", nm_txrx2str(t));
 				goto cleanup;
 			}
 			nm_prdis("txring at %p", ring);
 			kring->ring = ring;
 			*(uint32_t *)(uintptr_t)&ring->num_slots = ndesc;
 			*(int64_t *)(uintptr_t)&ring->buf_ofs =
 			    (nmd->pools[NETMAP_IF_POOL].memtotal +
 				nmd->pools[NETMAP_RING_POOL].memtotal) -
 				netmap_ring_offset(nmd, ring);
 
 			/* copy values from kring */
 			ring->head = kring->rhead;
 			ring->cur = kring->rcur;
 			ring->tail = kring->rtail;
 			*(uint32_t *)(uintptr_t)&ring->nr_buf_size =
 				netmap_mem_bufsize(nmd);
 			nm_prdis("%s h %d c %d t %d", kring->name,
 				ring->head, ring->cur, ring->tail);
 			nm_prdis("initializing slots for %s_ring", nm_txrx2str(t));
 			if (!(kring->nr_kflags & NKR_FAKERING)) {
 				/* this is a real ring */
 				if (netmap_debug & NM_DEBUG_MEM)
 					nm_prinf("allocating buffers for %s", kring->name);
 				if (netmap_new_bufs(nmd, ring->slot, ndesc)) {
 					nm_prerr("Cannot allocate buffers for %s_ring", nm_txrx2str(t));
 					goto cleanup;
 				}
 			} else {
 				/* this is a fake ring, set all indices to 0 */
 				if (netmap_debug & NM_DEBUG_MEM)
 					nm_prinf("NOT allocating buffers for %s", kring->name);
 				netmap_mem_set_ring(nmd, ring->slot, ndesc, 0);
 			}
 		        /* ring info */
 		        *(uint16_t *)(uintptr_t)&ring->ringid = kring->ring_id;
 		        *(uint16_t *)(uintptr_t)&ring->dir = kring->tx;
 		}
 	}
 
 	return 0;
 
 cleanup:
 	/* we cannot actually cleanup here, since we don't own kring->users
 	 * and kring->nr_klags & NKR_NEEDRING. The caller must decrement
 	 * the first or zero-out the second, then call netmap_free_rings()
 	 * to do the cleanup
 	 */
 
 	return ENOMEM;
 }
 
 static void
 netmap_mem2_rings_delete(struct netmap_mem_d *nmd, struct netmap_adapter *na)
 {
 	enum txrx t;
 
 	for_rx_tx(t) {
 		u_int i;
 		for (i = 0; i < netmap_all_rings(na, t); i++) {
 			struct netmap_kring *kring = NMR(na, t)[i];
 			struct netmap_ring *ring = kring->ring;
 
 			if (!netmap_mem_ring_todelete(kring)) {
 				if (netmap_debug & NM_DEBUG_MEM)
 					nm_prinf("NOT deleting ring %s (ring %p, users %d neekring %d)",
 						kring->name, ring, kring->users, kring->nr_kflags & NKR_NEEDRING);
 				continue;
 			}
 			if (netmap_debug & NM_DEBUG_MEM)
 				nm_prinf("deleting ring %s", kring->name);
 			if (!(kring->nr_kflags & NKR_FAKERING)) {
 				nm_prdis("freeing bufs for %s", kring->name);
 				netmap_free_bufs(nmd, ring->slot, kring->nkr_num_slots);
 			} else {
 				nm_prdis("NOT freeing bufs for %s", kring->name);
 			}
 			netmap_ring_free(nmd, ring);
 			kring->ring = NULL;
 		}
 	}
 }
 
 /* call with NMA_LOCK held */
 /*
  * Allocate the per-fd structure netmap_if.
  *
  * We assume that the configuration stored in na
  * (number of tx/rx rings and descs) does not change while
  * the interface is in netmap mode.
  */
 static struct netmap_if *
 netmap_mem2_if_new(struct netmap_mem_d *nmd,
 		struct netmap_adapter *na, struct netmap_priv_d *priv)
 {
 	struct netmap_if *nifp;
 	ssize_t base; /* handy for relative offsets between rings and nifp */
 	u_int i, len, n[NR_TXRX], ntot;
 	enum txrx t;
 
 	ntot = 0;
 	for_rx_tx(t) {
 		/* account for the (eventually fake) host rings */
 		n[t] = netmap_all_rings(na, t);
 		ntot += n[t];
 	}
 	/*
 	 * the descriptor is followed inline by an array of offsets
 	 * to the tx and rx rings in the shared memory region.
 	 */
 
 	len = sizeof(struct netmap_if) + (ntot * sizeof(ssize_t));
 	nifp = netmap_if_malloc(nmd, len);
 	if (nifp == NULL) {
 		return NULL;
 	}
 
 	/* initialize base fields -- override const */
 	*(u_int *)(uintptr_t)&nifp->ni_tx_rings = na->num_tx_rings;
 	*(u_int *)(uintptr_t)&nifp->ni_rx_rings = na->num_rx_rings;
 	*(u_int *)(uintptr_t)&nifp->ni_host_tx_rings =
 		(na->num_host_tx_rings ? na->num_host_tx_rings : 1);
 	*(u_int *)(uintptr_t)&nifp->ni_host_rx_rings =
 		(na->num_host_rx_rings ? na->num_host_rx_rings : 1);
 	strlcpy(nifp->ni_name, na->name, sizeof(nifp->ni_name));
 
 	/*
 	 * fill the slots for the rx and tx rings. They contain the offset
 	 * between the ring and nifp, so the information is usable in
 	 * userspace to reach the ring from the nifp.
 	 */
 	base = netmap_if_offset(nmd, nifp);
 	for (i = 0; i < n[NR_TX]; i++) {
 		/* XXX instead of ofs == 0 maybe use the offset of an error
 		 * ring, like we do for buffers? */
 		ssize_t ofs = 0;
 
 		if (na->tx_rings[i]->ring != NULL && i >= priv->np_qfirst[NR_TX]
 				&& i < priv->np_qlast[NR_TX]) {
 			ofs = netmap_ring_offset(nmd,
 						 na->tx_rings[i]->ring) - base;
 		}
 		*(ssize_t *)(uintptr_t)&nifp->ring_ofs[i] = ofs;
 	}
 	for (i = 0; i < n[NR_RX]; i++) {
 		/* XXX instead of ofs == 0 maybe use the offset of an error
 		 * ring, like we do for buffers? */
 		ssize_t ofs = 0;
 
 		if (na->rx_rings[i]->ring != NULL && i >= priv->np_qfirst[NR_RX]
 				&& i < priv->np_qlast[NR_RX]) {
 			ofs = netmap_ring_offset(nmd,
 						 na->rx_rings[i]->ring) - base;
 		}
 		*(ssize_t *)(uintptr_t)&nifp->ring_ofs[i+n[NR_TX]] = ofs;
 	}
 
 	return (nifp);
 }
 
 static void
 netmap_mem2_if_delete(struct netmap_mem_d *nmd,
 		struct netmap_adapter *na, struct netmap_if *nifp)
 {
 	if (nifp == NULL)
 		/* nothing to do */
 		return;
 	if (nifp->ni_bufs_head)
 		netmap_extra_free(na, nifp->ni_bufs_head);
 	netmap_if_free(nmd, nifp);
 }
 
 static void
 netmap_mem2_deref(struct netmap_mem_d *nmd, struct netmap_adapter *na)
 {
 
 	if (netmap_debug & NM_DEBUG_MEM)
 		nm_prinf("active = %d", nmd->active);
 
 }
 
 struct netmap_mem_ops netmap_mem_global_ops = {
 	.nmd_get_lut = netmap_mem2_get_lut,
 	.nmd_get_info = netmap_mem2_get_info,
 	.nmd_ofstophys = netmap_mem2_ofstophys,
 	.nmd_config = netmap_mem2_config,
 	.nmd_finalize = netmap_mem2_finalize,
 	.nmd_deref = netmap_mem2_deref,
 	.nmd_delete = netmap_mem2_delete,
 	.nmd_if_offset = netmap_mem2_if_offset,
 	.nmd_if_new = netmap_mem2_if_new,
 	.nmd_if_delete = netmap_mem2_if_delete,
 	.nmd_rings_create = netmap_mem2_rings_create,
 	.nmd_rings_delete = netmap_mem2_rings_delete
 };
 
 int
 netmap_mem_pools_info_get(struct nmreq_pools_info *req,
 				struct netmap_mem_d *nmd)
 {
 	int ret;
 
 	ret = netmap_mem_get_info(nmd, &req->nr_memsize, NULL,
 					&req->nr_mem_id);
 	if (ret) {
 		return ret;
 	}
 
 	NMA_LOCK(nmd);
 	req->nr_if_pool_offset = 0;
 	req->nr_if_pool_objtotal = nmd->pools[NETMAP_IF_POOL].objtotal;
 	req->nr_if_pool_objsize = nmd->pools[NETMAP_IF_POOL]._objsize;
 
 	req->nr_ring_pool_offset = nmd->pools[NETMAP_IF_POOL].memtotal;
 	req->nr_ring_pool_objtotal = nmd->pools[NETMAP_RING_POOL].objtotal;
 	req->nr_ring_pool_objsize = nmd->pools[NETMAP_RING_POOL]._objsize;
 
 	req->nr_buf_pool_offset = nmd->pools[NETMAP_IF_POOL].memtotal +
 			     nmd->pools[NETMAP_RING_POOL].memtotal;
 	req->nr_buf_pool_objtotal = nmd->pools[NETMAP_BUF_POOL].objtotal;
 	req->nr_buf_pool_objsize = nmd->pools[NETMAP_BUF_POOL]._objsize;
 	NMA_UNLOCK(nmd);
 
 	return 0;
 }
 
 #ifdef WITH_EXTMEM
 struct netmap_mem_ext {
 	struct netmap_mem_d up;
 
 	struct nm_os_extmem *os;
 	struct netmap_mem_ext *next, *prev;
 };
 
 /* call with nm_mem_list_lock held */
 static void
 netmap_mem_ext_register(struct netmap_mem_ext *e)
 {
 	NM_MTX_LOCK(nm_mem_ext_list_lock);
 	if (netmap_mem_ext_list)
 		netmap_mem_ext_list->prev = e;
 	e->next = netmap_mem_ext_list;
 	netmap_mem_ext_list = e;
 	e->prev = NULL;
 	NM_MTX_UNLOCK(nm_mem_ext_list_lock);
 }
 
 /* call with nm_mem_list_lock held */
 static void
 netmap_mem_ext_unregister(struct netmap_mem_ext *e)
 {
 	if (e->prev)
 		e->prev->next = e->next;
 	else
 		netmap_mem_ext_list = e->next;
 	if (e->next)
 		e->next->prev = e->prev;
 	e->prev = e->next = NULL;
 }
 
 static struct netmap_mem_ext *
 netmap_mem_ext_search(struct nm_os_extmem *os)
 {
 	struct netmap_mem_ext *e;
 
 	NM_MTX_LOCK(nm_mem_ext_list_lock);
 	for (e = netmap_mem_ext_list; e; e = e->next) {
 		if (nm_os_extmem_isequal(e->os, os)) {
 			netmap_mem_get(&e->up);
 			break;
 		}
 	}
 	NM_MTX_UNLOCK(nm_mem_ext_list_lock);
 	return e;
 }
 
 
 static void
 netmap_mem_ext_delete(struct netmap_mem_d *d)
 {
 	int i;
 	struct netmap_mem_ext *e =
 		(struct netmap_mem_ext *)d;
 
 	netmap_mem_ext_unregister(e);
 
 	for (i = 0; i < NETMAP_POOLS_NR; i++) {
 		struct netmap_obj_pool *p = &d->pools[i];
 
 		if (p->lut) {
 			nm_free_lut(p->lut, p->objtotal);
 			p->lut = NULL;
 		}
 	}
 	if (e->os)
 		nm_os_extmem_delete(e->os);
 	netmap_mem2_delete(d);
 }
 
 static int
 netmap_mem_ext_config(struct netmap_mem_d *nmd)
 {
 	return 0;
 }
 
 struct netmap_mem_ops netmap_mem_ext_ops = {
 	.nmd_get_lut = netmap_mem2_get_lut,
 	.nmd_get_info = netmap_mem2_get_info,
 	.nmd_ofstophys = netmap_mem2_ofstophys,
 	.nmd_config = netmap_mem_ext_config,
 	.nmd_finalize = netmap_mem2_finalize,
 	.nmd_deref = netmap_mem2_deref,
 	.nmd_delete = netmap_mem_ext_delete,
 	.nmd_if_offset = netmap_mem2_if_offset,
 	.nmd_if_new = netmap_mem2_if_new,
 	.nmd_if_delete = netmap_mem2_if_delete,
 	.nmd_rings_create = netmap_mem2_rings_create,
 	.nmd_rings_delete = netmap_mem2_rings_delete
 };
 
 struct netmap_mem_d *
 netmap_mem_ext_create(uint64_t usrptr, struct nmreq_pools_info *pi, int *perror)
 {
 	int error = 0;
 	int i, j;
 	struct netmap_mem_ext *nme;
 	char *clust;
 	size_t off;
 	struct nm_os_extmem *os = NULL;
 	int nr_pages;
 
 	// XXX sanity checks
 	if (pi->nr_if_pool_objtotal == 0)
 		pi->nr_if_pool_objtotal = netmap_min_priv_params[NETMAP_IF_POOL].num;
 	if (pi->nr_if_pool_objsize == 0)
 		pi->nr_if_pool_objsize = netmap_min_priv_params[NETMAP_IF_POOL].size;
 	if (pi->nr_ring_pool_objtotal == 0)
 		pi->nr_ring_pool_objtotal = netmap_min_priv_params[NETMAP_RING_POOL].num;
 	if (pi->nr_ring_pool_objsize == 0)
 		pi->nr_ring_pool_objsize = netmap_min_priv_params[NETMAP_RING_POOL].size;
 	if (pi->nr_buf_pool_objtotal == 0)
 		pi->nr_buf_pool_objtotal = netmap_min_priv_params[NETMAP_BUF_POOL].num;
 	if (pi->nr_buf_pool_objsize == 0)
 		pi->nr_buf_pool_objsize = netmap_min_priv_params[NETMAP_BUF_POOL].size;
 	if (netmap_verbose & NM_DEBUG_MEM)
 		nm_prinf("if %d %d ring %d %d buf %d %d",
 			pi->nr_if_pool_objtotal, pi->nr_if_pool_objsize,
 			pi->nr_ring_pool_objtotal, pi->nr_ring_pool_objsize,
 			pi->nr_buf_pool_objtotal, pi->nr_buf_pool_objsize);
 
 	os = nm_os_extmem_create(usrptr, pi, &error);
 	if (os == NULL) {
 		nm_prerr("os extmem creation failed");
 		goto out;
 	}
 
 	nme = netmap_mem_ext_search(os);
 	if (nme) {
 		nm_os_extmem_delete(os);
 		return &nme->up;
 	}
 	if (netmap_verbose & NM_DEBUG_MEM)
 		nm_prinf("not found, creating new");
 
 	nme = _netmap_mem_private_new(sizeof(*nme),
 
 			(struct netmap_obj_params[]){
 				{ pi->nr_if_pool_objsize, pi->nr_if_pool_objtotal },
 				{ pi->nr_ring_pool_objsize, pi->nr_ring_pool_objtotal },
 				{ pi->nr_buf_pool_objsize, pi->nr_buf_pool_objtotal }},
 			-1,
 			&netmap_mem_ext_ops,
 			pi->nr_memsize,
 			&error);
 	if (nme == NULL)
 		goto out_unmap;
 
 	nr_pages = nm_os_extmem_nr_pages(os);
 
 	/* from now on pages will be released by nme destructor;
 	 * we let res = 0 to prevent release in out_unmap below
 	 */
 	nme->os = os;
 	os = NULL; /* pass ownership */
 
 	clust = nm_os_extmem_nextpage(nme->os);
 	off = 0;
 	for (i = 0; i < NETMAP_POOLS_NR; i++) {
 		struct netmap_obj_pool *p = &nme->up.pools[i];
 		struct netmap_obj_params *o = &nme->up.params[i];
 
 		p->_objsize = o->size;
 		p->_clustsize = o->size;
 		p->_clustentries = 1;
 
 		p->lut = nm_alloc_lut(o->num);
 		if (p->lut == NULL) {
 			error = ENOMEM;
 			goto out_delete;
 		}
 
 		p->bitmap_slots = (o->num + sizeof(uint32_t) - 1) / sizeof(uint32_t);
 		p->invalid_bitmap = nm_os_malloc(sizeof(uint32_t) * p->bitmap_slots);
 		if (p->invalid_bitmap == NULL) {
 			error = ENOMEM;
 			goto out_delete;
 		}
 
 		if (nr_pages == 0) {
 			p->objtotal = 0;
 			p->memtotal = 0;
 			p->objfree = 0;
 			continue;
 		}
 
 		for (j = 0; j < o->num && nr_pages > 0; j++) {
 			size_t noff;
 
 			p->lut[j].vaddr = clust + off;
 #if !defined(linux) && !defined(_WIN32)
 			p->lut[j].paddr = vtophys(p->lut[j].vaddr);
 #endif
 			nm_prdis("%s %d at %p", p->name, j, p->lut[j].vaddr);
 			noff = off + p->_objsize;
 			if (noff < PAGE_SIZE) {
 				off = noff;
 				continue;
 			}
 			nm_prdis("too big, recomputing offset...");
 			while (noff >= PAGE_SIZE) {
 				char *old_clust = clust;
 				noff -= PAGE_SIZE;
 				clust = nm_os_extmem_nextpage(nme->os);
 				nr_pages--;
 				nm_prdis("noff %zu page %p nr_pages %d", noff,
 						page_to_virt(*pages), nr_pages);
 				if (noff > 0 && !nm_isset(p->invalid_bitmap, j) &&
 					(nr_pages == 0 ||
 					 old_clust + PAGE_SIZE != clust))
 				{
 					/* out of space or non contiguous,
 					 * drop this object
 					 * */
 					p->invalid_bitmap[ (j>>5) ] |= 1U << (j & 31U);
 					nm_prdis("non contiguous at off %zu, drop", noff);
 				}
 				if (nr_pages == 0)
 					break;
 			}
 			off = noff;
 		}
 		p->objtotal = j;
 		p->numclusters = p->objtotal;
 		p->memtotal = j * (size_t)p->_objsize;
 		nm_prdis("%d memtotal %zu", j, p->memtotal);
 	}
 
 	netmap_mem_ext_register(nme);
 
 	return &nme->up;
 
 out_delete:
 	netmap_mem_put(&nme->up);
 out_unmap:
 	if (os)
 		nm_os_extmem_delete(os);
 out:
 	if (perror)
 		*perror = error;
 	return NULL;
 
 }
 #endif /* WITH_EXTMEM */
 
 
 #ifdef WITH_PTNETMAP
 struct mem_pt_if {
 	struct mem_pt_if *next;
 	if_t ifp;
 	unsigned int nifp_offset;
 };
 
 /* Netmap allocator for ptnetmap guests. */
 struct netmap_mem_ptg {
 	struct netmap_mem_d up;
 
 	vm_paddr_t nm_paddr;            /* physical address in the guest */
 	void *nm_addr;                  /* virtual address in the guest */
 	struct netmap_lut buf_lut;      /* lookup table for BUF pool in the guest */
 	nm_memid_t host_mem_id;         /* allocator identifier in the host */
 	struct ptnetmap_memdev *ptn_dev;/* ptnetmap memdev */
 	struct mem_pt_if *pt_ifs;	/* list of interfaces in passthrough */
 };
 
 /* Link a passthrough interface to a passthrough netmap allocator. */
 static int
 netmap_mem_pt_guest_ifp_add(struct netmap_mem_d *nmd, if_t ifp,
 			    unsigned int nifp_offset)
 {
 	struct netmap_mem_ptg *ptnmd = (struct netmap_mem_ptg *)nmd;
 	struct mem_pt_if *ptif = nm_os_malloc(sizeof(*ptif));
 
 	if (!ptif) {
 		return ENOMEM;
 	}
 
 	NMA_LOCK(nmd);
 
 	ptif->ifp = ifp;
 	ptif->nifp_offset = nifp_offset;
 
 	if (ptnmd->pt_ifs) {
 		ptif->next = ptnmd->pt_ifs;
 	}
 	ptnmd->pt_ifs = ptif;
 
 	NMA_UNLOCK(nmd);
 
 	nm_prinf("ifp=%s,nifp_offset=%u",
 		if_name(ptif->ifp), ptif->nifp_offset);
 
 	return 0;
 }
 
 /* Called with NMA_LOCK(nmd) held. */
 static struct mem_pt_if *
 netmap_mem_pt_guest_ifp_lookup(struct netmap_mem_d *nmd, if_t ifp)
 {
 	struct netmap_mem_ptg *ptnmd = (struct netmap_mem_ptg *)nmd;
 	struct mem_pt_if *curr;
 
 	for (curr = ptnmd->pt_ifs; curr; curr = curr->next) {
 		if (curr->ifp == ifp) {
 			return curr;
 		}
 	}
 
 	return NULL;
 }
 
 /* Unlink a passthrough interface from a passthrough netmap allocator. */
 int
 netmap_mem_pt_guest_ifp_del(struct netmap_mem_d *nmd, if_t ifp)
 {
 	struct netmap_mem_ptg *ptnmd = (struct netmap_mem_ptg *)nmd;
 	struct mem_pt_if *prev = NULL;
 	struct mem_pt_if *curr;
 	int ret = -1;
 
 	NMA_LOCK(nmd);
 
 	for (curr = ptnmd->pt_ifs; curr; curr = curr->next) {
 		if (curr->ifp == ifp) {
 			if (prev) {
 				prev->next = curr->next;
 			} else {
 				ptnmd->pt_ifs = curr->next;
 			}
 			nm_prinf("removed (ifp=%s,nifp_offset=%u)",
 			  if_name(curr->ifp), curr->nifp_offset);
 			nm_os_free(curr);
 			ret = 0;
 			break;
 		}
 		prev = curr;
 	}
 
 	NMA_UNLOCK(nmd);
 
 	return ret;
 }
 
 static int
 netmap_mem_pt_guest_get_lut(struct netmap_mem_d *nmd, struct netmap_lut *lut)
 {
 	struct netmap_mem_ptg *ptnmd = (struct netmap_mem_ptg *)nmd;
 
 	if (!(nmd->flags & NETMAP_MEM_FINALIZED)) {
 		return EINVAL;
 	}
 
 	*lut = ptnmd->buf_lut;
 	return 0;
 }
 
 static int
 netmap_mem_pt_guest_get_info(struct netmap_mem_d *nmd, uint64_t *size,
 			     u_int *memflags, uint16_t *id)
 {
 	int error = 0;
 
 	error = nmd->ops->nmd_config(nmd);
 	if (error)
 		goto out;
 
 	if (size)
 		*size = nmd->nm_totalsize;
 	if (memflags)
 		*memflags = nmd->flags;
 	if (id)
 		*id = nmd->nm_id;
 
 out:
 
 	return error;
 }
 
 static vm_paddr_t
 netmap_mem_pt_guest_ofstophys(struct netmap_mem_d *nmd, vm_ooffset_t off)
 {
 	struct netmap_mem_ptg *ptnmd = (struct netmap_mem_ptg *)nmd;
 	vm_paddr_t paddr;
 	/* if the offset is valid, just return csb->base_addr + off */
 	paddr = (vm_paddr_t)(ptnmd->nm_paddr + off);
 	nm_prdis("off %lx padr %lx", off, (unsigned long)paddr);
 	return paddr;
 }
 
 static int
 netmap_mem_pt_guest_config(struct netmap_mem_d *nmd)
 {
 	/* nothing to do, we are configured on creation
 	 * and configuration never changes thereafter
 	 */
 	return 0;
 }
 
 static int
 netmap_mem_pt_guest_finalize(struct netmap_mem_d *nmd, struct netmap_adapter *na)
 {
 	struct netmap_mem_ptg *ptnmd = (struct netmap_mem_ptg *)nmd;
 	uint64_t mem_size;
 	uint32_t bufsize;
 	uint32_t nbuffers;
 	uint32_t poolofs;
 	vm_paddr_t paddr;
 	char *vaddr;
 	int i;
 	int error = 0;
 
 	if (nmd->flags & NETMAP_MEM_FINALIZED)
 		goto out;
 
 	if (ptnmd->ptn_dev == NULL) {
 		nm_prerr("ptnetmap memdev not attached");
 		error = ENOMEM;
 		goto out;
 	}
 	/* Map memory through ptnetmap-memdev BAR. */
 	error = nm_os_pt_memdev_iomap(ptnmd->ptn_dev, &ptnmd->nm_paddr,
 				      &ptnmd->nm_addr, &mem_size);
 	if (error)
 		goto out;
 
 	/* Initialize the lut using the information contained in the
 	 * ptnetmap memory device. */
 	bufsize = nm_os_pt_memdev_ioread(ptnmd->ptn_dev,
 					 PTNET_MDEV_IO_BUF_POOL_OBJSZ);
 	nbuffers = nm_os_pt_memdev_ioread(ptnmd->ptn_dev,
 					 PTNET_MDEV_IO_BUF_POOL_OBJNUM);
 
 	/* allocate the lut */
 	if (ptnmd->buf_lut.lut == NULL) {
 		nm_prinf("allocating lut");
 		ptnmd->buf_lut.lut = nm_alloc_lut(nbuffers);
 		if (ptnmd->buf_lut.lut == NULL) {
 			nm_prerr("lut allocation failed");
 			return ENOMEM;
 		}
 	}
 
 	/* we have physically contiguous memory mapped through PCI BAR */
 	poolofs = nm_os_pt_memdev_ioread(ptnmd->ptn_dev,
 					 PTNET_MDEV_IO_BUF_POOL_OFS);
 	vaddr = (char *)(ptnmd->nm_addr) + poolofs;
 	paddr = ptnmd->nm_paddr + poolofs;
 
 	for (i = 0; i < nbuffers; i++) {
 		ptnmd->buf_lut.lut[i].vaddr = vaddr;
 		vaddr += bufsize;
 		paddr += bufsize;
 	}
 
 	ptnmd->buf_lut.objtotal = nbuffers;
 	ptnmd->buf_lut.objsize = bufsize;
 	nmd->nm_totalsize = mem_size;
 
 	/* Initialize these fields as are needed by
 	 * netmap_mem_bufsize().
 	 * XXX please improve this, why do we need this
 	 * replication? maybe we nmd->pools[] should no be
 	 * there for the guest allocator? */
 	nmd->pools[NETMAP_BUF_POOL]._objsize = bufsize;
 	nmd->pools[NETMAP_BUF_POOL]._objtotal = nbuffers;
 
 	nmd->flags |= NETMAP_MEM_FINALIZED;
 out:
 	return error;
 }
 
 static void
 netmap_mem_pt_guest_deref(struct netmap_mem_d *nmd, struct netmap_adapter *na)
 {
 	struct netmap_mem_ptg *ptnmd = (struct netmap_mem_ptg *)nmd;
 
 	if (nmd->active == 1 &&
 		(nmd->flags & NETMAP_MEM_FINALIZED)) {
 	    nmd->flags  &= ~NETMAP_MEM_FINALIZED;
 	    /* unmap ptnetmap-memdev memory */
 	    if (ptnmd->ptn_dev) {
 		nm_os_pt_memdev_iounmap(ptnmd->ptn_dev);
 	    }
 	    ptnmd->nm_addr = NULL;
 	    ptnmd->nm_paddr = 0;
 	}
 }
 
 static ssize_t
 netmap_mem_pt_guest_if_offset(struct netmap_mem_d *nmd, const void *vaddr)
 {
 	struct netmap_mem_ptg *ptnmd = (struct netmap_mem_ptg *)nmd;
 
 	return (const char *)(vaddr) - (char *)(ptnmd->nm_addr);
 }
 
 static void
 netmap_mem_pt_guest_delete(struct netmap_mem_d *nmd)
 {
 	if (nmd == NULL)
 		return;
 	if (netmap_verbose)
 		nm_prinf("deleting %p", nmd);
 	if (nmd->active > 0)
 		nm_prerr("bug: deleting mem allocator with active=%d!", nmd->active);
 	if (netmap_verbose)
 		nm_prinf("done deleting %p", nmd);
 	NMA_LOCK_DESTROY(nmd);
 	nm_os_free(nmd);
 }
 
 static struct netmap_if *
 netmap_mem_pt_guest_if_new(struct netmap_mem_d *nmd,
 		struct netmap_adapter *na, struct netmap_priv_d *priv)
 {
 	struct netmap_mem_ptg *ptnmd = (struct netmap_mem_ptg *)nmd;
 	struct mem_pt_if *ptif;
 	struct netmap_if *nifp = NULL;
 
 	ptif = netmap_mem_pt_guest_ifp_lookup(nmd, na->ifp);
 	if (ptif == NULL) {
 		nm_prerr("interface %s is not in passthrough", na->name);
 		goto out;
 	}
 
 	nifp = (struct netmap_if *)((char *)(ptnmd->nm_addr) +
 				    ptif->nifp_offset);
 out:
 	return nifp;
 }
 
 static void
 netmap_mem_pt_guest_if_delete(struct netmap_mem_d * nmd,
 		struct netmap_adapter *na, struct netmap_if *nifp)
 {
 	struct mem_pt_if *ptif;
 
 	ptif = netmap_mem_pt_guest_ifp_lookup(nmd, na->ifp);
 	if (ptif == NULL) {
 		nm_prerr("interface %s is not in passthrough", na->name);
 	}
 }
 
 static int
 netmap_mem_pt_guest_rings_create(struct netmap_mem_d *nmd,
 		struct netmap_adapter *na)
 {
 	struct netmap_mem_ptg *ptnmd = (struct netmap_mem_ptg *)nmd;
 	struct mem_pt_if *ptif;
 	struct netmap_if *nifp;
 	int i, error = -1;
 
 	ptif = netmap_mem_pt_guest_ifp_lookup(nmd, na->ifp);
 	if (ptif == NULL) {
 		nm_prerr("interface %s is not in passthrough", na->name);
 		goto out;
 	}
 
 
 	/* point each kring to the corresponding backend ring */
 	nifp = (struct netmap_if *)((char *)ptnmd->nm_addr + ptif->nifp_offset);
 	for (i = 0; i < netmap_all_rings(na, NR_TX); i++) {
 		struct netmap_kring *kring = na->tx_rings[i];
 		if (kring->ring)
 			continue;
 		kring->ring = (struct netmap_ring *)
 			((char *)nifp + nifp->ring_ofs[i]);
 	}
 	for (i = 0; i < netmap_all_rings(na, NR_RX); i++) {
 		struct netmap_kring *kring = na->rx_rings[i];
 		if (kring->ring)
 			continue;
 		kring->ring = (struct netmap_ring *)
 			((char *)nifp +
 			 nifp->ring_ofs[netmap_all_rings(na, NR_TX) + i]);
 	}
 
 	error = 0;
 out:
 	return error;
 }
 
 static void
 netmap_mem_pt_guest_rings_delete(struct netmap_mem_d *nmd, struct netmap_adapter *na)
 {
 #if 0
 	enum txrx t;
 
 	for_rx_tx(t) {
 		u_int i;
 		for (i = 0; i < nma_get_nrings(na, t) + 1; i++) {
 			struct netmap_kring *kring = &NMR(na, t)[i];
 
 			kring->ring = NULL;
 		}
 	}
 #endif
 	(void)nmd;
 	(void)na;
 }
 
 static struct netmap_mem_ops netmap_mem_pt_guest_ops = {
 	.nmd_get_lut = netmap_mem_pt_guest_get_lut,
 	.nmd_get_info = netmap_mem_pt_guest_get_info,
 	.nmd_ofstophys = netmap_mem_pt_guest_ofstophys,
 	.nmd_config = netmap_mem_pt_guest_config,
 	.nmd_finalize = netmap_mem_pt_guest_finalize,
 	.nmd_deref = netmap_mem_pt_guest_deref,
 	.nmd_if_offset = netmap_mem_pt_guest_if_offset,
 	.nmd_delete = netmap_mem_pt_guest_delete,
 	.nmd_if_new = netmap_mem_pt_guest_if_new,
 	.nmd_if_delete = netmap_mem_pt_guest_if_delete,
 	.nmd_rings_create = netmap_mem_pt_guest_rings_create,
 	.nmd_rings_delete = netmap_mem_pt_guest_rings_delete
 };
 
 /* Called with nm_mem_list_lock held. */
 static struct netmap_mem_d *
 netmap_mem_pt_guest_find_memid(nm_memid_t mem_id)
 {
 	struct netmap_mem_d *mem = NULL;
 	struct netmap_mem_d *scan = netmap_last_mem_d;
 
 	do {
 		/* find ptnetmap allocator through host ID */
 		if (scan->ops->nmd_deref == netmap_mem_pt_guest_deref &&
 			((struct netmap_mem_ptg *)(scan))->host_mem_id == mem_id) {
 			mem = scan;
 			mem->refcount++;
 			NM_DBG_REFC(mem, __FUNCTION__, __LINE__);
 			break;
 		}
 		scan = scan->next;
 	} while (scan != netmap_last_mem_d);
 
 	return mem;
 }
 
 /* Called with nm_mem_list_lock held. */
 static struct netmap_mem_d *
 netmap_mem_pt_guest_create(nm_memid_t mem_id)
 {
 	struct netmap_mem_ptg *ptnmd;
 	int err = 0;
 
 	ptnmd = nm_os_malloc(sizeof(struct netmap_mem_ptg));
 	if (ptnmd == NULL) {
 		err = ENOMEM;
 		goto error;
 	}
 
 	ptnmd->up.ops = &netmap_mem_pt_guest_ops;
 	ptnmd->host_mem_id = mem_id;
 	ptnmd->pt_ifs = NULL;
 
 	/* Assign new id in the guest (We have the lock) */
 	err = nm_mem_assign_id_locked(&ptnmd->up, -1);
 	if (err)
 		goto error;
 
 	ptnmd->up.flags &= ~NETMAP_MEM_FINALIZED;
 	ptnmd->up.flags |= NETMAP_MEM_IO;
 
 	NMA_LOCK_INIT(&ptnmd->up);
 
 	snprintf(ptnmd->up.name, NM_MEM_NAMESZ, "%d", ptnmd->up.nm_id);
 
 
 	return &ptnmd->up;
 error:
 	netmap_mem_pt_guest_delete(&ptnmd->up);
 	return NULL;
 }
 
 /*
  * find host id in guest allocators and create guest allocator
  * if it is not there
  */
 static struct netmap_mem_d *
 netmap_mem_pt_guest_get(nm_memid_t mem_id)
 {
 	struct netmap_mem_d *nmd;
 
 	NM_MTX_LOCK(nm_mem_list_lock);
 	nmd = netmap_mem_pt_guest_find_memid(mem_id);
 	if (nmd == NULL) {
 		nmd = netmap_mem_pt_guest_create(mem_id);
 	}
 	NM_MTX_UNLOCK(nm_mem_list_lock);
 
 	return nmd;
 }
 
 /*
  * The guest allocator can be created by ptnetmap_memdev (during the device
  * attach) or by ptnetmap device (ptnet), during the netmap_attach.
  *
  * The order is not important (we have different order in LINUX and FreeBSD).
  * The first one, creates the device, and the second one simply attaches it.
  */
 
 /* Called when ptnetmap_memdev is attaching, to attach a new allocator in
  * the guest */
 struct netmap_mem_d *
 netmap_mem_pt_guest_attach(struct ptnetmap_memdev *ptn_dev, nm_memid_t mem_id)
 {
 	struct netmap_mem_d *nmd;
 	struct netmap_mem_ptg *ptnmd;
 
 	nmd = netmap_mem_pt_guest_get(mem_id);
 
 	/* assign this device to the guest allocator */
 	if (nmd) {
 		ptnmd = (struct netmap_mem_ptg *)nmd;
 		ptnmd->ptn_dev = ptn_dev;
 	}
 
 	return nmd;
 }
 
 /* Called when ptnet device is attaching */
 struct netmap_mem_d *
 netmap_mem_pt_guest_new(if_t ifp,
 			unsigned int nifp_offset,
 			unsigned int memid)
 {
 	struct netmap_mem_d *nmd;
 
 	if (ifp == NULL) {
 		return NULL;
 	}
 
 	nmd = netmap_mem_pt_guest_get((nm_memid_t)memid);
 
 	if (nmd) {
 		netmap_mem_pt_guest_ifp_add(nmd, ifp, nifp_offset);
 	}
 
 	return nmd;
 }
 
 #endif /* WITH_PTNETMAP */
diff --git a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
index c24d03a178ee..c8c9eb8c8dd8 100644
--- a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
+++ b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c
@@ -1,6638 +1,6637 @@
 /*******************************************************************************
 **
 *Copyright (c) 2014 PMC-Sierra, Inc.  All rights reserved. 
  *
 *Redistribution and use in source and binary forms, with or without modification, are permitted provided 
 *that the following conditions are met: 
 *1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 
 *2. Redistributions in binary form must reproduce the above copyright notice, 
 *this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 
 *
 *THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 *
 *INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
 *ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
 *SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
 *OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 *WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 *THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
 **
 *******************************************************************************/
 
 #include <sys/cdefs.h>
 #include <dev/pms/config.h>
 
 #define MAJOR_REVISION	    1
 #define MINOR_REVISION	    3
 #define BUILD_REVISION	    10800
 
 #include <sys/param.h>      // defines used in kernel.h
 #include <sys/ioccom.h>
 #include <sys/module.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>     // types used in module initialization
 #include <sys/conf.h>       // cdevsw struct
 #include <sys/uio.h>        // uio struct
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>        // structs, prototypes for pci bus stuff
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <machine/resource.h>
 #include <vm/vm.h>          // 1. for vtophys
 #include <vm/pmap.h>        // 2. for vtophys
 #include <dev/pci/pcivar.h> // For pci_get macros
 #include <dev/pci/pcireg.h>
 #include <sys/endian.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sema.h>
 #include <sys/queue.h>
 #include <sys/taskqueue.h>
 #include <machine/atomic.h>
 #include <sys/libkern.h>
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
 #include <cam/cam_debug.h>
 #include <cam/cam_periph.h> //
 #include <cam/cam_sim.h>
 #include <cam/cam_xpt_sim.h>
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <dev/pms/RefTisa/tisa/api/tiapi.h>
 #include <dev/pms/freebsd/driver/ini/src/agtiapi.h>
 #include <dev/pms/freebsd/driver/ini/src/agtiproto.h>
 #include <dev/pms/RefTisa/tisa/api/ostiapi.h>
 #include <dev/pms/RefTisa/tisa/sassata/common/tdsatypes.h>
 #include <dev/pms/freebsd/driver/common/lxencrypt.h> 
 
 MALLOC_DEFINE( M_PMC_MCCB, "CCB List", "CCB List for PMCS driver" );
 
 MALLOC_DEFINE( M_PMC_MSTL, "STLock malloc",
                "allocated in agtiapi_attach as memory for lock use" );
 MALLOC_DEFINE( M_PMC_MDVT, "ag_device_t malloc",
                "allocated in agtiapi_attach as mem for ag_device_t pDevList" );
 MALLOC_DEFINE( M_PMC_MPRT, "ag_portal_data_t malloc",
                "allocated in agtiapi_attach as mem for *pPortalData" );
 MALLOC_DEFINE( M_PMC_MDEV, "tiDeviceHandle_t * malloc",
                "allocated in agtiapi_GetDevHandle as local mem for **agDev" );
 MALLOC_DEFINE( M_PMC_MFLG, "lDevFlags * malloc",
                "allocated in agtiapi_GetDevHandle as local mem for * flags" );
 #ifdef LINUX_PERBI_SUPPORT
 MALLOC_DEFINE( M_PMC_MSLR, "ag_slr_map_t malloc",
                "mem allocated in agtiapi_attach for pSLRList" );
 MALLOC_DEFINE( M_PMC_MTGT, "ag_tgt_map_t malloc",
                "mem allocated in agtiapi_attach for pWWNList" );
 #endif
 MALLOC_DEFINE(TEMP,"tempbuff","buffer for payload");
 MALLOC_DEFINE(TEMP2, "tempbuff", "buffer for agtiapi_getdevlist");
 STATIC U32  agtiapi_intx_mode    = 0;
 STATIC U08  ag_Perbi             = 0;
 STATIC U32  agtiapi_polling_mode = 0;
 STATIC U32  ag_card_good         = 0;   // * total card initialized
 STATIC U32  ag_option_flag       = 0;   // * adjustable parameter flag
 STATIC U32  agtiapi_1st_time     = 1;
 STATIC U32  ag_timeout_secs      = 10;  //Made timeout equivalent to linux
 
 U32         gTiDebugLevel        = 1;
 S32	        ag_encryption_enable = 0;
 atomic_t    outstanding_encrypted_io_count;
 
 #define cache_line_size() CACHE_LINE_SIZE
 
 #define PMCoffsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 
 #define CPU_TO_LE32(dst, src)                  \
     dst.lower = htole32(LOW_32_BITS(src)); \
     dst.upper = htole32(HIGH_32_BITS(src))
 
 #define CMND_TO_CHANNEL( ccb )     ( ccb->ccb_h.path_id )
 #define CMND_TO_TARGET(  ccb )     ( ccb->ccb_h.target_id )
 #define CMND_TO_LUN(     ccb )     ( ccb->ccb_h.target_lun )
 
 STATIC U08 agtiapi_AddrModes[AGTIAPI_MAX_CHANNEL_NUM + 1] = 
       { AGTIAPI_PERIPHERAL };
 
 #ifdef LINUX_PERBI_SUPPORT
 // Holding area for target-WWN mapping assignments on the boot line
 static ag_mapping_t *agMappingList = NULL;  // modified by agtiapi_Setup()
 #endif
 
 // * For Debugging Purpose 
 #ifdef AGTIAPI_DEBUG
 #define AGTIAPI_WWN(name, len)   wwnprintk(name, len)
 #else
 #define AGTIAPI_WWN(name, len)
 #endif
 
 
 #define AGTIAPI_WWNPRINTK(name, len, format, a...)     \
           AGTIAPI_PRINTK(format "name ", a);           \
           AGTIAPI_WWN((unsigned char*)name, len);
 
 #define AGTIAPI_ERR_WWNPRINTK(name, len, format, a...) \
           printk(KERN_DEBUG format "name ", ## a);     \
           wwnprintk((unsigned char*)name, len);
 #define AGTIAPI_CPY_DEV_INFO(root, dev, pDev)            \
           tiINIGetDeviceInfo(root, dev, &pDev->devInfo); \
           wwncpy(pDev);
 
 #ifdef AGTIAPI_LOCAL_LOCK
 
 #define AG_CARD_LOCAL_LOCK(lock)     ,(lock)
 #define AG_SPIN_LOCK_IRQ(lock, flags)
 #define AG_SPIN_UNLOCK_IRQ(lock, flags)
 #define AG_SPIN_LOCK(lock)
 #define AG_SPIN_UNLOCK(lock)
 #define AG_GLOBAL_ARG(arg)
 #define AG_PERF_SPINLOCK(lock)
 #define AG_PERF_SPINLOCK_IRQ(lock, flags)
 
 
 #define AG_LOCAL_LOCK(lock)     if (lock) \
                                          mtx_lock(lock)
 #define AG_LOCAL_UNLOCK(lock)   if (lock) \
                                          mtx_unlock(lock)
 #define AG_LOCAL_FLAGS(_flags)         unsigned long _flags = 0
 #endif
 
 
 #define AG_GET_DONE_PCCB(pccb, pmcsc)            \
   {                                              \
     AG_LOCAL_LOCK(&pmcsc->doneLock);             \
     pccb = pmcsc->ccbDoneHead;                   \
     if (pccb != NULL)                            \
     {                                            \
       pmcsc->ccbDoneHead = NULL;                 \
       pmcsc->ccbDoneTail = NULL;                 \
       AG_LOCAL_UNLOCK(&pmcsc->doneLock);         \
       agtiapi_Done(pmcsc, pccb);                 \
     }                                            \
     else                                         \
       AG_LOCAL_UNLOCK(&pmcsc->doneLock);         \
   }
 
 #define AG_GET_DONE_SMP_PCCB(pccb, pmcsc)	\
   {                                              \
     AG_LOCAL_LOCK(&pmcsc->doneSMPLock);          \
     pccb = pmcsc->smpDoneHead;                   \
     if (pccb != NULL)                            \
     {                                            \
       pmcsc->smpDoneHead = NULL;                 \
       pmcsc->smpDoneTail = NULL;                 \
       AG_LOCAL_UNLOCK(&pmcsc->doneSMPLock);      \
       agtiapi_SMPDone(pmcsc, pccb);              \
     }                                            \
     else                                         \
       AG_LOCAL_UNLOCK(&pmcsc->doneSMPLock);      \
   }
 
 #ifdef AGTIAPI_DUMP_IO_DEBUG
 #define AG_IO_DUMPCCB(pccb)    agtiapi_DumpCCB(pccb)
 #else
 #define AG_IO_DUMPCCB(pccb)
 #endif
 
 #define SCHED_DELAY_JIFFIES 4 /* in seconds */
 
 #ifdef HOTPLUG_SUPPORT
 #define AG_HOTPLUG_LOCK_INIT(lock)   mxt_init(lock)
 #define AG_LIST_LOCK(lock)           mtx_lock(lock)
 #define AG_LIST_UNLOCK(lock)         mtx_unlock(lock)
 #else
 #define AG_HOTPLUG_LOCK_INIT(lock)
 #define AG_LIST_LOCK(lock)
 #define AG_LIST_UNLOCK(lock)
 #endif
 
 STATIC void agtiapi_CheckIOTimeout(void *data);
 
 
 
 static ag_card_info_t agCardInfoList[ AGTIAPI_MAX_CARDS ]; // card info list
 static void agtiapi_cam_action( struct cam_sim *, union ccb * );
 static void agtiapi_cam_poll( struct cam_sim * );
 
 // Function prototypes
 static d_open_t  agtiapi_open;
 static d_close_t agtiapi_close;
 static d_read_t  agtiapi_read;
 static d_write_t agtiapi_write;
 static d_ioctl_t agtiapi_CharIoctl;
 static void agtiapi_async(void *callback_arg, u_int32_t code,
               struct cam_path *path, void *arg);
 void agtiapi_adjust_queue_depth(struct cam_path *path, bit32 QueueDepth);
 
 // Character device entry points
 static struct cdevsw agtiapi_cdevsw = {
   .d_version = D_VERSION,
   .d_open    = agtiapi_open,
   .d_close   = agtiapi_close,
   .d_read    = agtiapi_read,
   .d_write   = agtiapi_write,
   .d_ioctl   = agtiapi_CharIoctl,
   .d_name    = "pmspcv",
 };
 
 U32 maxTargets = 0;
 U32 ag_portal_count = 0;
 
 // In the cdevsw routines, we find our softc by using the si_drv1 member
 // of struct cdev. We set this variable to point to our softc in our
 // attach routine when we create the /dev entry.
 
 int agtiapi_open( struct cdev *dev, int oflags, int devtype, struct thread *td )
 {
   struct agtiapi_softc *sc;
   /* Look up our softc. */
   sc = dev->si_drv1;
   AGTIAPI_PRINTK("agtiapi_open\n");
   AGTIAPI_PRINTK("Opened successfully. sc->my_dev %p\n", sc->my_dev);
   return( 0 );
 }
 
 int agtiapi_close( struct cdev *dev, int fflag, int devtype, struct thread *td )
 {
   struct agtiapi_softc *sc;
   // Look up our softc
   sc = dev->si_drv1;
   AGTIAPI_PRINTK("agtiapi_close\n");
   AGTIAPI_PRINTK("Closed. sc->my_dev %p\n", sc->my_dev);
   return( 0 );
 }
 
 int agtiapi_read( struct cdev *dev, struct uio *uio, int ioflag )
 {
   struct agtiapi_softc *sc;
   // Look up our softc
   sc = dev->si_drv1;
   AGTIAPI_PRINTK( "agtiapi_read\n" );
   AGTIAPI_PRINTK( "Asked to read %lu bytes. sc->my_dev %p\n",
                   uio->uio_resid, sc->my_dev );
   return( 0 );
 }
 
 int agtiapi_write( struct cdev *dev, struct uio *uio, int ioflag )
 {
   struct agtiapi_softc *sc;
   // Look up our softc
   sc = dev->si_drv1;
   AGTIAPI_PRINTK( "agtiapi_write\n" );
   AGTIAPI_PRINTK( "Asked to write %lu bytes. sc->my_dev %p\n",
                   uio->uio_resid, sc->my_dev );
   return( 0 );
 }
 
 int agtiapi_getdevlist( struct agtiapi_softc *pCard,
                         tiIOCTLPayload_t *agIOCTLPayload )
 {
   tdDeviceListPayload_t *pIoctlPayload =
     (tdDeviceListPayload_t *) agIOCTLPayload->FunctionSpecificArea;
   tdDeviceInfoIOCTL_t *pDeviceInfo = NULL;
   bit8		   *pDeviceInfoOrg;
   tdsaDeviceData_t *pDeviceData = NULL;
   tiDeviceHandle_t **devList = NULL;
   tiDeviceHandle_t **devHandleArray = NULL;
   tiDeviceHandle_t *pDeviceHandle = NULL;
   bit32 x, memNeeded1;
   bit32 count, total;
   bit32 MaxDeviceCount;
   bit32 ret_val=IOCTL_CALL_INVALID_CODE;
   ag_portal_data_t *pPortalData;
   bit8 *pDeviceHandleList = NULL;
   AGTIAPI_PRINTK( "agtiapi_getdevlist: Enter\n" );
   
   pDeviceInfoOrg = pIoctlPayload -> pDeviceInfo;
   MaxDeviceCount = pCard->devDiscover;
   if (MaxDeviceCount > pIoctlPayload->deviceLength )
   {   
     AGTIAPI_PRINTK( "agtiapi_getdevlist: MaxDeviceCount: %d > Requested device length: %d\n", MaxDeviceCount, pIoctlPayload->deviceLength );
     MaxDeviceCount = pIoctlPayload->deviceLength;
     ret_val = IOCTL_CALL_FAIL;
   }
   AGTIAPI_PRINTK( "agtiapi_getdevlist: MaxDeviceCount: %d > Requested device length: %d\n", MaxDeviceCount, pIoctlPayload->deviceLength );
   memNeeded1 = AG_ALIGNSIZE( MaxDeviceCount * sizeof(tiDeviceHandle_t *),
                              sizeof(void *) );
   AGTIAPI_PRINTK("agtiapi_getdevlist: portCount %d\n", pCard->portCount);
   devList = malloc(memNeeded1, TEMP2, M_WAITOK); 
   if (devList == NULL)
   {
     AGTIAPI_PRINTK("agtiapi_getdevlist: failed to allocate memory\n");
     ret_val = IOCTL_CALL_FAIL;
     agIOCTLPayload->Status = IOCTL_ERR_STATUS_INTERNAL_ERROR;
     return ret_val;
   }
   osti_memset(devList, 0,  memNeeded1);
   pPortalData = &pCard->pPortalData[0];
   pDeviceHandleList = (bit8*)devList;
   for (total = x = 0; x < pCard->portCount; x++, pPortalData++)
   {
     count = tiINIGetDeviceHandlesForWinIOCTL(&pCard->tiRoot,
                     &pPortalData->portalInfo.tiPortalContext,
 		    ( tiDeviceHandle_t **)pDeviceHandleList ,MaxDeviceCount );
     if (count == DISCOVERY_IN_PROGRESS)
     {
       AGTIAPI_PRINTK( "agtiapi_getdevlist: DISCOVERY_IN_PROGRESS on "
                       "portal %d\n", x );
       free(devList, TEMP2);
       ret_val = IOCTL_CALL_FAIL;
       agIOCTLPayload->Status = IOCTL_ERR_STATUS_INTERNAL_ERROR;
       return ret_val;
     }
     total += count;
     pDeviceHandleList+= count*sizeof(tiDeviceHandle_t *);
     MaxDeviceCount-= count;
   }
   if (total > pIoctlPayload->deviceLength)
   {
     total = pIoctlPayload->deviceLength;
   }
   // dump device information from device handle list
   count = 0;
   
   devHandleArray = devList;
   for (x = 0; x < pCard->devDiscover; x++)
   {
      pDeviceHandle = (tiDeviceHandle_t*)devHandleArray[x];
     if (devList[x] != agNULL)
     {
       pDeviceData = devList [x]->tdData;
     
 	pDeviceInfo = (tdDeviceInfoIOCTL_t*)(pDeviceInfoOrg + sizeof(tdDeviceInfoIOCTL_t) * count);
       if (pDeviceData != agNULL && pDeviceInfo != agNULL)
       {
         osti_memcpy( &pDeviceInfo->sasAddressHi,
                      pDeviceData->agDeviceInfo.sasAddressHi,
                      sizeof(bit32) );
         osti_memcpy( &pDeviceInfo->sasAddressLo,
                      pDeviceData->agDeviceInfo.sasAddressLo,
                      sizeof(bit32) );
 #if 0
         pDeviceInfo->sasAddressHi =
           DMA_BEBIT32_TO_BIT32( pDeviceInfo->sasAddressHi );
         pDeviceInfo->sasAddressLo =
           DMA_BEBIT32_TO_BIT32( pDeviceInfo->sasAddressLo );
 #endif
 
         pDeviceInfo->deviceType =
           ( pDeviceData->agDeviceInfo.devType_S_Rate & 0x30 ) >> 4;
         pDeviceInfo->linkRate   =
           pDeviceData->agDeviceInfo.devType_S_Rate & 0x0F;
         pDeviceInfo->phyId      =  pDeviceData->phyID;
  	pDeviceInfo->ishost	=  pDeviceData->target_ssp_stp_smp;
 	pDeviceInfo->DeviceHandle= (unsigned long)pDeviceHandle;
 	if(pDeviceInfo->deviceType == 0x02)
 	{
 	   bit8 *sasAddressHi;
 	   bit8 *sasAddressLo;
 	   tiIniGetDirectSataSasAddr(&pCard->tiRoot, pDeviceData->phyID, &sasAddressHi, &sasAddressLo);
 	   pDeviceInfo->sasAddressHi = DMA_BEBIT32_TO_BIT32(*(bit32*)sasAddressHi);
 	   pDeviceInfo->sasAddressLo = DMA_BEBIT32_TO_BIT32(*(bit32*)sasAddressLo) + pDeviceData->phyID + 16;
 	}
 	else
 	{
         pDeviceInfo->sasAddressHi =
           DMA_BEBIT32_TO_BIT32( pDeviceInfo->sasAddressHi );
         pDeviceInfo->sasAddressLo =
           DMA_BEBIT32_TO_BIT32( pDeviceInfo->sasAddressLo );
  	}
 
         AGTIAPI_PRINTK( "agtiapi_getdevlist: devicetype %x\n",
                         pDeviceInfo->deviceType );
         AGTIAPI_PRINTK( "agtiapi_getdevlist: linkrate %x\n",
                         pDeviceInfo->linkRate );
         AGTIAPI_PRINTK( "agtiapi_getdevlist: phyID %x\n",
                         pDeviceInfo->phyId );
         AGTIAPI_PRINTK( "agtiapi_getdevlist: addresshi %x\n",
                         pDeviceInfo->sasAddressHi );
         AGTIAPI_PRINTK( "agtiapi_getdevlist: addresslo %x\n",
                         pDeviceInfo->sasAddressHi );
       }
       else
       {
         AGTIAPI_PRINTK( "agtiapi_getdevlist: pDeviceData %p or pDeviceInfo "
                         "%p is NULL %d\n", pDeviceData, pDeviceInfo, x );
       }
       count++;
     }
   }
   pIoctlPayload->realDeviceCount = count;
   AGTIAPI_PRINTK( "agtiapi_getdevlist: Exit RealDeviceCount = %d\n", count );
   if (devList)
   {
     free(devList, TEMP2);
   }
   if(ret_val != IOCTL_CALL_FAIL)
   {
     ret_val = IOCTL_CALL_SUCCESS;
   }
   agIOCTLPayload->Status = IOCTL_ERR_STATUS_OK;
   return  ret_val;
 }
 
 /******************************************************************************
 agtiapi_getCardInfo()
 
 Purpose:
   This function retrives the Card information
 Parameters: 
   
 Return:
   A number - error  
   0        - HBA has been detected
 Note:    
 ******************************************************************************/
 int agtiapi_getCardInfo ( struct agtiapi_softc *pCard,
                           U32_64                size,
                           void                 *buffer )
 {
   CardInfo_t       *pCardInfo;
 
   pCardInfo = (CardInfo_t *)buffer;
 
   pCardInfo->deviceId = pci_get_device(pCard->my_dev);
   pCardInfo->vendorId =pci_get_vendor(pCard->my_dev) ;
   memcpy( pCardInfo->pciMemBaseSpc,
           pCard->pCardInfo->pciMemBaseSpc,
           ((sizeof(U32_64))*PCI_NUMBER_BARS) );
   pCardInfo->deviceNum = pci_get_slot(pCard->my_dev);
   pCardInfo->pciMemBase = pCard->pCardInfo->pciMemBase;
   pCardInfo->pciIOAddrLow = pCard->pCardInfo->pciIOAddrLow;
   pCardInfo->pciIOAddrUp = pCard->pCardInfo->pciIOAddrUp;
   pCardInfo->busNum =pci_get_bus(pCard->my_dev);
   return 0;
 }
 
 void agtiapi_adjust_queue_depth(struct cam_path *path, bit32 QueueDepth)
 {
   struct ccb_relsim crs;
   memset(&crs, 0, sizeof(crs));
   xpt_setup_ccb(&crs.ccb_h, path, 5);
   crs.ccb_h.func_code = XPT_REL_SIMQ;
   crs.ccb_h.flags = CAM_DEV_QFREEZE;
   crs.release_flags = RELSIM_ADJUST_OPENINGS;
   crs.openings = QueueDepth;
   xpt_action((union ccb *)&crs);
   if(crs.ccb_h.status != CAM_REQ_CMP) {
                  printf("XPT_REL_SIMQ failed\n");
   }
 }
 static void
 agtiapi_async(void *callback_arg, u_int32_t code,
 	       struct cam_path *path, void *arg)
 {
 	struct agtiapi_softc *pmsc;
 	U32        TID;
 	ag_device_t *targ;	
 	pmsc = (struct agtiapi_softc*)callback_arg;
 	switch (code) {
 	case AC_FOUND_DEVICE:
 	{
 	    struct ccb_getdev *cgd;
 	    cgd = (struct ccb_getdev *)arg;
 	    if (cgd == NULL) {
 		break;
 	    }
 	    TID = cgd->ccb_h.target_id;
 	    if (TID >= 0 && TID < maxTargets){
                 if (pmsc != NULL){
                     TID = INDEX(pmsc, TID);
                     targ   = &pmsc->pDevList[TID];
 	            agtiapi_adjust_queue_depth(path, targ->qdepth);
                 }
 	    }
 	    break;
         }
 	default:
 		break;
 	}
 }
 /******************************************************************************
 agtiapi_CharIoctl()
 
 Purpose:
   This function handles the ioctl from application layer
 Parameters: 
  
 Return:
   A number - error  
   0        - HBA has been detected
 Note:    
 ******************************************************************************/
 static int agtiapi_CharIoctl( struct cdev   *dev,
                               u_long         cmd,
                               caddr_t        data,
                               int            fflag,
                               struct thread *td )
 {
   struct sema           mx;
   datatosend           *load; // structure defined in lxcommon.h
   tiIOCTLPayload_t     *pIoctlPayload;
   struct agtiapi_softc *pCard;
   pCard=dev->si_drv1;
   U32   status = 0;
   U32   retValue;
   int   err    = 0;
   int   error  = 0;
   tdDeviceListPayload_t *pDeviceList = NULL;
   unsigned long flags;
 
   switch (cmd)
   {
   case AGTIAPI_IOCTL:
     load=(datatosend*)data;
     pIoctlPayload = malloc(load->datasize,TEMP,M_WAITOK);
     AGTIAPI_PRINTK( "agtiapi_CharIoctl: old load->datasize = %d\n", load->datasize );
     //Copy payload to kernel buffer, on success it returns 0
     err = copyin(load->data,pIoctlPayload,load->datasize);
     if (err)
     {
       status = IOCTL_CALL_FAIL;
       return status;
     }
     sema_init(&mx,0,"sem");
     pCard->pIoctlSem  =&mx; 
     pCard->up_count = pCard->down_count = 0;
     if ( pIoctlPayload->MajorFunction == IOCTL_MJ_GET_DEVICE_LIST )
     {
       retValue = agtiapi_getdevlist(pCard, pIoctlPayload);
       if (retValue == 0)
       {
         pIoctlPayload->Status = IOCTL_CALL_SUCCESS;
         status = IOCTL_CALL_SUCCESS;
       }
       else
       {
         pIoctlPayload->Status = IOCTL_CALL_FAIL;
         status = IOCTL_CALL_FAIL;
       }
       //update new device length
       pDeviceList = (tdDeviceListPayload_t*)pIoctlPayload->FunctionSpecificArea;
       load->datasize =load->datasize - sizeof(tdDeviceInfoIOCTL_t) * (pDeviceList->deviceLength - pDeviceList->realDeviceCount);
       AGTIAPI_PRINTK( "agtiapi_CharIoctl: new load->datasize = %d\n", load->datasize );
 
     }
     else if (pIoctlPayload->MajorFunction == IOCTL_MN_GET_CARD_INFO)
     {
       retValue = agtiapi_getCardInfo( pCard,
                                       pIoctlPayload->Length,
                                       (pIoctlPayload->FunctionSpecificArea) );
       if (retValue == 0)
       {
         pIoctlPayload->Status = IOCTL_CALL_SUCCESS;
         status = IOCTL_CALL_SUCCESS;
       }
       else
       {
         pIoctlPayload->Status = IOCTL_CALL_FAIL;
         status = IOCTL_CALL_FAIL;
       }
     }
     else if ( pIoctlPayload->MajorFunction == IOCTL_MJ_CHECK_DPMC_EVENT )
     {
       if ( pCard->flags & AGTIAPI_PORT_PANIC )
       {
         strcpy ( pIoctlPayload->FunctionSpecificArea, "DPMC LEAN\n" );
       }
       else
       {
         strcpy ( pIoctlPayload->FunctionSpecificArea, "do not dpmc lean\n" );
       }
       pIoctlPayload->Status = IOCTL_CALL_SUCCESS;
       status = IOCTL_CALL_SUCCESS;
     }
     else if (pIoctlPayload->MajorFunction == IOCTL_MJ_CHECK_FATAL_ERROR )
     {
       AGTIAPI_PRINTK("agtiapi_CharIoctl: IOCTL_MJ_CHECK_FATAL_ERROR call received for card %d\n", pCard->cardNo);
       //read port status to see if there is a fatal event
       if(pCard->flags & AGTIAPI_PORT_PANIC)
       {
         printf("agtiapi_CharIoctl: Port Panic Status For Card %d is True\n",pCard->cardNo);
         pIoctlPayload->Status = IOCTL_MJ_FATAL_ERR_CHK_SEND_TRUE;
       }
       else
       {
         AGTIAPI_PRINTK("agtiapi_CharIoctl: Port Panic Status For Card %d is False\n",pCard->cardNo);
         pIoctlPayload->Status = IOCTL_MJ_FATAL_ERR_CHK_SEND_FALSE;
       }
       status = IOCTL_CALL_SUCCESS;
     }
     else if (pIoctlPayload->MajorFunction == IOCTL_MJ_FATAL_ERROR_DUMP_COMPLETE)
     {
       AGTIAPI_PRINTK("agtiapi_CharIoctl: IOCTL_MJ_FATAL_ERROR_DUMP_COMPLETE call received for card %d\n", pCard->cardNo);
       //set flags bit status to be a soft reset
       pCard->flags |= AGTIAPI_SOFT_RESET;
       //trigger soft reset for the card
       retValue = agtiapi_ResetCard (pCard, &flags);
     
       if(retValue == AGTIAPI_SUCCESS)
       {
         //clear port panic status
         pCard->flags &= ~AGTIAPI_PORT_PANIC;
         pIoctlPayload->Status = IOCTL_MJ_FATAL_ERROR_SOFT_RESET_TRIG;
         status = IOCTL_CALL_SUCCESS;
       }
       else
       {
         pIoctlPayload->Status = IOCTL_CALL_FAIL;
         status = IOCTL_CALL_FAIL;
       }
     }
     else
     {
       status = tiCOMMgntIOCTL( &pCard->tiRoot,
                                pIoctlPayload,
                                pCard,
                                NULL,
                                NULL );
       if (status == IOCTL_CALL_PENDING)
       {
         ostiIOCTLWaitForSignal(&pCard->tiRoot,NULL, NULL, NULL);
         status = IOCTL_CALL_SUCCESS;  
       }
     }
     pCard->pIoctlSem = NULL;
     err = 0;
 
     //copy kernel buffer to userland buffer
     err=copyout(pIoctlPayload,load->data,load->datasize);
     if (err)
     {
       status = IOCTL_CALL_FAIL;
       return status;
     }
     free(pIoctlPayload,TEMP);
     pIoctlPayload=NULL;
     break;
   default:
     error = ENOTTY;
     break;
   }
   return(status);
 }
 
 /******************************************************************************
 agtiapi_probe()
 
 Purpose:
   This function initialize and registere all detected HBAs.
   The first function being called in driver after agtiapi_probe()
 Parameters: 
   device_t dev (IN)  - device pointer
 Return:
   A number - error  
   0        - HBA has been detected
 Note:    
 ******************************************************************************/
 static int agtiapi_probe( device_t dev )
 {
   int retVal;
   int thisCard;
   ag_card_info_t *thisCardInst;
 
   thisCard = device_get_unit( dev );
   if ( thisCard >= AGTIAPI_MAX_CARDS ) 
   {
     device_printf( dev, "Too many PMC-Sierra cards detected ERROR!\n" );
     return (ENXIO); // maybe change to different return value?
   }
   thisCardInst = &agCardInfoList[ thisCard ];
   retVal = agtiapi_ProbeCard( dev, thisCardInst, thisCard );
   if ( retVal )
     return (ENXIO); // maybe change to different return value?
   return( BUS_PROBE_DEFAULT );  // successful probe
 }
 
 
 /******************************************************************************
 agtiapi_attach()
 
 Purpose:
   This function initialize and registere all detected HBAs.
   The first function being called in driver after agtiapi_probe()
 Parameters: 
   device_t dev (IN)  - device pointer
 Return:
   A number - error  
   0        - HBA has been detected
 Note:    
 ******************************************************************************/
 static int agtiapi_attach( device_t devx )
 {
   // keeping get_unit call to once
   int                   thisCard = device_get_unit( devx );
   struct agtiapi_softc *pmsc;
   ag_card_info_t       *thisCardInst = &agCardInfoList[ thisCard ];
   ag_resource_info_t   *pRscInfo;
   int                   idx;
   int			        lenRecv;
   char			        buffer [256], *pLastUsedChar;
   union ccb *ccb;
   int bus, tid, lun;
   struct ccb_setasync csa;
 
   AGTIAPI_PRINTK("agtiapi_attach: start dev %p thisCard %d\n", devx, thisCard);
   // AGTIAPI_PRINTK( "agtiapi_attach: entry pointer values  A %p / %p\n",
   //        thisCardInst->pPCIDev, thisCardInst );
   AGTIAPI_PRINTK( "agtiapi_attach: deviceID: 0x%x\n", pci_get_devid( devx ) );
 
   TUNABLE_INT_FETCH( "DPMC_TIMEOUT_SECS",  &ag_timeout_secs );
   TUNABLE_INT_FETCH( "DPMC_TIDEBUG_LEVEL", &gTiDebugLevel   );
   // printf( "agtiapi_attach: debugLevel %d, timeout %d\n",
   //         gTiDebugLevel, ag_timeout_secs );
   if ( ag_timeout_secs < 1 )
   {
     ag_timeout_secs = 1; // set minimum timeout value of 1 second
   }
   ag_timeout_secs = (ag_timeout_secs * 1000); // convert to millisecond notation
 
   // Look up our softc and initialize its fields.
   pmsc = device_get_softc( devx );
   pmsc->my_dev = devx;
 
   /* Get NumberOfPortals */ 
   if ((ostiGetTransportParam(
                              &pmsc->tiRoot, 
                              "Global",
                              "CardDefault",
                              agNULL,
                              agNULL,
                              agNULL, 
                              agNULL, 
                              "NumberOfPortals",
                              buffer, 
                              255, 
                              &lenRecv
                              ) == tiSuccess) && (lenRecv != 0))
   {
     if (osti_strncmp(buffer, "0x", 2) == 0)
     { 
       ag_portal_count = osti_strtoul (buffer, &pLastUsedChar, 0);
     }
     else
     {
       ag_portal_count = osti_strtoul (buffer, &pLastUsedChar, 10);
     }
     if (ag_portal_count > AGTIAPI_MAX_PORTALS)
       ag_portal_count = AGTIAPI_MAX_PORTALS;
   }
   else
   {
     ag_portal_count = AGTIAPI_MAX_PORTALS;
   }
   AGTIAPI_PRINTK( "agtiapi_attach: ag_portal_count=%d\n", ag_portal_count );
   // initialize hostdata structure
   pmsc->flags    |= AGTIAPI_INIT_TIME | AGTIAPI_SCSI_REGISTERED |
       AGTIAPI_INITIATOR;
   pmsc->cardNo    = thisCard;  
   pmsc->ccbTotal  = 0;
   pmsc->portCount = ag_portal_count;
   pmsc->pCardInfo = thisCardInst;
   pmsc->tiRoot.osData = pmsc;
   pmsc->pCardInfo->pCard  = (void *)pmsc;
   pmsc->VidDid    = ( pci_get_vendor(devx) << 16 ) | pci_get_device( devx );
   pmsc->SimQFrozen = agFALSE;
   pmsc->devq_flag  = agFALSE;
   pRscInfo = &thisCardInst->tiRscInfo;
 
   osti_memset(buffer, 0, 256); 
   lenRecv = 0;
 
   /* Get MaxTargets */ 
   if ((ostiGetTransportParam(
                              &pmsc->tiRoot, 
                              "Global",
                              "InitiatorParms",
                              agNULL,
                              agNULL,
                              agNULL, 
                              agNULL, 
                              "MaxTargets",
                              buffer, 
                              sizeof(buffer), 
                              &lenRecv
                              ) == tiSuccess) && (lenRecv != 0))
   {
     if (osti_strncmp(buffer, "0x", 2) == 0)
     { 
       maxTargets = osti_strtoul (buffer, &pLastUsedChar, 0);
       AGTIAPI_PRINTK( "agtiapi_attach:  maxTargets = osti_strtoul  0 \n" );
     }
     else
     {
       maxTargets = osti_strtoul (buffer, &pLastUsedChar, 10);
       AGTIAPI_PRINTK( "agtiapi_attach:  maxTargets = osti_strtoul 10\n"   );
     }
   }
   else
 
   {
     if(Is_ADP8H(pmsc))
        maxTargets = AGTIAPI_MAX_DEVICE_8H;
     else if(Is_ADP7H(pmsc))
        maxTargets = AGTIAPI_MAX_DEVICE_7H;
     else
        maxTargets = AGTIAPI_MAX_DEVICE;
   }
 
   if (maxTargets > AGTIAPI_HW_LIMIT_DEVICE)
   {
     AGTIAPI_PRINTK( "agtiapi_attach: maxTargets: %d > AGTIAPI_HW_LIMIT_DEVICE: %d\n",  maxTargets, AGTIAPI_HW_LIMIT_DEVICE );
     AGTIAPI_PRINTK( "agtiapi_attach: change maxTargets = AGTIAPI_HW_LIMIT_DEVICE\n" );
     maxTargets = AGTIAPI_HW_LIMIT_DEVICE;
   }
   pmsc->devDiscover    = maxTargets ; 
 
  #ifdef HIALEAH_ENCRYPTION
    ag_encryption_enable   =  1;
    if(ag_encryption_enable && pci_get_device(pmsc->pCardInfo->pPCIDev) == 
                                   PCI_DEVICE_ID_HIALEAH_HBA_SPCVE)
    {
 	pmsc->encrypt = 1;
 	pRscInfo->tiLoLevelResource.loLevelOption.encryption = agTRUE;
 	printf("agtiapi_attach: Encryption Enabled\n" );
    }
 #endif
   // ## for now, skip calls to ostiGetTransportParam(...)
   // ## for now, skip references to DIF & EDC
 
   // Create a /dev entry for this device. The kernel will assign us
   // a major number automatically. We use the unit number of this
   // device as the minor number and name the character device
   // "agtiapi<unit>".
   pmsc->my_cdev = make_dev( &agtiapi_cdevsw, thisCard, UID_ROOT, GID_WHEEL,
 			    0600, "spcv%u", thisCard );
   pmsc->my_cdev->si_drv1 = pmsc;
 
   mtx_init( &thisCardInst->pmIOLock, "pmc SAS I/O lock",
 	    NULL, MTX_DEF|MTX_RECURSE );
 
   struct cam_devq *devq;  
 
   /* set the maximum number of pending IOs */
   devq = cam_simq_alloc( AGTIAPI_MAX_CAM_Q_DEPTH );
   if (devq == NULL)
   {
     AGTIAPI_PRINTK("agtiapi_attach: cam_simq_alloc is NULL\n" );
     return( EIO );
   }
 
   struct cam_sim *lsim;
   lsim = cam_sim_alloc( agtiapi_cam_action,
                         agtiapi_cam_poll,
                         "pmspcbsd",
                         pmsc,
                         thisCard,
                         &thisCardInst->pmIOLock,
                         1,                       // queued per target
                         AGTIAPI_MAX_CAM_Q_DEPTH, // max tag depth
                         devq );
   if ( lsim == NULL ) {
     cam_simq_free( devq );
     AGTIAPI_PRINTK("agtiapi_attach: cam_sim_alloc is NULL\n" );
     return( EIO );
   }
 
   pmsc->dev_scan = agFALSE;
   //one cam sim per scsi bus
   mtx_lock( &thisCardInst->pmIOLock );
   if ( xpt_bus_register( lsim, devx, 0 ) != CAM_SUCCESS ) 
   { // bus 0
     cam_sim_free( lsim, TRUE );
     mtx_unlock( &thisCardInst->pmIOLock );
     AGTIAPI_PRINTK("agtiapi_attach: xpt_bus_register fails\n" );
     return( EIO );
   }
 
   pmsc->sim  = lsim;
   bus = cam_sim_path(pmsc->sim);
   tid = CAM_TARGET_WILDCARD;
   lun = CAM_LUN_WILDCARD;
   ccb = xpt_alloc_ccb_nowait();
   if (ccb == agNULL)
   {
 	mtx_unlock( &thisCardInst->pmIOLock );
     cam_sim_free( lsim, TRUE );
     cam_simq_free( devq );
     return ( EIO );
   }
   if (xpt_create_path(&ccb->ccb_h.path, agNULL, bus, tid,
 		      CAM_LUN_WILDCARD) != CAM_REQ_CMP) 
   { 
 	mtx_unlock( &thisCardInst->pmIOLock );
 	cam_sim_free( lsim, TRUE );
     cam_simq_free( devq );
     xpt_free_ccb(ccb);
     return( EIO );
   }
   pmsc->path = ccb->ccb_h.path;
   memset(&csa, 0, sizeof(csa));
   xpt_setup_ccb(&csa.ccb_h, pmsc->path, 5);
   csa.ccb_h.func_code = XPT_SASYNC_CB;
   csa.event_enable = AC_FOUND_DEVICE;
   csa.callback = agtiapi_async;
   csa.callback_arg = pmsc;
   xpt_action((union ccb *)&csa);
   if (csa.ccb_h.status != CAM_REQ_CMP) {
 	  AGTIAPI_PRINTK("agtiapi_attach: Unable to register AC_FOUND_DEVICE\n" );
   }
   lsim->devq = devq;
   mtx_unlock( &thisCardInst->pmIOLock );
 
 
 
   
   // get TD and lower layer memory requirements
   tiCOMGetResource( &pmsc->tiRoot,
                     &pRscInfo->tiLoLevelResource,
                     &pRscInfo->tiInitiatorResource,
                     NULL,
                     &pRscInfo->tiSharedMem );
 
   agtiapi_ScopeDMARes( thisCardInst );
   AGTIAPI_PRINTK( "agtiapi_attach: size from the call agtiapi_ScopeDMARes"
                   " 0x%x \n", pmsc->typhn );
 
   // initialize card information and get resource ready
   if( agtiapi_InitResource( thisCardInst ) == AGTIAPI_FAIL ) {
     AGTIAPI_PRINTK( "agtiapi_attach: Card %d initialize resource ERROR\n",
             thisCard );
   }
 
   // begin: allocate and initialize card portal info resource
   ag_portal_data_t   *pPortalData;
   if (pmsc->portCount == 0)
   {
     pmsc->pPortalData = NULL;
   }
   else 
   {
     pmsc->pPortalData = (ag_portal_data_t *)
                         malloc( sizeof(ag_portal_data_t) * pmsc->portCount,
                                 M_PMC_MPRT, M_ZERO | M_WAITOK );
     if (pmsc->pPortalData == NULL)
     {
       AGTIAPI_PRINTK( "agtiapi_attach: Portal memory allocation ERROR\n" );
     }
   }
 
   pPortalData = pmsc->pPortalData;
   for( idx = 0; idx < pmsc->portCount; idx++ ) {
     pPortalData->pCard = pmsc;
     pPortalData->portalInfo.portID = idx;
     pPortalData->portalInfo.tiPortalContext.osData = (void *)pPortalData;
     pPortalData++;
   }
   // end: allocate and initialize card portal info resource
 
   // begin: enable msix
 
   // setup msix
   // map to interrupt handler
   int error = 0;
   int mesgs = MAX_MSIX_NUM_VECTOR;
   int i, cnt;
 
   void (*intrHandler[MAX_MSIX_NUM_ISR])(void *arg) =
     {
       agtiapi_IntrHandler0,
       agtiapi_IntrHandler1,
       agtiapi_IntrHandler2,
       agtiapi_IntrHandler3,
       agtiapi_IntrHandler4,
       agtiapi_IntrHandler5,
       agtiapi_IntrHandler6,
       agtiapi_IntrHandler7,
       agtiapi_IntrHandler8,
       agtiapi_IntrHandler9,
       agtiapi_IntrHandler10,
       agtiapi_IntrHandler11,
       agtiapi_IntrHandler12,
       agtiapi_IntrHandler13,
       agtiapi_IntrHandler14,
       agtiapi_IntrHandler15
       
     };
 
   cnt = pci_msix_count(devx);
   AGTIAPI_PRINTK("supported MSIX %d\n", cnt); //this should be 64
   mesgs = MIN(mesgs, cnt);
   error = pci_alloc_msix(devx, &mesgs);
   if (error != 0) {
     printf( "pci_alloc_msix error %d\n", error );
     AGTIAPI_PRINTK("error %d\n", error);
     return( EIO );
   }
 
   for(i=0; i < mesgs; i++) {
     pmsc->rscID[i] = i + 1;
     pmsc->irq[i] = bus_alloc_resource_any( devx,
                                            SYS_RES_IRQ,
                                            &pmsc->rscID[i],
                                            RF_ACTIVE );
     if( pmsc->irq[i] == NULL ) {
       printf( "RES_IRQ went terribly bad at %d\n", i );
       return( EIO );
     }
 
     if ( (error = bus_setup_intr( devx, pmsc->irq[i],
                                   INTR_TYPE_CAM | INTR_MPSAFE,
                                   NULL,
                                   intrHandler[i],
                                   pmsc,
                                   &pmsc->intrcookie[i] )
            ) != 0 ) {
       device_printf( devx, "Failed to register handler" );
       return( EIO );
     }
   }
   pmsc->flags |= AGTIAPI_IRQ_REQUESTED;
   pmsc->pCardInfo->maxInterruptVectors = MAX_MSIX_NUM_VECTOR;
   // end: enable msix
   
   int ret = 0;
   ret = agtiapi_InitCardSW(pmsc);
   if (ret == AGTIAPI_FAIL || ret == AGTIAPI_UNKNOWN)
   {
     AGTIAPI_PRINTK( "agtiapi_attach: agtiapi_InitCardSW failure %d\n",
                     ret );
     return( EIO );
   }    
 
   pmsc->ccbFreeList = NULL;
   pmsc->ccbChainList = NULL;
   pmsc->ccbAllocList = NULL;
 
   pmsc->flags |= ( AGTIAPI_INSTALLED );
 
   ret = agtiapi_alloc_requests( pmsc );
   if( ret != 0 ) {
     AGTIAPI_PRINTK( "agtiapi_attach: agtiapi_alloc_requests failure %d\n",
                     ret );
     return( EIO );
   }
 
   ret = agtiapi_alloc_ostimem( pmsc );
   if (ret != AGTIAPI_SUCCESS)
   {
     AGTIAPI_PRINTK( "agtiapi_attach: agtiapi_alloc_ostimem failure %d\n",
                     ret );
     return( EIO );
   }
 
   ret = agtiapi_InitCardHW( pmsc );
   if (ret != 0)
   {
     AGTIAPI_PRINTK( "agtiapi_attach: agtiapi_InitCardHW failure %d\n",
                     ret );
     return( EIO );
   }
 
 #ifdef HIALEAH_ENCRYPTION
   if(pmsc->encrypt)
   {
 	if((agtiapi_SetupEncryption(pmsc)) < 0)
 		AGTIAPI_PRINTK("SetupEncryption returned less than 0\n");
   }
 #endif
 
   pmsc->flags &= ~AGTIAPI_INIT_TIME;
   return( 0 );
 }
 
 /******************************************************************************
 agtiapi_InitCardSW()
 
 Purpose:
   Host Bus Adapter Initialization
 Parameters: 
   struct agtiapi_softc *pmsc (IN)  Pointer to the HBA data structure
 Return:
   AGTIAPI_SUCCESS - success
   AGTIAPI_FAIL    - fail
 Note:    
   TBD, need chip register information
 ******************************************************************************/
 STATIC agBOOLEAN agtiapi_InitCardSW( struct agtiapi_softc *pmsc ) 
 {
   ag_card_info_t *thisCardInst = pmsc->pCardInfo;
   ag_resource_info_t *pRscInfo = &thisCardInst->tiRscInfo;
   int initSWIdx;
 
   // begin: agtiapi_InitCardSW()
   // now init some essential locks  n agtiapi_InitCardSW
   mtx_init( &pmsc->sendLock,     "local q send lock",   NULL, MTX_DEF );
   mtx_init( &pmsc->doneLock,     "local q done lock",   NULL, MTX_DEF );
   mtx_init( &pmsc->sendSMPLock,  "local q send lock",   NULL, MTX_DEF );
   mtx_init( &pmsc->doneSMPLock,  "local q done lock",   NULL, MTX_DEF );
   mtx_init( &pmsc->ccbLock,      "ccb list lock",       NULL, MTX_DEF );
   mtx_init( &pmsc->devListLock,  "hotP devListLock",    NULL, MTX_DEF );
   mtx_init( &pmsc->memLock,      "dynamic memory lock", NULL, MTX_DEF );
   mtx_init( &pmsc->freezeLock,   "sim freeze lock",     NULL, MTX_DEF | MTX_RECURSE);
 
   // initialize lower layer resources
   //## if (pCard->flags & AGTIAPI_INIT_TIME) {
 #ifdef HIALEAH_ENCRYPTION
     /* Enable encryption if chip supports it */
     if (pci_get_device(pmsc->pCardInfo->pPCIDev) == 
                      PCI_DEVICE_ID_HIALEAH_HBA_SPCVE)
         pmsc->encrypt = 1;
 
     if (pmsc->encrypt)
         pRscInfo->tiLoLevelResource.loLevelOption.encryption = agTRUE;
 #endif
   pmsc->flags &= ~(AGTIAPI_PORT_INITIALIZED | AGTIAPI_SYS_INTR_ON);
 
 
   // For now, up to 16 MSIX vectors are supported
   thisCardInst->tiRscInfo.tiLoLevelResource.loLevelOption.
     maxInterruptVectors = pmsc->pCardInfo->maxInterruptVectors;
   AGTIAPI_PRINTK( "agtiapi_InitCardSW: maxInterruptVectors set to %d",
                   pmsc->pCardInfo->maxInterruptVectors );
   thisCardInst->tiRscInfo.tiLoLevelResource.loLevelOption.max_MSI_InterruptVectors = 0;
   thisCardInst->tiRscInfo.tiLoLevelResource.loLevelOption.flag = 0;
   pRscInfo->tiLoLevelResource.loLevelOption.maxNumOSLocks = 0;
 
   AGTIAPI_PRINTK( "agtiapi_InitCardSW: tiCOMInit root %p, dev %p, pmsc %p\n",
                   &pmsc->tiRoot, pmsc->my_dev, pmsc );
   if( tiCOMInit( &pmsc->tiRoot,
                  &thisCardInst->tiRscInfo.tiLoLevelResource,
                  &thisCardInst->tiRscInfo.tiInitiatorResource,
                  NULL,
                  &thisCardInst->tiRscInfo.tiSharedMem ) != tiSuccess ) {
     AGTIAPI_PRINTK( "agtiapi_InitCardSW: tiCOMInit ERROR\n" );
     return AGTIAPI_FAIL;
   }
   int maxLocks;
   maxLocks = pRscInfo->tiLoLevelResource.loLevelOption.numOfQueuesPerPort;
   pmsc->STLock = malloc( ( maxLocks * sizeof(struct mtx) ), M_PMC_MSTL,
 			              M_ZERO | M_WAITOK );
 
   for( initSWIdx = 0; initSWIdx < maxLocks; initSWIdx++ )
   {
     // init all indexes
     mtx_init( &pmsc->STLock[initSWIdx], "LL & TD lock", NULL, MTX_DEF );
   }
 
   if( tiCOMPortInit( &pmsc->tiRoot, agFALSE ) != tiSuccess ) {
     printf( "agtiapi_InitCardSW: tiCOMPortInit ERROR -- AGTIAPI_FAIL\n" );
     return AGTIAPI_FAIL;
   }
   AGTIAPI_PRINTK( "agtiapi_InitCardSW: tiCOMPortInit"
                   " root %p, dev %p, pmsc %p\n", 
                   &pmsc->tiRoot, pmsc->my_dev, pmsc );
 
   pmsc->flags |= AGTIAPI_PORT_INITIALIZED;
   pmsc->freezeSim = agFALSE;
 
 #ifdef HIALEAH_ENCRYPTION
   atomic_set(&outstanding_encrypted_io_count, 0);
   /*fix below*/
   /*if(pmsc->encrypt && (pmsc->flags & AGTIAPI_INIT_TIME))
 	   if((agtiapi_SetupEncryptionPools(pmsc)) != 0)
 	     printf("SetupEncryptionPools failed\n"); */
 #endif
   return AGTIAPI_SUCCESS;
   // end: agtiapi_InitCardSW()
 }
 
 /******************************************************************************
 agtiapi_InitCardHW()
 
 Purpose:
   Host Bus Adapter Initialization
 Parameters: 
   struct agtiapi_softc *pmsc (IN)  Pointer to the HBA data structure
 Return:
   AGTIAPI_SUCCESS - success
   AGTIAPI_FAIL    - fail
 Note:    
   TBD, need chip register information
 ******************************************************************************/
 STATIC agBOOLEAN agtiapi_InitCardHW( struct agtiapi_softc *pmsc ) 
 {
   U32 numVal;
   U32 count;
   U32 loop;
   // begin: agtiapi_InitCardHW()
 
   ag_portal_info_t *pPortalInfo = NULL;
   ag_portal_data_t *pPortalData;
 
   // ISR is registered, enable chip interrupt.
   tiCOMSystemInterruptsActive( &pmsc->tiRoot, agTRUE );
   pmsc->flags |= AGTIAPI_SYS_INTR_ON;
 
   numVal = sizeof(ag_device_t) * pmsc->devDiscover;
   pmsc->pDevList =
     (ag_device_t *)malloc( numVal, M_PMC_MDVT, M_ZERO | M_WAITOK );
   if( !pmsc->pDevList ) {
     AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d DevList ERROR\n", numVal );
     panic( "agtiapi_InitCardHW\n" );
     return AGTIAPI_FAIL;
   }
 
 #ifdef LINUX_PERBI_SUPPORT
   numVal = sizeof(ag_slr_map_t) * pmsc->devDiscover;
   pmsc->pSLRList =
     (ag_slr_map_t *)malloc( numVal, M_PMC_MSLR, M_ZERO | M_WAITOK );
   if( !pmsc->pSLRList ) {
     AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d SLRList ERROR\n", numVal );
     panic( "agtiapi_InitCardHW SLRL\n" );
     return AGTIAPI_FAIL;
   }
 
   numVal = sizeof(ag_tgt_map_t) * pmsc->devDiscover;
   pmsc->pWWNList =
     (ag_tgt_map_t *)malloc( numVal, M_PMC_MTGT, M_ZERO | M_WAITOK );
   if( !pmsc->pWWNList ) {
     AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d WWNList ERROR\n", numVal );
     panic( "agtiapi_InitCardHW WWNL\n" );
     return AGTIAPI_FAIL;
   }
 
   // Get the WWN_to_target_ID mappings from the
   // holding area which contains the input of the
   // system configuration file.
   if( ag_Perbi )
     agtiapi_GetWWNMappings( pmsc, agMappingList );
   else {
     agtiapi_GetWWNMappings( pmsc, 0 );
     if( agMappingList )
       printf( "agtiapi_InitCardHW: WWN PERBI disabled WARN\n" );
   }
 #endif
 
   //agtiapi_DelaySec(5);
   DELAY( 500000 );
 
   pmsc->tgtCount = 0;
 
   pmsc->flags &= ~AGTIAPI_CB_DONE;
   pPortalData = pmsc->pPortalData;
 
   //start port
 
   for (count = 0; count < pmsc->portCount; count++)
   {
     AG_SPIN_LOCK_IRQ( agtiapi_host_lock, flags );
 
     pPortalInfo = &pPortalData->portalInfo;
     pPortalInfo->portStatus &= ~( AGTIAPI_PORT_START      | 
                                   AGTIAPI_PORT_DISC_READY |
                                   AGTIAPI_DISC_DONE       |
                                   AGTIAPI_DISC_COMPLETE );
 
     for (loop = 0; loop < AGTIAPI_LOOP_MAX; loop++)
     {
       AGTIAPI_PRINTK( "tiCOMPortStart entry data %p / %d / %p\n",
                       &pmsc->tiRoot,
                       pPortalInfo->portID,
                       &pPortalInfo->tiPortalContext );
 
       if( tiCOMPortStart( &pmsc->tiRoot, 
                           pPortalInfo->portID, 
                           &pPortalInfo->tiPortalContext,
                           0 )
           != tiSuccess ) {
         AG_SPIN_UNLOCK_IRQ( agtiapi_host_lock, flags );
         agtiapi_DelayMSec( AGTIAPI_EXTRA_DELAY );
         AG_SPIN_LOCK_IRQ(agtiapi_host_lock, flags);
         AGTIAPI_PRINTK( "tiCOMPortStart failed -- no loop, portalData %p\n",
                         pPortalData );
       }
       else {
         AGTIAPI_PRINTK( "tiCOMPortStart success no loop, portalData %p\n", 
                         pPortalData );
         break;
       }
     } // end of for loop
     /* release lock */
     AG_SPIN_UNLOCK_IRQ( agtiapi_host_lock, flags );
 
     if( loop >= AGTIAPI_LOOP_MAX ) {
       return AGTIAPI_FAIL;
     }
     tiCOMGetPortInfo( &pmsc->tiRoot,
                       &pPortalInfo->tiPortalContext,
                       &pPortalInfo->tiPortInfo );
     pPortalData++;
   }
 
   /* discover target device */
 #ifndef HOTPLUG_SUPPORT
   agtiapi_DiscoverTgt( pCard );
 #endif
 
 
   pmsc->flags |= AGTIAPI_INSTALLED;
   
   if( pmsc->flags & AGTIAPI_INIT_TIME ) {
     agtiapi_TITimer( (void *)pmsc );
     pmsc->flags |= AGTIAPI_TIMER_ON;
   }
 
   return 0;
 }
 
 
 
 /******************************************************************************
 agtiapi_IntrHandlerx_()
 
 Purpose:
   Interrupt service routine.
 Parameters:
   void arg (IN)              Pointer to the HBA data structure
   bit32 idx (IN)             Vector index
 ******************************************************************************/
 void  agtiapi_IntrHandlerx_( void *arg, int index )
 {
   
   struct agtiapi_softc *pCard;
   int rv;
 
   pCard = (struct agtiapi_softc *)arg;
 
 #ifndef AGTIAPI_DPC
   ccb_t     *pccb;
 #endif
 
   AG_LOCAL_LOCK(&(pCard->pCardInfo->pmIOLock));
   AG_PERF_SPINLOCK(agtiapi_host_lock);
   if (pCard->flags & AGTIAPI_SHUT_DOWN)
     goto ext;
 
   rv = tiCOMInterruptHandler(&pCard->tiRoot, index);
   if (rv == agFALSE)
   {
     /* not our irq */
     AG_SPIN_UNLOCK(agtiapi_host_lock);
     AG_LOCAL_UNLOCK(&(pCard->pCardInfo->pmIOLock));    
     return;
   }
 
 
 #ifdef AGTIAPI_DPC
   tasklet_hi_schedule(&pCard->tasklet_dpc[idx]);
 #else
   /* consume all completed entries, 100 is random number to be big enough */
   tiCOMDelayedInterruptHandler(&pCard->tiRoot, index, 100, tiInterruptContext);
   AG_GET_DONE_PCCB(pccb, pCard);
   AG_GET_DONE_SMP_PCCB(pccb, pCard);
 #endif
 
 ext:
   AG_SPIN_UNLOCK(agtiapi_host_lock);
   AG_LOCAL_UNLOCK(&(pCard->pCardInfo->pmIOLock));  
   return;
 
 }
 
 /******************************************************************************
 agtiapi_IntrHandler0()
 Purpose:     Interrupt service routine for interrupt vector index 0.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler0( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 0 );
   return;
 }
 
 /******************************************************************************
 agtiapi_IntrHandler1()
 Purpose:     Interrupt service routine for interrupt vector index 1.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler1( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 1 );
   return;
 }
 
 /******************************************************************************
 agtiapi_IntrHandler2()
 Purpose:     Interrupt service routine for interrupt vector index 2.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler2( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 2 );
   return;
 }
 
 /******************************************************************************
 agtiapi_IntrHandler3()
 Purpose:     Interrupt service routine for interrupt vector index 3.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler3( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 3 );
   return;
 }
 
 /******************************************************************************
 agtiapi_IntrHandler4()
 Purpose:     Interrupt service routine for interrupt vector index 4.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler4( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 4 );
   return;
 }
 
 /******************************************************************************
 agtiapi_IntrHandler5()
 Purpose:     Interrupt service routine for interrupt vector index 5.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler5( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 5 );
   return;
 }
 
 /******************************************************************************
 agtiapi_IntrHandler6()
 Purpose:     Interrupt service routine for interrupt vector index 6.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler6( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 6 );
   return;
 }
 
 /******************************************************************************
 agtiapi_IntrHandler7()
 Purpose:     Interrupt service routine for interrupt vector index 7.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler7( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 7 );
   return;
 }
 
 /******************************************************************************
 agtiapi_IntrHandler8()
 Purpose:     Interrupt service routine for interrupt vector index 8.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler8( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 8 );
   return;
 }
 
 /******************************************************************************
 agtiapi_IntrHandler9()
 Purpose:     Interrupt service routine for interrupt vector index 9.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler9( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 9 );
   return;
 }
 
 /******************************************************************************
 agtiapi_IntrHandler10()
 Purpose:     Interrupt service routine for interrupt vector index 10.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler10( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 10 );
   return;
 }
 
 /******************************************************************************
 agtiapi_IntrHandler11()
 Purpose:     Interrupt service routine for interrupt vector index 11.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler11( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 11 );
   return;
 }
 
 /******************************************************************************
 agtiapi_IntrHandler12()
 Purpose:     Interrupt service routine for interrupt vector index 12.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler12( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 12 );
   return;
 }
 
 /******************************************************************************
 agtiapi_IntrHandler13()
 Purpose:     Interrupt service routine for interrupt vector index 13.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler13( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 13 );
   return;
 }
 
 /******************************************************************************
 agtiapi_IntrHandler14()
 Purpose:     Interrupt service routine for interrupt vector index 14.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler14( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 14 );
   return;
 }
 
 /******************************************************************************
 agtiapi_IntrHandler15()
 Purpose:     Interrupt service routine for interrupt vector index 15.
 Parameters:  void arg (IN)       Pointer to the HBA data structure
 ******************************************************************************/
 void agtiapi_IntrHandler15( void *arg )
 {
   agtiapi_IntrHandlerx_( arg, 15 );
   return;
 }
 
 static void agtiapi_SglMemoryCB( void *arg,
                                  bus_dma_segment_t *dm_segs,
                                  int nseg,
                                  int error )
 {
   bus_addr_t *addr;
   AGTIAPI_PRINTK("agtiapi_SglMemoryCB: start\n");
   if (error != 0)
   {
     AGTIAPI_PRINTK("agtiapi_SglMemoryCB: error %d\n", error);
     panic("agtiapi_SglMemoryCB: error %d\n", error);
     return;  
   } 
   addr = arg;
   *addr = dm_segs[0].ds_addr;
   return;
 }
 
 static void agtiapi_MemoryCB( void *arg,
                               bus_dma_segment_t *dm_segs,
                               int nseg,
                               int error )
 {
   bus_addr_t *addr;
   AGTIAPI_PRINTK("agtiapi_MemoryCB: start\n");
   if (error != 0)
   {
     AGTIAPI_PRINTK("agtiapi_MemoryCB: error %d\n", error);
     panic("agtiapi_MemoryCB: error %d\n", error);
     return;  
   } 
   addr = arg;
   *addr = dm_segs[0].ds_addr;
   return;
 }
 
 /******************************************************************************
 agtiapi_alloc_requests()
 
 Purpose:
   Allocates resources such as dma tag and timer
 Parameters: 
   struct agtiapi_softc *pmsc (IN)  Pointer to the HBA data structure
 Return:
   AGTIAPI_SUCCESS - success
   AGTIAPI_FAIL    - fail
 Note:    
 ******************************************************************************/
 int agtiapi_alloc_requests( struct agtiapi_softc *pmcsc )
 {
   
   int rsize, nsegs;
   U32 next_tick;
 
   nsegs = AGTIAPI_NSEGS;
   rsize = AGTIAPI_MAX_DMA_SEGS;   // 128
   AGTIAPI_PRINTK( "agtiapi_alloc_requests: maxphys 0x%lx PAGE_SIZE 0x%x \n",
                   maxphys, PAGE_SIZE );
   AGTIAPI_PRINTK( "agtiapi_alloc_requests: nsegs %d rsize %d \n",
                   nsegs, rsize ); // 32, 128
   // This is for csio->data_ptr
   if( bus_dma_tag_create( agNULL,                      // parent
                           1,                           // alignment
                           0,                           // boundary
                           BUS_SPACE_MAXADDR,           // lowaddr
                           BUS_SPACE_MAXADDR,           // highaddr
                           NULL,                        // filter
                           NULL,                        // filterarg
                           BUS_SPACE_MAXSIZE_32BIT,     // maxsize
                           nsegs,                       // nsegments
                           BUS_SPACE_MAXSIZE_32BIT,     // maxsegsize
                           BUS_DMA_ALLOCNOW,            // flags
                           busdma_lock_mutex,           // lockfunc
                           &pmcsc->pCardInfo->pmIOLock, // lockarg
                           &pmcsc->buffer_dmat ) ) {
     AGTIAPI_PRINTK( "agtiapi_alloc_requests: Cannot alloc request DMA tag\n" );
     return( ENOMEM );
   }
 
   // This is for tiSgl_t of pccb in agtiapi_PrepCCBs()
   rsize =
     (sizeof(tiSgl_t) * AGTIAPI_NSEGS) *
     AGTIAPI_CCB_PER_DEVICE * maxTargets;
   AGTIAPI_PRINTK( "agtiapi_alloc_requests: rsize %d \n", rsize ); // 32, 128
   if( bus_dma_tag_create( agNULL,                  // parent
                           32,                      // alignment
                           0,	                     // boundary
                           BUS_SPACE_MAXADDR_32BIT, // lowaddr
                           BUS_SPACE_MAXADDR,	     // highaddr
                           NULL,                    // filter
                           NULL,	                   // filterarg
                           rsize,                   // maxsize
                           1,                       // nsegments
                           rsize,                   // maxsegsize
                           BUS_DMA_ALLOCNOW,        // flags
                           NULL,                    // lockfunc
                           NULL,                    // lockarg
                           &pmcsc->tisgl_dmat ) ) {
     AGTIAPI_PRINTK( "agtiapi_alloc_requests: Cannot alloc request DMA tag\n" );
     return( ENOMEM );
   }
 
   if( bus_dmamem_alloc( pmcsc->tisgl_dmat,
                         (void **)&pmcsc->tisgl_mem,
                         BUS_DMA_NOWAIT,
                         &pmcsc->tisgl_map ) ) {
     AGTIAPI_PRINTK( "agtiapi_alloc_requests: Cannot allocate SGL memory\n" );
     return( ENOMEM );
   }
 
   bzero( pmcsc->tisgl_mem, rsize );
   bus_dmamap_load( pmcsc->tisgl_dmat,
                    pmcsc->tisgl_map,
                    pmcsc->tisgl_mem,
                    rsize,
                    agtiapi_SglMemoryCB,
                    &pmcsc->tisgl_busaddr,
                    BUS_DMA_NOWAIT /* 0 */ );
 
   mtx_init( &pmcsc->OS_timer_lock,  "OS timer lock",      NULL, MTX_DEF );
   mtx_init( &pmcsc->IO_timer_lock,  "IO timer lock",      NULL, MTX_DEF );
   mtx_init( &pmcsc->devRmTimerLock, "targ rm timer lock", NULL, MTX_DEF );
   callout_init_mtx( &pmcsc->OS_timer, &pmcsc->OS_timer_lock, 0 );
   callout_init_mtx( &pmcsc->IO_timer, &pmcsc->IO_timer_lock, 0 );
   callout_init_mtx( &pmcsc->devRmTimer,
 		    &pmcsc->devRmTimerLock, 0);
 
   next_tick = pmcsc->pCardInfo->tiRscInfo.tiLoLevelResource.
               loLevelOption.usecsPerTick / USEC_PER_TICK;
   AGTIAPI_PRINTK( "agtiapi_alloc_requests: before callout_reset, "
                   "next_tick 0x%x\n", next_tick );
   callout_reset( &pmcsc->OS_timer, next_tick, agtiapi_TITimer, pmcsc );
   return 0;
 }
 
 /******************************************************************************
 agtiapi_alloc_ostimem()
 
 Purpose:
   Allocates memory used later in ostiAllocMemory
 Parameters:
   struct agtiapi_softc *pmcsc (IN)  Pointer to the HBA data structure
 Return:
   AGTIAPI_SUCCESS - success
   AGTIAPI_FAIL    - fail
 Note:
   This is a pre-allocation for ostiAllocMemory() "non-cacheable" function calls
 ******************************************************************************/
 int  agtiapi_alloc_ostimem( struct agtiapi_softc *pmcsc ) {
   int rsize, nomsize;
 
   nomsize = 4096;
   rsize = AGTIAPI_DYNAMIC_MAX * nomsize; // 8M
   AGTIAPI_PRINTK("agtiapi_alloc_ostimem: rsize %d \n", rsize);
  
   if( bus_dma_tag_create( agNULL,                      // parent
                           32,                          // alignment
                           0,                           // boundary
                           BUS_SPACE_MAXADDR,           // lowaddr
                           BUS_SPACE_MAXADDR,           // highaddr
                           NULL,                        // filter
                           NULL,                        // filterarg
                           rsize,                       // maxsize (size)
                           1,                           // number of segments
                           rsize,                       // maxsegsize
                           0,                           // flags
                           NULL,                        // lockfunc
                           NULL,                        // lockarg
                           &pmcsc->osti_dmat ) ) {
     AGTIAPI_PRINTK( "agtiapi_alloc_ostimem: Can't create no-cache mem tag\n" );
     return AGTIAPI_FAIL;
   }
 
 
   if( bus_dmamem_alloc( pmcsc->osti_dmat,
                         &pmcsc->osti_mem,
                         BUS_DMA_WAITOK | BUS_DMA_ZERO | BUS_DMA_NOCACHE,
                         &pmcsc->osti_mapp ) ) {
     AGTIAPI_PRINTK( "agtiapi_alloc_ostimem: Cannot allocate cache mem %d\n",
                     rsize );
     return AGTIAPI_FAIL;
   }
 
 
   bus_dmamap_load( pmcsc->osti_dmat,
                    pmcsc->osti_mapp,
                    pmcsc->osti_mem,
                    rsize,
                    agtiapi_MemoryCB, // try reuse of CB for same goal
                    &pmcsc->osti_busaddr,
                    BUS_DMA_NOWAIT );
 
   // populate all the ag_dma_addr_t osti_busaddr/mem fields with addresses for
   //  handy reference when driver is in motion 
   int idx;
   ag_card_info_t *pCardInfo = pmcsc->pCardInfo;
   ag_dma_addr_t  *pMem;
 
   for( idx = 0; idx < AGTIAPI_DYNAMIC_MAX; idx++ ) {
     pMem = &pCardInfo->dynamicMem[idx];
     pMem->nocache_busaddr = pmcsc->osti_busaddr + ( idx * nomsize );
     pMem->nocache_mem     = (void*)((U64)pmcsc->osti_mem + ( idx * nomsize ));
     pCardInfo->freeDynamicMem[idx] = &pCardInfo->dynamicMem[idx];
   }
 
   pCardInfo->topOfFreeDynamicMem = AGTIAPI_DYNAMIC_MAX;
 
   return AGTIAPI_SUCCESS;
 }
 
 
 /******************************************************************************
 agtiapi_cam_action()
 
 Purpose:
   Parses CAM frames and triggers a corresponding action
 Parameters: 
   struct cam_sim *sim (IN)  Pointer to SIM data structure
   union ccb * ccb (IN)      Pointer to CAM ccb data structure
 Return:
 Note:    
 ******************************************************************************/
 static void agtiapi_cam_action( struct cam_sim *sim, union ccb * ccb )
 {
   struct agtiapi_softc *pmcsc;
   tiDeviceHandle_t *pDevHandle = NULL;	// acts as flag as well
   tiDeviceInfo_t devInfo;
   int pathID, targetID, lunID;
   int lRetVal;
   U32 TID;
   U32 speed = 150000;
 
   pmcsc = cam_sim_softc( sim );
   AGTIAPI_IO( "agtiapi_cam_action: start pmcs %p\n", pmcsc );
 
   if (pmcsc == agNULL)
   {
     AGTIAPI_PRINTK( "agtiapi_cam_action: start pmcs is NULL\n" );
     return;
   }
   mtx_assert( &(pmcsc->pCardInfo->pmIOLock), MA_OWNED );
 
   AGTIAPI_IO( "agtiapi_cam_action: cardNO %d func_code 0x%x\n", pmcsc->cardNo, ccb->ccb_h.func_code );
 
   pathID   = xpt_path_path_id( ccb->ccb_h.path );
   targetID = xpt_path_target_id( ccb->ccb_h.path );
   lunID    = xpt_path_lun_id( ccb->ccb_h.path );
 
   AGTIAPI_IO( "agtiapi_cam_action: P 0x%x T 0x%x L 0x%x\n",
               pathID, targetID, lunID );
 
   switch (ccb->ccb_h.func_code) 
   {
   case XPT_PATH_INQ:
   {
     struct ccb_pathinq *cpi;
 
     /* See architecure book p180*/
     cpi = &ccb->cpi;
     cpi->version_num = 1;
     cpi->hba_inquiry = PI_SDTR_ABLE | PI_TAG_ABLE | PI_WIDE_16;
     cpi->target_sprt = 0;
     cpi->hba_misc = PIM_NOBUSRESET | PIM_SEQSCAN;
     cpi->hba_eng_cnt = 0;
     cpi->max_target = maxTargets - 1;
     cpi->max_lun = AGTIAPI_MAX_LUN;
     /* Max supported I/O size, in bytes. */
     cpi->maxio = ctob(AGTIAPI_NSEGS - 1);
     cpi->initiator_id = 255;
     strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
     strlcpy(cpi->hba_vid, "PMC", HBA_IDLEN);
     strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
     cpi->unit_number = cam_sim_unit(sim);
     cpi->bus_id = cam_sim_bus(sim);
     // rate is set when XPT_GET_TRAN_SETTINGS is processed
     cpi->base_transfer_speed = 150000;
     cpi->transport = XPORT_SAS;
     cpi->transport_version = 0;
     cpi->protocol = PROTO_SCSI;
     cpi->protocol_version = SCSI_REV_SPC3;
     cpi->ccb_h.status = CAM_REQ_CMP;
     break;
   }
   case XPT_GET_TRAN_SETTINGS:
   {
     struct ccb_trans_settings	*cts;
     struct ccb_trans_settings_sas *sas;
     struct ccb_trans_settings_scsi	*scsi;
 
     if ( pmcsc->flags & AGTIAPI_SHUT_DOWN )
     {
       return;
     }
 
     cts = &ccb->cts;
     sas = &ccb->cts.xport_specific.sas;
     scsi = &cts->proto_specific.scsi;
 
     cts->protocol = PROTO_SCSI;
     cts->protocol_version = SCSI_REV_SPC3;
     cts->transport = XPORT_SAS;
     cts->transport_version = 0;
 
     sas->valid = CTS_SAS_VALID_SPEED;
 
     /* this sets the "MB/s transfers" */ 
     if (pmcsc != NULL && targetID >= 0 && targetID < maxTargets)
     {
       if (pmcsc->pWWNList != NULL)
       {
         TID = INDEX(pmcsc, targetID);
         if (TID < maxTargets)
         {
           pDevHandle = pmcsc->pDevList[TID].pDevHandle;
         }
       }
     }
     if (pDevHandle)
     {
       tiINIGetDeviceInfo( &pmcsc->tiRoot, pDevHandle, &devInfo );
       switch (devInfo.info.devType_S_Rate & 0xF)
       {
         case 0x8: speed = 150000;
           break;
         case 0x9: speed = 300000;
           break;
         case 0xA: speed = 600000;
           break;
         case 0xB: speed = 1200000;
           break;
         default:  speed = 150000;
           break;
       }
     }
     sas->bitrate      = speed;
     scsi->valid       = CTS_SCSI_VALID_TQ;
     scsi->flags       = CTS_SCSI_FLAGS_TAG_ENB;
     ccb->ccb_h.status = CAM_REQ_CMP;
     break;
   }  
   case XPT_RESET_BUS:
   {
     lRetVal = agtiapi_eh_HostReset( pmcsc, ccb ); // usually works first time
     if ( SUCCESS == lRetVal )
     {
       AGTIAPI_PRINTK( "agtiapi_cam_action: bus reset success.\n" );
     }
     else
     {
       AGTIAPI_PRINTK( "agtiapi_cam_action: bus reset failed.\n" );
     }
     ccb->ccb_h.status = CAM_REQ_CMP;
     break;
   }
   case XPT_RESET_DEV:
   {
     ccb->ccb_h.status = CAM_REQ_CMP;
     break;
   }
   case XPT_ABORT:
   {
     ccb->ccb_h.status = CAM_REQ_CMP;
     break;
   }
 #if __FreeBSD_version >= 900026
   case XPT_SMP_IO:
   {
     agtiapi_QueueSMP( pmcsc, ccb );
     return;
   }
 #endif /* __FreeBSD_version >= 900026 */
   case XPT_SCSI_IO:
   {
     if(pmcsc->dev_scan == agFALSE)
     {
        ccb->ccb_h.status = CAM_SEL_TIMEOUT;  
        break;
     }
     if (pmcsc->flags & AGTIAPI_SHUT_DOWN)
     {
       AGTIAPI_PRINTK( "agtiapi_cam_action: shutdown, XPT_SCSI_IO 0x%x\n",
                       XPT_SCSI_IO );
       ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
       break;
     }
     else
     {
       AGTIAPI_IO( "agtiapi_cam_action: Zero XPT_SCSI_IO 0x%x, doing IOs\n",
                   XPT_SCSI_IO );
       agtiapi_QueueCmnd_( pmcsc, ccb );
       return;
     }
   }
 
   case XPT_CALC_GEOMETRY:
   {
 	  cam_calc_geometry(&ccb->ccg, 1);
 	  ccb->ccb_h.status = CAM_REQ_CMP;
 	  break;
   }	  
   default:
   {
     /*
       XPT_SET_TRAN_SETTINGS	
     */
     AGTIAPI_IO( "agtiapi_cam_action: default function code 0x%x\n",
                 ccb->ccb_h.func_code );
     ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
     break;
   }
   } /* switch */
   xpt_done(ccb);
 }
 
 
 /******************************************************************************
 agtiapi_GetCCB()
 
 Purpose:
   Get a ccb from free list or allocate a new one
 Parameters:
   struct agtiapi_softc *pmcsc (IN)  Pointer to HBA structure
 Return:
   Pointer to a ccb structure, or NULL if not available
 Note:
 ******************************************************************************/
 STATIC pccb_t agtiapi_GetCCB( struct agtiapi_softc *pmcsc )
 {
   pccb_t pccb;
 
   AGTIAPI_IO( "agtiapi_GetCCB: start\n" );
 
   AG_LOCAL_LOCK( &pmcsc->ccbLock );
 
   /* get the ccb from the head of the free list */
   if ((pccb = (pccb_t)pmcsc->ccbFreeList) != NULL)
   {
     pmcsc->ccbFreeList = (caddr_t *)pccb->pccbNext;
     pccb->pccbNext = NULL;
     pccb->flags = ACTIVE;
     pccb->startTime = 0;
     pmcsc->activeCCB++;
     AGTIAPI_IO( "agtiapi_GetCCB: re-allocated ccb %p\n", pccb );
   }
   else
   {
     AGTIAPI_PRINTK( "agtiapi_GetCCB: kmalloc ERROR - no ccb allocated\n" );
   }
 
   AG_LOCAL_UNLOCK( &pmcsc->ccbLock );
   return pccb;
 }
 
 /******************************************************************************
 agtiapi_QueueCmnd_()
 
 Purpose:
   Calls for sending CCB and excuting on HBA.
 Parameters:
   struct agtiapi_softc *pmsc (IN)  Pointer to the HBA data structure
   union ccb * ccb (IN)      Pointer to CAM ccb data structure
 Return:
   0 - Command is pending to execute
   1 - Command returned without further process
 Note:
 ******************************************************************************/
 int agtiapi_QueueCmnd_(struct agtiapi_softc *pmcsc, union ccb * ccb)
 {
   struct ccb_scsiio *csio = &ccb->csio;
   pccb_t     pccb = agNULL; // call dequeue
   int        status = tiSuccess;
   U32        Channel = CMND_TO_CHANNEL(ccb);
   U32        TID     = CMND_TO_TARGET(ccb);
   U32        LUN     = CMND_TO_LUN(ccb);
 
   AGTIAPI_IO( "agtiapi_QueueCmnd_: start\n" );
 
   /* no support for CBD > 16 */
   if (csio->cdb_len > 16)
   {
     AGTIAPI_PRINTK( "agtiapi_QueueCmnd_: unsupported CDB length %d\n",
                     csio->cdb_len );
     ccb->ccb_h.status &= ~CAM_SIM_QUEUED;
     ccb->ccb_h.status &= ~CAM_STATUS_MASK;
     ccb->ccb_h.status |= CAM_REQ_INVALID;//CAM_REQ_CMP;
     xpt_done(ccb);
     return tiError;
   }
   if (TID < 0 || TID >= maxTargets)
   {
     AGTIAPI_PRINTK("agtiapi_QueueCmnd_: INVALID TID ERROR\n");
     ccb->ccb_h.status &= ~CAM_SIM_QUEUED;
     ccb->ccb_h.status &= ~CAM_STATUS_MASK;
     ccb->ccb_h.status |= CAM_DEV_NOT_THERE;//CAM_REQ_CMP;
     xpt_done(ccb);
     return tiError;
   }
   /* get a ccb */
   if ((pccb = agtiapi_GetCCB(pmcsc)) == NULL)
   {
     AGTIAPI_PRINTK("agtiapi_QueueCmnd_: GetCCB ERROR\n");
     if (pmcsc != NULL)
     {
       ag_device_t *targ;
       TID = INDEX(pmcsc, TID);
       targ   = &pmcsc->pDevList[TID];
       agtiapi_adjust_queue_depth(ccb->ccb_h.path,targ->qdepth);
     }
     ccb->ccb_h.status &= ~CAM_SIM_QUEUED;
     ccb->ccb_h.status &= ~CAM_STATUS_MASK;
     ccb->ccb_h.status |= CAM_REQUEUE_REQ;
     xpt_done(ccb);
     return tiBusy;
   }
   pccb->pmcsc = pmcsc;
   /* initialize Command Control Block (CCB) */
   pccb->targetId   = TID;
   pccb->lun        = LUN;
   pccb->channel    = Channel;
   pccb->ccb        = ccb; /* for struct scsi_cmnd */
   pccb->senseLen   = csio->sense_len;
   pccb->startTime  = ticks;
   pccb->pSenseData = (caddr_t) &csio->sense_data;
   pccb->tiSuperScsiRequest.flags = 0;
 
   /* each channel is reserved for different addr modes */
   pccb->addrMode = agtiapi_AddrModes[Channel];
 
   status = agtiapi_PrepareSGList(pmcsc, pccb);
   if (status != tiSuccess)
   {
     AGTIAPI_PRINTK("agtiapi_QueueCmnd_: agtiapi_PrepareSGList failure\n");
     agtiapi_FreeCCB(pmcsc, pccb);
     if (status == tiReject)
     {
       ccb->ccb_h.status = CAM_REQ_INVALID;
     }
     else
     {
       ccb->ccb_h.status = CAM_REQ_CMP;
     }
     xpt_done( ccb );
     return tiError;
   }
   return status;
 }
 
 /******************************************************************************
 agtiapi_DumpCDB()
 
 Purpose:
   Prints out CDB
 Parameters:
   const char *ptitle (IN)  A string to be printed
   ccb_t *pccb (IN)         A pointer to the driver's own CCB, not CAM's CCB
 Return:
 Note:
 ******************************************************************************/
 STATIC void agtiapi_DumpCDB(const char *ptitle, ccb_t *pccb)
 {
   union ccb *ccb;
   struct ccb_scsiio *csio;
   bit8  cdb[64];
   int len;
 
   if (pccb == NULL)
   {
     printf( "agtiapi_DumpCDB: no pccb here \n" );
     panic("agtiapi_DumpCDB: pccb is NULL. called from %s\n", ptitle);
     return;
   }
   ccb = pccb->ccb;
   if (ccb == NULL)
   {
     printf( "agtiapi_DumpCDB: no ccb here \n" );
     panic( "agtiapi_DumpCDB: pccb %p ccb %p flags %d ccb NULL! "
            "called from %s\n",
            pccb, pccb->ccb, pccb->flags, ptitle );
     return;
   }
   csio = &ccb->csio;
   if (csio == NULL)
   {
     printf( "agtiapi_DumpCDB: no csio here \n" );
     panic( "agtiapi_DumpCDB: pccb%p ccb%p flags%d csio NULL! called from %s\n",
            pccb, pccb->ccb, pccb->flags, ptitle );
     return;
   }
   len = MIN(64, csio->cdb_len);
   if (csio->ccb_h.flags & CAM_CDB_POINTER)
   {
     bcopy(csio->cdb_io.cdb_ptr, &cdb[0], len);
   }
   else
   {
     bcopy(csio->cdb_io.cdb_bytes, &cdb[0], len);
   }
 
   AGTIAPI_IO( "agtiapi_DumpCDB: pccb%p CDB0x%x csio->cdb_len %d"
               " len %d from %s\n",
               pccb, cdb[0],
               csio->cdb_len,
               len,
               ptitle );
   return;
 }
 
 /******************************************************************************
 agtiapi_DoSoftReset()
 
 Purpose:
   Do card reset
 Parameters:
   *data (IN)               point to pmcsc (struct agtiapi_softc *)
 Return:
 Note:
 ******************************************************************************/
 int agtiapi_DoSoftReset (struct agtiapi_softc *pmcsc)
 {
   int  ret;
   unsigned long flags;
 
   pmcsc->flags |=  AGTIAPI_SOFT_RESET;
   AG_SPIN_LOCK_IRQ( agtiapi_host_lock, flags );
   ret = agtiapi_ResetCard( pmcsc, &flags );
   AG_SPIN_UNLOCK_IRQ( agtiapi_host_lock, flags );
                  
   if( ret != AGTIAPI_SUCCESS )
     return tiError;
                 
   return SUCCESS;
 }
 
 /******************************************************************************
 agtiapi_CheckIOTimeout()
 
 Purpose:
   Timeout function for SCSI IO or TM 
 Parameters:
   *data (IN)               point to pCard (ag_card_t *)
 Return:
 Note:
 ******************************************************************************/
 STATIC void agtiapi_CheckIOTimeout(void *data)
 {
   U32       status = AGTIAPI_SUCCESS;
   ccb_t *pccb;
   struct agtiapi_softc *pmcsc;
   pccb_t pccb_curr;
   pccb_t pccb_next;
   pmcsc = (struct agtiapi_softc *)data;
 
   //AGTIAPI_PRINTK("agtiapi_CheckIOTimeout: Enter\n");
 
   //AGTIAPI_PRINTK("agtiapi_CheckIOTimeout: Active CCB %d\n", pmcsc->activeCCB);
 
   pccb = (pccb_t)pmcsc->ccbChainList;
 
   /* if link is down, do nothing */
   if ((pccb == NULL) || (pmcsc->activeCCB == 0))
   {
   //AGTIAPI_PRINTK("agtiapi_CheckIOTimeout: goto restart_timer\n");
     goto restart_timer;
   }
 
   AG_SPIN_LOCK_IRQ(agtiapi_host_lock, flags);
   if (pmcsc->flags & AGTIAPI_SHUT_DOWN)
     goto ext;
 
   pccb_curr = pccb;
 
   /* Walk thorugh the IO Chain linked list to find the pending io */
   /* Set the TM flag based on the pccb type, i.e SCSI IO or TM cmd */
   while (pccb_curr != NULL)
   {
     /* start from 1st ccb in the chain */
     pccb_next = pccb_curr->pccbChainNext;
     if( (pccb_curr->flags == 0) || (pccb_curr->tiIORequest.tdData == NULL) ||
         (pccb_curr->startTime == 0) /* && (pccb->startTime == 0) */)
     {
       //AGTIAPI_PRINTK("agtiapi_CheckIOTimeout: move to next element\n");
     }
     else if ( ( (ticks-pccb_curr->startTime) >= ag_timeout_secs ) &&
               !(pccb_curr->flags & TIMEDOUT) )
     {
       AGTIAPI_PRINTK( "agtiapi_CheckIOTimeout: pccb %p timed out, call TM "
 		      "function -- flags=%x startTime=%ld tdData = %p\n",
 		      pccb_curr, pccb_curr->flags, pccb->startTime,
 		      pccb_curr->tiIORequest.tdData );
       pccb_curr->flags |= TIMEDOUT;
       status = agtiapi_StartTM(pmcsc, pccb_curr);
       if (status == AGTIAPI_SUCCESS)
       {
         AGTIAPI_PRINTK( "agtiapi_CheckIOTimeout: TM Request sent with "
                         "success\n" );
         goto restart_timer;
       }
       else
       {
 #ifdef AGTIAPI_LOCAL_RESET
         /* abort request did not go through */
         AGTIAPI_PRINTK("agtiapi_CheckIOTimeout: Abort request failed\n");
         /* TODO: call Soft reset here */
         AGTIAPI_PRINTK( "agtiapi_CheckIOTimeout:in agtiapi_CheckIOTimeout() "
                         "abort request did not go thru ==> soft reset#7, then "
                         "restart timer\n" );
         agtiapi_DoSoftReset (pmcsc);
         goto restart_timer;
 #endif
       }
     }
     pccb_curr = pccb_next;
   }
 restart_timer:
   callout_reset(&pmcsc->IO_timer, 1*hz, agtiapi_CheckIOTimeout, pmcsc);
 
 ext:
   AG_SPIN_UNLOCK_IRQ(agtiapi_host_lock, flags);
   return;
 }
 
 /******************************************************************************
 agtiapi_StartTM()
 
 Purpose:
   DDI calls for aborting outstanding IO command 
 Parameters: 
   struct scsi_cmnd *pccb (IN) Pointer to the command to be aborted  
   unsigned long flags (IN/out) spinlock flags used in locking from 
                               calling layers
 Return:
   AGTIAPI_SUCCESS  - success
   AGTIAPI_FAIL     - fail
 ******************************************************************************/
 int
 agtiapi_StartTM(struct agtiapi_softc *pCard, ccb_t *pccb)
 {
   ccb_t     *pTMccb = NULL;
   U32       status = AGTIAPI_SUCCESS;
   ag_device_t      *pDevice = NULL;
   U32       TMstatus = tiSuccess;
   AGTIAPI_PRINTK( "agtiapi_StartTM: pccb %p, pccb->flags %x\n",
                   pccb, pccb->flags );
   if (pccb == NULL)
   {
     AGTIAPI_PRINTK("agtiapi_StartTM: %p not found\n",pccb);
     status = AGTIAPI_SUCCESS;
     goto ext;
   }
   if (!pccb->tiIORequest.tdData)
   {
     /* should not be the case */
     AGTIAPI_PRINTK("agtiapi_StartTM: ccb %p flag 0x%x tid %d no tdData "
                    "ERROR\n", pccb, pccb->flags, pccb->targetId);
     status = AGTIAPI_FAIL;
   }
   else
   {
     /* If timedout CCB is TM_ABORT_TASK command, issue LocalAbort first to
        clear pending TM_ABORT_TASK */
     /* Else Device State will not be put back to Operational, (refer FW) */
     if (pccb->flags & TASK_MANAGEMENT)
     {
       if (tiINIIOAbort(&pCard->tiRoot, &pccb->tiIORequest) != tiSuccess)
       {
         AGTIAPI_PRINTK( "agtiapi_StartTM: LocalAbort Request for Abort_TASK "
                         "TM failed\n" );
         /* TODO: call Soft reset here */
         AGTIAPI_PRINTK( "agtiapi_StartTM: in agtiapi_StartTM() abort "
 			"tiINIIOAbort() failed ==> soft reset#8\n" );
         agtiapi_DoSoftReset( pCard );
       }
       else
       {
         AGTIAPI_PRINTK( "agtiapi_StartTM: LocalAbort for Abort_TASK TM "
                         "Request sent\n" );
         status = AGTIAPI_SUCCESS; 
       }
     }
     else
     {
       /* get a ccb */
       if ((pTMccb = agtiapi_GetCCB(pCard)) == NULL)
       {
         AGTIAPI_PRINTK("agtiapi_StartTM: TM resource unavailable!\n");
         status = AGTIAPI_FAIL;
         goto ext;
       }
       pTMccb->pmcsc = pCard;
       pTMccb->targetId = pccb->targetId;
       pTMccb->devHandle = pccb->devHandle;
       if (pTMccb->targetId >= pCard->devDiscover)
       {
         AGTIAPI_PRINTK("agtiapi_StartTM: Incorrect dev Id in TM!\n");
         status = AGTIAPI_FAIL;
         goto ext;
       }
       if (pTMccb->targetId < 0 || pTMccb->targetId >= maxTargets)
       {
         return AGTIAPI_FAIL;
       }
       if (INDEX(pCard, pTMccb->targetId) >= maxTargets)
       {
         return AGTIAPI_FAIL;
       }
       pDevice = &pCard->pDevList[INDEX(pCard, pTMccb->targetId)];
       if ((pDevice == NULL) || !(pDevice->flags & ACTIVE))
       {
         return AGTIAPI_FAIL;
       }
 
       /* save pending io to issue local abort at Task mgmt CB */
       pTMccb->pccbIO = pccb;
       AGTIAPI_PRINTK( "agtiapi_StartTM: pTMccb %p flag %x tid %d via TM "
                       "request !\n",
                       pTMccb, pTMccb->flags, pTMccb->targetId );
       pTMccb->flags &= ~(TASK_SUCCESS | ACTIVE);
       pTMccb->flags |= TASK_MANAGEMENT;
       TMstatus = tiINITaskManagement(&pCard->tiRoot, 
                               pccb->devHandle,
                               AG_ABORT_TASK,
                               &pccb->tiSuperScsiRequest.scsiCmnd.lun,
                               &pccb->tiIORequest, 
                               &pTMccb->tiIORequest); 
       if (TMstatus == tiSuccess)
       {
         AGTIAPI_PRINTK( "agtiapi_StartTM: TM_ABORT_TASK request success ccb "
                         "%p, pTMccb %p\n", 
                         pccb, pTMccb );
         pTMccb->startTime = ticks;
         status = AGTIAPI_SUCCESS; 
       }
       else if (TMstatus == tiIONoDevice)
       {
         AGTIAPI_PRINTK( "agtiapi_StartTM: TM_ABORT_TASK request tiIONoDevice ccb "
                         "%p, pTMccb %p\n", 
                         pccb, pTMccb );
         status = AGTIAPI_SUCCESS; 
       }
       else
       {
         AGTIAPI_PRINTK( "agtiapi_StartTM: TM_ABORT_TASK request failed ccb %p, "
                         "pTMccb %p\n", 
                         pccb, pTMccb );
         status = AGTIAPI_FAIL;
         agtiapi_FreeTMCCB(pCard, pTMccb);
         /* TODO */
         /* call TM_TARGET_RESET */
       }
     }
   }
   ext:
   AGTIAPI_PRINTK("agtiapi_StartTM: return %d flgs %x\n", status, 
                  (pccb) ? pccb->flags : -1);
   return status;
 } /* agtiapi_StartTM */
 
 #if __FreeBSD_version > 901000
 /******************************************************************************
 agtiapi_PrepareSGList()
 
 Purpose:
   This function prepares scatter-gather list for the given ccb
 Parameters:
   struct agtiapi_softc *pmsc (IN)  Pointer to the HBA data structure
   ccb_t *pccb (IN)      A pointer to the driver's own CCB, not CAM's CCB
 Return:
   0 - success
   1 - failure
 
 Note:
 ******************************************************************************/
 static int agtiapi_PrepareSGList(struct agtiapi_softc *pmcsc, ccb_t *pccb)
 {
   union ccb *ccb = pccb->ccb;
   struct ccb_scsiio *csio = &ccb->csio;
   struct ccb_hdr *ccbh = &ccb->ccb_h;
   AGTIAPI_IO( "agtiapi_PrepareSGList: start\n" );
 
 //  agtiapi_DumpCDB("agtiapi_PrepareSGList", pccb);
   AGTIAPI_IO( "agtiapi_PrepareSGList: dxfer_len %d\n", csio->dxfer_len );
 
   if ((ccbh->flags & CAM_DIR_MASK) != CAM_DIR_NONE) 
   {
 	switch((ccbh->flags & CAM_DATA_MASK))
     	{
           int error;
           struct bus_dma_segment seg;
 	  case CAM_DATA_VADDR:
         /* Virtual address that needs to translated into one or more physical address ranges. */
           //  int error;
             //  AG_LOCAL_LOCK(&(pmcsc->pCardInfo->pmIOLock));
             AGTIAPI_IO( "agtiapi_PrepareSGList: virtual address\n" );
             error = bus_dmamap_load( pmcsc->buffer_dmat,
                                  pccb->CCB_dmamap,
                                  csio->data_ptr,
                                  csio->dxfer_len,
                                  agtiapi_PrepareSGListCB,
                                  pccb,
                                  BUS_DMA_NOWAIT/* 0 */ );
             //  AG_LOCAL_UNLOCK( &(pmcsc->pCardInfo->pmIOLock) );
 
 	    if (error == EINPROGRESS) 
 	    {
           /* So as to maintain ordering, freeze the controller queue until our mapping is returned. */
           AGTIAPI_PRINTK("agtiapi_PrepareSGList: EINPROGRESS\n");
           xpt_freeze_simq(pmcsc->sim, 1);
           pmcsc->SimQFrozen = agTRUE;	  
           ccbh->status |= CAM_RELEASE_SIMQ;
         }
 	break;
 	case CAM_DATA_PADDR:
 	    /* We have been given a pointer to single physical buffer. */
 	    /* pccb->tiSuperScsiRequest.sglVirtualAddr = seg.ds_addr; */
           //struct bus_dma_segment seg;
           AGTIAPI_PRINTK("agtiapi_PrepareSGList: physical address\n");
           seg.ds_addr =
             (bus_addr_t)(vm_offset_t)csio->data_ptr;
              seg.ds_len = csio->dxfer_len;
              // * 0xFF to be defined
              agtiapi_PrepareSGListCB(pccb, &seg, 1, 0xAABBCCDD);
 	     break;
 	default:
            AGTIAPI_PRINTK("agtiapi_PrepareSGList: unexpected case\n");
            return tiReject;
     }
   }
   else 
   {
     agtiapi_PrepareSGListCB(pccb, NULL, 0, 0xAAAAAAAA);
   }
   return tiSuccess;
 }
 #else
 /******************************************************************************
 agtiapi_PrepareSGList()
 
 Purpose:
   This function prepares scatter-gather list for the given ccb
 Parameters:
   struct agtiapi_softc *pmsc (IN)  Pointer to the HBA data structure
   ccb_t *pccb (IN)      A pointer to the driver's own CCB, not CAM's CCB
 Return:
   0 - success
   1 - failure
 
 Note:
 ******************************************************************************/
 static int agtiapi_PrepareSGList(struct agtiapi_softc *pmcsc, ccb_t *pccb)
 {
   union ccb *ccb = pccb->ccb;
   struct ccb_scsiio *csio = &ccb->csio;
   struct ccb_hdr *ccbh = &ccb->ccb_h;
   AGTIAPI_IO( "agtiapi_PrepareSGList: start\n" );
 //  agtiapi_DumpCDB("agtiapi_PrepareSGList", pccb);
   AGTIAPI_IO( "agtiapi_PrepareSGList: dxfer_len %d\n", csio->dxfer_len );
 
   if ((ccbh->flags & CAM_DIR_MASK) != CAM_DIR_NONE)
   {
     if ((ccbh->flags & CAM_SCATTER_VALID) == 0)
     {
       /* We've been given a pointer to a single buffer. */
       if ((ccbh->flags & CAM_DATA_PHYS) == 0) 
       {
         /* Virtual address that needs to translated into one or more physical address ranges. */
         int error;
       //  AG_LOCAL_LOCK(&(pmcsc->pCardInfo->pmIOLock));
         AGTIAPI_IO( "agtiapi_PrepareSGList: virtual address\n" );
         error = bus_dmamap_load( pmcsc->buffer_dmat,
                                  pccb->CCB_dmamap,
                                  csio->data_ptr,
                                  csio->dxfer_len,
                                  agtiapi_PrepareSGListCB,
                                  pccb,
                                  BUS_DMA_NOWAIT/* 0 */ );
       //  AG_LOCAL_UNLOCK( &(pmcsc->pCardInfo->pmIOLock) );
 
 	    if (error == EINPROGRESS) 
 	    {
           /* So as to maintain ordering, freeze the controller queue until our mapping is returned. */
           AGTIAPI_PRINTK("agtiapi_PrepareSGList: EINPROGRESS\n");
           xpt_freeze_simq(pmcsc->sim, 1);
           pmcsc->SimQFrozen = agTRUE;	  
           ccbh->status |= CAM_RELEASE_SIMQ;
         }
       }
       else
       {
 	    /* We have been given a pointer to single physical buffer. */
 	    /* pccb->tiSuperScsiRequest.sglVirtualAddr = seg.ds_addr; */
         struct bus_dma_segment seg;
         AGTIAPI_PRINTK("agtiapi_PrepareSGList: physical address\n");
         seg.ds_addr =
           (bus_addr_t)(vm_offset_t)csio->data_ptr;
         seg.ds_len = csio->dxfer_len;
         // * 0xFF to be defined
         agtiapi_PrepareSGListCB(pccb, &seg, 1, 0xAABBCCDD);
       }
     }
     else
     {
       
       AGTIAPI_PRINTK("agtiapi_PrepareSGList: unexpected case\n");
       return tiReject;
     }
   }
   else 
   {
     agtiapi_PrepareSGListCB(pccb, NULL, 0, 0xAAAAAAAA);
   }
   return tiSuccess;
 }
 
 #endif
 /******************************************************************************
 agtiapi_PrepareSGListCB()
 
 Purpose:
   Callback function for bus_dmamap_load()
   This fuctions sends IO to LL layer.
 Parameters:
   void *arg (IN)                Pointer to the HBA data structure
   bus_dma_segment_t *segs (IN)  Pointer to dma segment
   int nsegs (IN)                number of dma segment
   int error (IN)                error
 Return:
 Note:
 ******************************************************************************/
 static void agtiapi_PrepareSGListCB( void *arg,
                                      bus_dma_segment_t *segs,
                                      int nsegs,
                                      int error )
 {
   pccb_t     pccb = arg;
   union ccb *ccb = pccb->ccb;
   struct ccb_scsiio *csio = &ccb->csio;
 
   struct agtiapi_softc *pmcsc;
   tiIniScsiCmnd_t *pScsiCmnd;
   bit32 i;
   bus_dmasync_op_t op;
   U32_64     phys_addr;
   U08        *CDB; 
   int        io_is_encryptable = 0;
   unsigned long long start_lba = 0;
   ag_device_t *pDev;
   U32        TID     = CMND_TO_TARGET(ccb);
 
   AGTIAPI_IO( "agtiapi_PrepareSGListCB: start, nsegs %d error 0x%x\n",
               nsegs, error );
   pmcsc = pccb->pmcsc;
  
   if (error != tiSuccess)
   {
     if (error == 0xAABBCCDD || error == 0xAAAAAAAA)
     {
       // do nothing
     }
     else
     {
       AGTIAPI_PRINTK("agtiapi_PrepareSGListCB: error status 0x%x\n", error);
       bus_dmamap_unload(pmcsc->buffer_dmat, pccb->CCB_dmamap);
       agtiapi_FreeCCB(pmcsc, pccb);
       if (error == EFBIG)
         ccb->ccb_h.status = CAM_REQ_TOO_BIG;
       else
         ccb->ccb_h.status = CAM_REQ_CMP_ERR;
       xpt_done(ccb);
       return;
     }
   }
 
   if (nsegs > AGTIAPI_MAX_DMA_SEGS)
   {
     AGTIAPI_PRINTK( "agtiapi_PrepareSGListCB: over the limit. nsegs %d"
                     " AGTIAPI_MAX_DMA_SEGS %d\n", 
                     nsegs, AGTIAPI_MAX_DMA_SEGS );
     bus_dmamap_unload(pmcsc->buffer_dmat, pccb->CCB_dmamap);
     agtiapi_FreeCCB(pmcsc, pccb);
     ccb->ccb_h.status = CAM_REQ_TOO_BIG;
     xpt_done(ccb);   
     return;
   }
 
 
   /* fill in IO information */
   pccb->dataLen = csio->dxfer_len;
 
   /* start fill in sgl structure */
   if (nsegs == 1 && error == 0xAABBCCDD)
   {
     /* to be tested */
     /* A single physical buffer */
     AGTIAPI_PRINTK("agtiapi_PrepareSGListCB: nsegs is 1\n");
     CPU_TO_LE32(pccb->tiSuperScsiRequest.agSgl1, segs[0].ds_addr);
     pccb->tiSuperScsiRequest.agSgl1.len   = htole32(pccb->dataLen);
     pccb->tiSuperScsiRequest.agSgl1.type  = htole32(tiSgl);
     pccb->tiSuperScsiRequest.sglVirtualAddr = (void *)segs->ds_addr;
     pccb->numSgElements = 1;
   }
   else if (nsegs == 0 && error == 0xAAAAAAAA)
   {
     /* no data transfer */
     AGTIAPI_IO( "agtiapi_PrepareSGListCB: no data transfer\n" );
     pccb->tiSuperScsiRequest.agSgl1.len = 0;
     pccb->dataLen = 0; 
     pccb->numSgElements = 0;  
   }
   else
   {
     /* virtual/logical buffer */
     if (nsegs == 1)
     {
       pccb->dataLen = segs[0].ds_len;
 
       CPU_TO_LE32(pccb->tiSuperScsiRequest.agSgl1, segs[0].ds_addr);     
       pccb->tiSuperScsiRequest.agSgl1.type = htole32(tiSgl);
       pccb->tiSuperScsiRequest.agSgl1.len = htole32(segs[0].ds_len);
       pccb->tiSuperScsiRequest.sglVirtualAddr = (void *)csio->data_ptr;
       pccb->numSgElements = nsegs;	      
 			                
     }
     else
     {    
       pccb->dataLen = 0;
       /* loop */
       for (i = 0; i < nsegs; i++)
       {
         pccb->sgList[i].len = htole32(segs[i].ds_len);
         CPU_TO_LE32(pccb->sgList[i], segs[i].ds_addr);     
         pccb->sgList[i].type = htole32(tiSgl);
         pccb->dataLen += segs[i].ds_len;
 
       } /* for */
       pccb->numSgElements = nsegs;
       /* set up sgl buffer address */      
       CPU_TO_LE32(pccb->tiSuperScsiRequest.agSgl1,  pccb->tisgl_busaddr);
       pccb->tiSuperScsiRequest.agSgl1.type = htole32(tiSglList);
       pccb->tiSuperScsiRequest.agSgl1.len = htole32(pccb->dataLen);
       pccb->tiSuperScsiRequest.sglVirtualAddr = (void *)csio->data_ptr;
       pccb->numSgElements = nsegs;  
     } /* else */
   }
 
   /* set data transfer direction */
   if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_OUT) 
   {
     op = BUS_DMASYNC_PREWRITE;
     pccb->tiSuperScsiRequest.dataDirection = tiDirectionOut;
   }
   else 
   {
     op = BUS_DMASYNC_PREREAD;
     pccb->tiSuperScsiRequest.dataDirection = tiDirectionIn;
   }
 
   pScsiCmnd = &pccb->tiSuperScsiRequest.scsiCmnd;
 
   pScsiCmnd->expDataLength = pccb->dataLen;
 
   if (csio->ccb_h.flags & CAM_CDB_POINTER)
   {
     bcopy(csio->cdb_io.cdb_ptr, &pScsiCmnd->cdb[0], csio->cdb_len);
   }
   else
   {
     bcopy(csio->cdb_io.cdb_bytes, &pScsiCmnd->cdb[0],csio->cdb_len);
   }
 
   CDB = &pScsiCmnd->cdb[0];
 
   switch (CDB[0])
   {
   case REQUEST_SENSE:  /* requires different buffer */
     /* This code should not be excercised because SAS support auto sense 
        For the completeness, vtophys() is still used here.
      */
     AGTIAPI_PRINTK("agtiapi_PrepareSGListCB: QueueCmnd - REQUEST SENSE new\n");
     pccb->tiSuperScsiRequest.agSgl1.len = htole32(pccb->senseLen);
     phys_addr = vtophys(&csio->sense_data);
     CPU_TO_LE32(pccb->tiSuperScsiRequest.agSgl1, phys_addr);
     pccb->tiSuperScsiRequest.agSgl1.type  = htole32(tiSgl);
     pccb->dataLen = pccb->senseLen;
     pccb->numSgElements = 1;
     break;
   case INQUIRY:
     /* only using lun 0 for device type detection */
     pccb->flags |= AGTIAPI_INQUIRY;
     break;
   case TEST_UNIT_READY:
   case RESERVE:
   case RELEASE:
   case START_STOP:
   	pccb->tiSuperScsiRequest.agSgl1.len = 0;
     pccb->dataLen = 0;
     break;
   case READ_6:
   case WRITE_6:
     /* Extract LBA */
     start_lba = ((CDB[1] & 0x1f) << 16) |
                  (CDB[2] << 8)          |
                  (CDB[3]);
 #ifdef HIALEAH_ENCRYPTION
     io_is_encryptable = 1;
 #endif
     break;
   case READ_10:
   case WRITE_10:
   case READ_12:
   case WRITE_12:
     /* Extract LBA */
     start_lba = (CDB[2] << 24) |
                 (CDB[3] << 16) |
                 (CDB[4] << 8)  |
                 (CDB[5]);
 #ifdef HIALEAH_ENCRYPTION
     io_is_encryptable = 1;
 #endif
     break;
   case READ_16:
   case WRITE_16:
     /* Extract LBA */
     start_lba = (CDB[2] << 24) |
                 (CDB[3] << 16) |
                 (CDB[4] << 8)  |
                 (CDB[5]);
     start_lba <<= 32;
     start_lba |= ((CDB[6] << 24) |
                   (CDB[7] << 16) |
                   (CDB[8] << 8)  |
                   (CDB[9]));
 #ifdef HIALEAH_ENCRYPTION
     io_is_encryptable = 1;
 #endif
     break;
   default:
     break;
   }
 
   /* fill device lun based one address mode */
   agtiapi_SetLunField(pccb);
 
   if (pccb->targetId < 0 || pccb->targetId >= maxTargets)
   {
     pccb->ccbStatus   = tiIOFailed;
     pccb->scsiStatus  = tiDetailNoLogin;
     agtiapi_FreeCCB(pmcsc, pccb);
     ccb->ccb_h.status = CAM_DEV_NOT_THERE; // ## v. CAM_FUNC_NOTAVAIL
     xpt_done(ccb);
     pccb->ccb         = NULL;
     return;
   }
   if (INDEX(pmcsc, pccb->targetId) >= maxTargets)
   {
     pccb->ccbStatus   = tiIOFailed;
     pccb->scsiStatus  = tiDetailNoLogin;
     agtiapi_FreeCCB(pmcsc, pccb);
     ccb->ccb_h.status = CAM_DEV_NOT_THERE; // ## v. CAM_FUNC_NOTAVAIL
     xpt_done(ccb);
     pccb->ccb         = NULL;
     return;
   }
   pDev = &pmcsc->pDevList[INDEX(pmcsc, pccb->targetId)];
 
 #if 1 
   if ((pmcsc->flags & EDC_DATA) &&
       (pDev->flags & EDC_DATA))
   {
     /*
      * EDC support:
      *
      * Possible command supported -
      * READ_6, READ_10, READ_12, READ_16, READ_LONG, READ_BUFFER,
      * READ_DEFECT_DATA, etc.
      * WRITE_6, WRITE_10, WRITE_12, WRITE_16, WRITE_LONG, WRITE_LONG2, 
      * WRITE_BUFFER, WRITE_VERIFY, WRITE_VERIFY_12, etc.
      *
      * Do some data length adjustment and set chip operation instruction.
      */
     switch (CDB[0])
     {
       case READ_6:
       case READ_10:
       case READ_12:
       case READ_16:
         //  BUG_ON(pccb->tiSuperScsiRequest.flags & TI_SCSI_INITIATOR_ENCRYPT);
 #ifdef AGTIAPI_TEST_DIF
         pccb->tiSuperScsiRequest.flags |= TI_SCSI_INITIATOR_DIF;
 #endif
         pccb->flags |= EDC_DATA;
 
 #ifdef TEST_VERIFY_AND_FORWARD
         pccb->tiSuperScsiRequest.Dif.flags =
           DIF_VERIFY_FORWARD | DIF_UDT_REF_BLOCK_COUNT;
         if(pDev->sector_size == 520) {
             pScsiCmnd->expDataLength += (pccb->dataLen / 512) * 8;
         } else if(pDev->sector_size == 4104) {
             pScsiCmnd->expDataLength += (pccb->dataLen / 4096) * 8;
         }
 #else
 #ifdef AGTIAPI_TEST_DIF
         pccb->tiSuperScsiRequest.Dif.flags =
           DIF_VERIFY_DELETE | DIF_UDT_REF_BLOCK_COUNT;
 #endif
 #endif
 #ifdef AGTIAPI_TEST_DIF
         switch(pDev->sector_size) {
             case 528:
                 pccb->tiSuperScsiRequest.Dif.flags |=
                   ( DIF_BLOCK_SIZE_520 << 16 );
                 break;
             case 4104:
                 pccb->tiSuperScsiRequest.Dif.flags |=
                   ( DIF_BLOCK_SIZE_4096 << 16 );
                 break;
             case 4168:
                 pccb->tiSuperScsiRequest.Dif.flags |=
                   ( DIF_BLOCK_SIZE_4160 << 16 );
                 break;
         }
 
         if(pCard->flags & EDC_DATA_CRC)
             pccb->tiSuperScsiRequest.Dif.flags |= DIF_CRC_VERIFICATION;
 
         /* Turn on upper 4 bits of UVM */
         pccb->tiSuperScsiRequest.Dif.flags |= 0x03c00000;
 
 #endif
 #ifdef AGTIAPI_TEST_DPL
         if(agtiapi_SetupDifPerLA(pCard, pccb, start_lba) < 0) {
             printk(KERN_ERR "SetupDifPerLA Failed.\n");
             cmnd->result = SCSI_HOST(DID_ERROR);
             goto err;
         }
         pccb->tiSuperScsiRequest.Dif.enableDIFPerLA = TRUE;        
 #endif
 #ifdef AGTIAPI_TEST_DIF
         /* Set App Tag */
         pccb->tiSuperScsiRequest.Dif.udtArray[0] = 0xaa;
         pccb->tiSuperScsiRequest.Dif.udtArray[1] = 0xbb;
 
         /* Set LBA in UDT array */
         if(CDB[0] == READ_6) {
             pccb->tiSuperScsiRequest.Dif.udtArray[2] = CDB[3];
             pccb->tiSuperScsiRequest.Dif.udtArray[3] = CDB[2];
             pccb->tiSuperScsiRequest.Dif.udtArray[4] = CDB[1] & 0x1f;
             pccb->tiSuperScsiRequest.Dif.udtArray[5] = 0;
         } else if(CDB[0] == READ_10 || CDB[0] == READ_12) {
             pccb->tiSuperScsiRequest.Dif.udtArray[2] = CDB[5];
             pccb->tiSuperScsiRequest.Dif.udtArray[3] = CDB[4];
             pccb->tiSuperScsiRequest.Dif.udtArray[4] = CDB[3];
             pccb->tiSuperScsiRequest.Dif.udtArray[5] = CDB[2];
         } else if(CDB[0] == READ_16) {
             pccb->tiSuperScsiRequest.Dif.udtArray[2] = CDB[9];
             pccb->tiSuperScsiRequest.Dif.udtArray[3] = CDB[8];
             pccb->tiSuperScsiRequest.Dif.udtArray[4] = CDB[7];
             pccb->tiSuperScsiRequest.Dif.udtArray[5] = CDB[6];
             /* Note: 32 bits lost */
         }
 #endif
 
         break;
       case WRITE_6:
       case WRITE_10:
       case WRITE_12:
       case WRITE_16:
         //   BUG_ON(pccb->tiSuperScsiRequest.flags & TI_SCSI_INITIATOR_ENCRYPT);
         pccb->flags |= EDC_DATA;
 #ifdef AGTIAPI_TEST_DIF
         pccb->tiSuperScsiRequest.flags |= TI_SCSI_INITIATOR_DIF;
         pccb->tiSuperScsiRequest.Dif.flags =
           DIF_INSERT | DIF_UDT_REF_BLOCK_COUNT;
         switch(pDev->sector_size) {
             case 528:
                 pccb->tiSuperScsiRequest.Dif.flags |=
                   (DIF_BLOCK_SIZE_520 << 16);
                 break;
             case 4104:
                 pccb->tiSuperScsiRequest.Dif.flags |=
                   ( DIF_BLOCK_SIZE_4096 << 16 );
                 break;
             case 4168:
                 pccb->tiSuperScsiRequest.Dif.flags |=
                   ( DIF_BLOCK_SIZE_4160 << 16 );
                 break;
         }
 
         /* Turn on upper 4 bits of UUM */
         pccb->tiSuperScsiRequest.Dif.flags |= 0xf0000000;
 #endif
 #ifdef AGTIAPI_TEST_DPL
         if(agtiapi_SetupDifPerLA(pCard, pccb, start_lba) < 0) {
             printk(KERN_ERR "SetupDifPerLA Failed.\n");
             cmnd->result = SCSI_HOST(DID_ERROR);
             goto err;
         }
         pccb->tiSuperScsiRequest.Dif.enableDIFPerLA = TRUE;
 #endif
 #ifdef AGTIAPI_TEST_DIF
         /* Set App Tag */
         pccb->tiSuperScsiRequest.Dif.udtArray[0] = 0xaa;
         pccb->tiSuperScsiRequest.Dif.udtArray[1] = 0xbb;
 
         /* Set LBA in UDT array */
         if(CDB[0] == WRITE_6) {
             pccb->tiSuperScsiRequest.Dif.udtArray[2] = CDB[3];
             pccb->tiSuperScsiRequest.Dif.udtArray[3] = CDB[2];
             pccb->tiSuperScsiRequest.Dif.udtArray[4] = CDB[1] & 0x1f;
         } else if(CDB[0] == WRITE_10 || CDB[0] == WRITE_12) {
             pccb->tiSuperScsiRequest.Dif.udtArray[2] = CDB[5];
             pccb->tiSuperScsiRequest.Dif.udtArray[3] = CDB[4];
             pccb->tiSuperScsiRequest.Dif.udtArray[4] = CDB[3];
             pccb->tiSuperScsiRequest.Dif.udtArray[5] = CDB[2];
         } else if(CDB[0] == WRITE_16) {
             pccb->tiSuperScsiRequest.Dif.udtArray[2] = CDB[5];
             pccb->tiSuperScsiRequest.Dif.udtArray[3] = CDB[4];
             pccb->tiSuperScsiRequest.Dif.udtArray[4] = CDB[3];
             pccb->tiSuperScsiRequest.Dif.udtArray[5] = CDB[2];
             /* Note: 32 bits lost */
         }
 #endif
         break;
     }
   }
 #endif /* end of DIF */
 
   if ((ccb->ccb_h.flags & CAM_TAG_ACTION_VALID) != 0)
   {
     switch(csio->tag_action)
     {
     case MSG_HEAD_OF_Q_TAG:
       pScsiCmnd->taskAttribute = TASK_HEAD_OF_QUEUE;
       break;
     case MSG_ACA_TASK:
       pScsiCmnd->taskAttribute = TASK_ACA;
       break;
     case MSG_ORDERED_Q_TAG:
       pScsiCmnd->taskAttribute = TASK_ORDERED;
       break;
     case MSG_SIMPLE_Q_TAG: /* fall through */
     default:
       pScsiCmnd->taskAttribute = TASK_SIMPLE;
       break;
     }
   }
 
   if (pccb->tiSuperScsiRequest.agSgl1.len != 0 && pccb->dataLen != 0)
   {
     /* should be just before start IO */
     bus_dmamap_sync(pmcsc->buffer_dmat, pccb->CCB_dmamap, op);
   }
 
   /*
    * If assigned pDevHandle is not available
    * then there is no need to send it to StartIO()
    */
   if (pccb->targetId < 0 || pccb->targetId >= maxTargets)
   {
     pccb->ccbStatus   = tiIOFailed;
     pccb->scsiStatus  = tiDetailNoLogin;
     agtiapi_FreeCCB(pmcsc, pccb);
     ccb->ccb_h.status = CAM_DEV_NOT_THERE; // ## v. CAM_FUNC_NOTAVAIL
     xpt_done(ccb);
     pccb->ccb         = NULL;
     return;
   }
   TID = INDEX(pmcsc, pccb->targetId);
   if ((TID >= pmcsc->devDiscover) ||
       !(pccb->devHandle = pmcsc->pDevList[TID].pDevHandle))
   {
     /*
     AGTIAPI_PRINTK( "agtiapi_PrepareSGListCB: not sending ccb devH %p,"
                     " target %d tid %d/%d card %p ERROR pccb %p\n",
                     pccb->devHandle, pccb->targetId, TID,
                     pmcsc->devDiscover, pmcsc, pccb );
     */
     pccb->ccbStatus   = tiIOFailed;
     pccb->scsiStatus  = tiDetailNoLogin;
     agtiapi_FreeCCB(pmcsc, pccb);
     ccb->ccb_h.status = CAM_DEV_NOT_THERE; // ## v. CAM_FUNC_NOTAVAIL
     xpt_done(ccb);
     pccb->ccb         = NULL;
     return;
   }
   AGTIAPI_IO( "agtiapi_PrepareSGListCB: send ccb pccb->devHandle %p, "
                   "pccb->targetId %d TID %d pmcsc->devDiscover %d card %p\n",
                   pccb->devHandle, pccb->targetId, TID, pmcsc->devDiscover,
                   pmcsc );
 #ifdef HIALEAH_ENCRYPTION
   if(pmcsc->encrypt && io_is_encryptable) {
     agtiapi_SetupEncryptedIO(pmcsc, pccb, start_lba);
   } else{
 	io_is_encryptable = 0;
 	pccb->tiSuperScsiRequest.flags = 0;
   }
 #endif
   // put the request in send queue
   agtiapi_QueueCCB( pmcsc, &pmcsc->ccbSendHead, &pmcsc->ccbSendTail
                     AG_CARD_LOCAL_LOCK(&pmcsc->sendLock), pccb );
   agtiapi_StartIO(pmcsc);
   return;
 }
 
 /******************************************************************************
 agtiapi_StartIO()
 
 Purpose:
   Send IO request down for processing.
 Parameters:
   (struct agtiapi_softc *pmcsc (IN)  Pointer to HBA data structure
 Return:
 Note:
 ******************************************************************************/
 STATIC void agtiapi_StartIO( struct agtiapi_softc *pmcsc )
 {
   ccb_t *pccb;
   int TID;			
   ag_device_t *targ;	
 
   AGTIAPI_IO( "agtiapi_StartIO: start\n" );
 
   AG_LOCAL_LOCK( &pmcsc->sendLock );
   pccb = pmcsc->ccbSendHead;
 
   /* if link is down, do nothing */
   if ((pccb == NULL) || pmcsc->flags & AGTIAPI_RESET)
   {
     AG_LOCAL_UNLOCK( &pmcsc->sendLock );
     AGTIAPI_PRINTK( "agtiapi_StartIO: goto ext\n" );
     goto ext;
   }
 
 
  if (pmcsc != NULL && pccb->targetId >= 0 && pccb->targetId < maxTargets)
   {
       TID = INDEX(pmcsc, pccb->targetId);
       targ   = &pmcsc->pDevList[TID];
   }
 
 
   /* clear send queue */
   pmcsc->ccbSendHead = NULL;
   pmcsc->ccbSendTail = NULL;
   AG_LOCAL_UNLOCK( &pmcsc->sendLock );
 
   /* send all ccbs down */
   while (pccb) 
   {
     pccb_t pccb_next;
     U32    status;
 
     pccb_next = pccb->pccbNext;
     pccb->pccbNext = NULL;
 
     if (!pccb->ccb)
     {
       AGTIAPI_PRINTK( "agtiapi_StartIO: pccb->ccb is NULL ERROR!\n" );
       pccb = pccb_next;
       continue;
     }
     AG_IO_DUMPCCB( pccb );
 
     if (!pccb->devHandle)
     {
       agtiapi_DumpCCB( pccb );
       AGTIAPI_PRINTK( "agtiapi_StartIO: ccb NULL device ERROR!\n" );
       pccb = pccb_next;
       continue;
     }
     AGTIAPI_IO( "agtiapi_StartIO: ccb %p retry %d\n", pccb, pccb->retryCount );
 
 #ifndef ABORT_TEST
     if( !pccb->devHandle || !pccb->devHandle->osData || /* in rmmod case */
         !(((ag_device_t *)(pccb->devHandle->osData))->flags & ACTIVE))
     {
       AGTIAPI_PRINTK( "agtiapi_StartIO: device %p not active! ERROR\n", 
                       pccb->devHandle );
       if( pccb->devHandle ) {
         AGTIAPI_PRINTK( "agtiapi_StartIO: device not active detail"
                         " -- osData:%p\n",
                         pccb->devHandle->osData );
         if( pccb->devHandle->osData ) {
           AGTIAPI_PRINTK( "agtiapi_StartIO: more device not active detail"
                           " -- active flag:%d\n",
                           ( (ag_device_t *)
                             (pccb->devHandle->osData))->flags & ACTIVE );
         }
       }
       pccb->ccbStatus  = tiIOFailed;
       pccb->scsiStatus = tiDetailNoLogin;
       agtiapi_Done( pmcsc, pccb );
       pccb = pccb_next;
       continue;
     }
 #endif
 
 #ifdef FAST_IO_TEST
     status = agtiapi_FastIOTest( pmcsc, pccb );
 #else
     status = tiINISuperIOStart( &pmcsc->tiRoot, 
                                 &pccb->tiIORequest,
                                 pccb->devHandle, 
                                 &pccb->tiSuperScsiRequest,
                                 (void *)&pccb->tdIOReqBody,
                                 tiInterruptContext );
 #endif
     switch( status )
     {
       case tiSuccess:
         /*
         static int squelchCount = 0;
         if ( 200000 == squelchCount++ ) // squelch prints
         {
           AGTIAPI_PRINTK( "agtiapi_StartIO: tiINIIOStart stat tiSuccess %p\n",
                           pccb );
           squelchCount = 0; // reset count
         }
         */
 
  
         break;   
       case tiDeviceBusy:
         AGTIAPI_PRINTK( "agtiapi_StartIO: tiINIIOStart status tiDeviceBusy %p\n",
                         pccb->ccb );
 #ifdef LOGEVENT 
         agtiapi_LogEvent( pmcsc,
                           IOCTL_EVT_SEV_INFORMATIONAL,
                           0,
                           agNULL,
                           0,
                           "tiINIIOStart tiDeviceBusy " );
 #endif
         pccb->ccbStatus = tiIOFailed;
         pccb->scsiStatus = tiDeviceBusy;        
         agtiapi_Done(pmcsc, pccb);
         break;
       case tiBusy:
         
         AGTIAPI_PRINTK( "agtiapi_StartIO: tiINIIOStart status tiBusy %p\n",
                         pccb->ccb );
 #ifdef LOGEVENT 
         agtiapi_LogEvent( pmcsc,
                           IOCTL_EVT_SEV_INFORMATIONAL,
                           0,
                           agNULL,
                           0,
                           "tiINIIOStart tiBusy " );
 #endif
 
         pccb->ccbStatus = tiIOFailed;
         pccb->scsiStatus = tiBusy;        
         agtiapi_Done(pmcsc, pccb);
 
         break;
       case tiIONoDevice:
         AGTIAPI_PRINTK( "agtiapi_StartIO: tiINIIOStart status tiNoDevice %p "
                         "ERROR\n", pccb->ccb );
 #ifdef LOGEVENT
         agtiapi_LogEvent( pmcsc,
                           IOCTL_EVT_SEV_INFORMATIONAL,
                           0,
                           agNULL,
                           0,
                           "tiINIIOStart invalid device handle " );
 #endif
 #ifndef ABORT_TEST
         /* return command back to OS due to no device available */
         ((ag_device_t *)(pccb->devHandle->osData))->flags &= ~ACTIVE;
         pccb->ccbStatus  = tiIOFailed;
         pccb->scsiStatus = tiDetailNoLogin;
         agtiapi_Done(pmcsc, pccb);
 #else
         /* for short cable pull, we want IO retried - 3-18-2005 */
         agtiapi_QueueCCB(pmcsc, &pmcsc->ccbSendHead, &pmcsc->ccbSendTail
                          AG_CARD_LOCAL_LOCK(&pmcsc->sendLock), pccb); 
 #endif
         break;
       case tiError:
         AGTIAPI_PRINTK("agtiapi_StartIO: tiINIIOStart status tiError %p\n",
                        pccb->ccb);
 #ifdef LOGEVENT
         agtiapi_LogEvent(pmcsc, 
                          IOCTL_EVT_SEV_INFORMATIONAL, 
                          0, 
                          agNULL, 
                          0, 
                          "tiINIIOStart tiError ");
 #endif
         pccb->ccbStatus  = tiIOFailed;
         pccb->scsiStatus = tiDetailOtherError;
         agtiapi_Done(pmcsc, pccb);
         break;
       default:
         AGTIAPI_PRINTK("agtiapi_StartIO: tiINIIOStart status default %x %p\n",
                        status, pccb->ccb);
 #ifdef LOGEVENT
         agtiapi_LogEvent(pmcsc, 
                          IOCTL_EVT_SEV_ERROR, 
                          0, 
                          agNULL, 
                          0, 
                          "tiINIIOStart unexpected status ");
 #endif
         pccb->ccbStatus  = tiIOFailed;
         pccb->scsiStatus = tiDetailOtherError;
         agtiapi_Done(pmcsc, pccb);
     }
     
     pccb = pccb_next;
   }
 ext:
   /* some IO requests might have been completed */
   AG_GET_DONE_PCCB(pccb, pmcsc);
   return;
 }
 
 /******************************************************************************
 agtiapi_StartSMP()
 
 Purpose:
   Send SMP request down for processing.
 Parameters:
   (struct agtiapi_softc *pmcsc (IN)  Pointer to HBA data structure
 Return:
 Note:
 ******************************************************************************/
 STATIC void agtiapi_StartSMP(struct agtiapi_softc *pmcsc)
 {
   ccb_t *pccb;
 
   AGTIAPI_PRINTK("agtiapi_StartSMP: start\n");
 
   AG_LOCAL_LOCK(&pmcsc->sendSMPLock);
   pccb = pmcsc->smpSendHead;
 
   /* if link is down, do nothing */
   if ((pccb == NULL) || pmcsc->flags & AGTIAPI_RESET)
   {
     AG_LOCAL_UNLOCK(&pmcsc->sendSMPLock);
     AGTIAPI_PRINTK("agtiapi_StartSMP: goto ext\n");
     goto ext;
   }
 
   /* clear send queue */
   pmcsc->smpSendHead = NULL;
   pmcsc->smpSendTail = NULL;
   AG_LOCAL_UNLOCK(&pmcsc->sendSMPLock);
 
   /* send all ccbs down */
   while (pccb)
   {
     pccb_t pccb_next;
     U32    status;
 
     pccb_next = pccb->pccbNext;
     pccb->pccbNext = NULL;
 
     if (!pccb->ccb)
     {
       AGTIAPI_PRINTK("agtiapi_StartSMP: pccb->ccb is NULL ERROR!\n");
       pccb = pccb_next;
       continue;
     }
 
     if (!pccb->devHandle)
     {
       AGTIAPI_PRINTK("agtiapi_StartSMP: ccb NULL device ERROR!\n");
       pccb = pccb_next;
       continue;
     }
     pccb->flags |= TAG_SMP; // mark as SMP for later tracking
     AGTIAPI_PRINTK( "agtiapi_StartSMP: ccb %p retry %d\n",
                     pccb, pccb->retryCount );
     status = tiINISMPStart( &pmcsc->tiRoot, 
                             &pccb->tiIORequest,
                             pccb->devHandle, 
                             &pccb->tiSMPFrame,
                             (void *)&pccb->tdIOReqBody,
                             tiInterruptContext);
 
     switch (status)
     {
     case tiSuccess:
       break;
     case tiBusy:
       AGTIAPI_PRINTK("agtiapi_StartSMP: tiINISMPStart status tiBusy %p\n",
                      pccb->ccb);
       /* pending ccb back to send queue */
       agtiapi_QueueCCB(pmcsc, &pmcsc->smpSendHead, &pmcsc->smpSendTail
                        AG_CARD_LOCAL_LOCK(&pmcsc->sendSMPLock), pccb);
       break;
     case tiError:
       AGTIAPI_PRINTK("agtiapi_StartIO: tiINIIOStart status tiError %p\n",
                      pccb->ccb);
       pccb->ccbStatus = tiSMPFailed;
       agtiapi_SMPDone(pmcsc, pccb);
       break;
     default:
       AGTIAPI_PRINTK("agtiapi_StartIO: tiINIIOStart status default %x %p\n",
                      status, pccb->ccb);
       pccb->ccbStatus = tiSMPFailed;
       agtiapi_SMPDone(pmcsc, pccb);
     }
 
     pccb = pccb_next;
   }
   ext:
   /* some SMP requests might have been completed */
   AG_GET_DONE_SMP_PCCB(pccb, pmcsc);
 
   return;
 }
 
 #if __FreeBSD_version > 901000
 /******************************************************************************
 agtiapi_PrepareSMPSGList()
 
 Purpose:
   This function prepares scatter-gather list for the given ccb
 Parameters:
   struct agtiapi_softc *pmsc (IN)  Pointer to the HBA data structure
   ccb_t *pccb (IN)      A pointer to the driver's own CCB, not CAM's CCB
 Return:
   0 - success
   1 - failure
 
 Note:
 ******************************************************************************/
 static int agtiapi_PrepareSMPSGList( struct agtiapi_softc *pmcsc, ccb_t *pccb )
 {
   /* Pointer to CAM's ccb */
   union ccb *ccb = pccb->ccb;
   struct ccb_smpio *csmpio = &ccb->smpio;
   struct ccb_hdr *ccbh = &ccb->ccb_h;
 
   AGTIAPI_PRINTK("agtiapi_PrepareSMPSGList: start\n");
   switch((ccbh->flags & CAM_DATA_MASK))
   {
     case CAM_DATA_PADDR:
     case CAM_DATA_SG_PADDR:
       AGTIAPI_PRINTK( "agtiapi_PrepareSMPSGList: Physical Address not supported\n");
       ccb->ccb_h.status = CAM_REQ_INVALID;
       xpt_done(ccb);
       return tiReject;
     case CAM_DATA_SG:
 
     /* 
      * Currently we do not support Multiple SG list 
      * return error for now 
      */
       if ( (csmpio->smp_request_sglist_cnt > 1)
            || (csmpio->smp_response_sglist_cnt > 1) )
       {
         AGTIAPI_PRINTK( "agtiapi_PrepareSMPSGList: Multiple SG list not supported\n");
         ccb->ccb_h.status = CAM_REQ_INVALID;
         xpt_done(ccb);
         return tiReject;
       }
     }
     if ( csmpio->smp_request_sglist_cnt != 0 )
     {
       /* 
        * Virtual address that needs to translated into
        * one or more physical address ranges.
        */
       int error;
       //AG_LOCAL_LOCK(&(pmcsc->pCardInfo->pmIOLock));  
       AGTIAPI_PRINTK("agtiapi_PrepareSGList: virtual address\n");
       error = bus_dmamap_load( pmcsc->buffer_dmat,
                                pccb->CCB_dmamap, 
                                csmpio->smp_request, 
                                csmpio->smp_request_len,
                                agtiapi_PrepareSMPSGListCB, 
                                pccb, 
                                BUS_DMA_NOWAIT /* 0 */ );
       
       //AG_LOCAL_UNLOCK(&(pmcsc->pCardInfo->pmIOLock));  
 
       if (error == EINPROGRESS)
       {
         /*
          * So as to maintain ordering,
          * freeze the controller queue
          * until our mapping is
          * returned.
          */
         AGTIAPI_PRINTK( "agtiapi_PrepareSGList: EINPROGRESS\n" );
         xpt_freeze_simq( pmcsc->sim, 1 );
         pmcsc->SimQFrozen = agTRUE;	
         ccbh->status |= CAM_RELEASE_SIMQ;
       }
     }
     if( csmpio->smp_response_sglist_cnt != 0 )
     {
       /*
        * Virtual address that needs to translated into
        * one or more physical address ranges.
        */
       int error;
       //AG_LOCAL_LOCK( &(pmcsc->pCardInfo->pmIOLock) );  
       AGTIAPI_PRINTK( "agtiapi_PrepareSGList: virtual address\n" );
       error = bus_dmamap_load( pmcsc->buffer_dmat,
                                pccb->CCB_dmamap, 
                                csmpio->smp_response, 
                                csmpio->smp_response_len,
                                agtiapi_PrepareSMPSGListCB, 
                                pccb, 
                                BUS_DMA_NOWAIT /* 0 */ );
       
       //AG_LOCAL_UNLOCK( &(pmcsc->pCardInfo->pmIOLock) );
 
       if ( error == EINPROGRESS )
       {
         /*
          * So as to maintain ordering,
          * freeze the controller queue
          * until our mapping is
          * returned.
          */
         AGTIAPI_PRINTK( "agtiapi_PrepareSGList: EINPROGRESS\n" );
         xpt_freeze_simq( pmcsc->sim, 1 );
         pmcsc->SimQFrozen = agTRUE;	
         ccbh->status |= CAM_RELEASE_SIMQ;
       }
     }
  
   else
   {
     if ( (csmpio->smp_request_sglist_cnt == 0) &&
          (csmpio->smp_response_sglist_cnt == 0) )
     {
       AGTIAPI_PRINTK( "agtiapi_PrepareSMPSGList: physical address\n" );
       pccb->tiSMPFrame.outFrameBuf = (void *)csmpio->smp_request;
       pccb->tiSMPFrame.outFrameLen = csmpio->smp_request_len;
       pccb->tiSMPFrame.expectedRespLen = csmpio->smp_response_len;
 
       // 0xFF to be defined
       agtiapi_PrepareSMPSGListCB( pccb, NULL, 0, 0xAABBCCDD );
     }
     pccb->tiSMPFrame.flag = 0;
   }
 
   return tiSuccess;
 }
 #else
 
 /******************************************************************************
 agtiapi_PrepareSMPSGList()
 
 Purpose:
   This function prepares scatter-gather list for the given ccb
 Parameters:
   struct agtiapi_softc *pmsc (IN)  Pointer to the HBA data structure
   ccb_t *pccb (IN)      A pointer to the driver's own CCB, not CAM's CCB
 Return:
   0 - success
   1 - failure
 
 Note:
 ******************************************************************************/
 static int agtiapi_PrepareSMPSGList( struct agtiapi_softc *pmcsc, ccb_t *pccb )
 {
   /* Pointer to CAM's ccb */
   union ccb *ccb = pccb->ccb;
   struct ccb_smpio *csmpio = &ccb->smpio;
   struct ccb_hdr *ccbh = &ccb->ccb_h;
 
   AGTIAPI_PRINTK("agtiapi_PrepareSMPSGList: start\n");
 
   if (ccbh->flags & (CAM_DATA_PHYS|CAM_SG_LIST_PHYS)) 
   {
     AGTIAPI_PRINTK( "agtiapi_PrepareSMPSGList: Physical Address "
                     "not supported\n" );
     ccb->ccb_h.status = CAM_REQ_INVALID;
     xpt_done(ccb);
     return tiReject;
   }
 
   if (ccbh->flags & CAM_SCATTER_VALID)
   {
     /* 
      * Currently we do not support Multiple SG list 
      * return error for now 
      */
     if ( (csmpio->smp_request_sglist_cnt > 1)
          || (csmpio->smp_response_sglist_cnt > 1) )
     {
       AGTIAPI_PRINTK( "agtiapi_PrepareSMPSGList: Multiple SG list "
                       "not supported\n" );
       ccb->ccb_h.status = CAM_REQ_INVALID;
       xpt_done(ccb);
       return tiReject;
     }
     if ( csmpio->smp_request_sglist_cnt != 0 )
     {
       /* 
        * Virtual address that needs to translated into
        * one or more physical address ranges.
        */
       int error;
       //AG_LOCAL_LOCK(&(pmcsc->pCardInfo->pmIOLock));  
       AGTIAPI_PRINTK("agtiapi_PrepareSGList: virtual address\n");
       error = bus_dmamap_load( pmcsc->buffer_dmat,
                                pccb->CCB_dmamap, 
                                csmpio->smp_request, 
                                csmpio->smp_request_len,
                                agtiapi_PrepareSMPSGListCB, 
                                pccb, 
                                BUS_DMA_NOWAIT /* 0 */ );
       
       //AG_LOCAL_UNLOCK(&(pmcsc->pCardInfo->pmIOLock));  
 
       if (error == EINPROGRESS)
       {
         /*
          * So as to maintain ordering,
          * freeze the controller queue
          * until our mapping is
          * returned.
          */
         AGTIAPI_PRINTK( "agtiapi_PrepareSGList: EINPROGRESS\n" );
         xpt_freeze_simq( pmcsc->sim, 1 );
         pmcsc->SimQFrozen = agTRUE;	
         ccbh->status |= CAM_RELEASE_SIMQ;
       }
     }
     if( csmpio->smp_response_sglist_cnt != 0 )
     {
       /*
        * Virtual address that needs to translated into
        * one or more physical address ranges.
        */
       int error;
       //AG_LOCAL_LOCK( &(pmcsc->pCardInfo->pmIOLock) );  
       AGTIAPI_PRINTK( "agtiapi_PrepareSGList: virtual address\n" );
       error = bus_dmamap_load( pmcsc->buffer_dmat,
                                pccb->CCB_dmamap, 
                                csmpio->smp_response, 
                                csmpio->smp_response_len,
                                agtiapi_PrepareSMPSGListCB, 
                                pccb, 
                                BUS_DMA_NOWAIT /* 0 */ );
       
       //AG_LOCAL_UNLOCK( &(pmcsc->pCardInfo->pmIOLock) );
 
       if ( error == EINPROGRESS )
       {
         /*
          * So as to maintain ordering,
          * freeze the controller queue
          * until our mapping is
          * returned.
          */
         AGTIAPI_PRINTK( "agtiapi_PrepareSGList: EINPROGRESS\n" );
         xpt_freeze_simq( pmcsc->sim, 1 );
         pmcsc->SimQFrozen = agTRUE;	
         ccbh->status |= CAM_RELEASE_SIMQ;
       }
     }
   }
   else
   {
     if ( (csmpio->smp_request_sglist_cnt == 0) &&
          (csmpio->smp_response_sglist_cnt == 0) )
     {
       AGTIAPI_PRINTK( "agtiapi_PrepareSMPSGList: physical address\n" );
       pccb->tiSMPFrame.outFrameBuf = (void *)csmpio->smp_request;
       pccb->tiSMPFrame.outFrameLen = csmpio->smp_request_len;
       pccb->tiSMPFrame.expectedRespLen = csmpio->smp_response_len;
 
       // 0xFF to be defined
       agtiapi_PrepareSMPSGListCB( pccb, NULL, 0, 0xAABBCCDD );
     }
     pccb->tiSMPFrame.flag = 0;
   }
 
   return tiSuccess;
 }
 
 #endif
 /******************************************************************************
 agtiapi_PrepareSMPSGListCB()
 
 Purpose:
   Callback function for bus_dmamap_load()
   This fuctions sends IO to LL layer.
 Parameters:
   void *arg (IN)                Pointer to the HBA data structure
   bus_dma_segment_t *segs (IN)  Pointer to dma segment
   int nsegs (IN)                number of dma segment
   int error (IN)                error
 Return:
 Note:
 ******************************************************************************/
 static void agtiapi_PrepareSMPSGListCB( void *arg,
                                         bus_dma_segment_t *segs,
                                         int nsegs,
                                         int error )
 {
   pccb_t                pccb = arg;
   union ccb            *ccb  = pccb->ccb;
   struct agtiapi_softc *pmcsc;
   U32        TID     = CMND_TO_TARGET(ccb);
   int status;
   tiDeviceHandle_t     *tiExpDevHandle;
   tiPortalContext_t    *tiExpPortalContext;
   ag_portal_info_t     *tiExpPortalInfo;
 
   AGTIAPI_PRINTK( "agtiapi_PrepareSMPSGListCB: start, nsegs %d error 0x%x\n",
                   nsegs, error );
   pmcsc = pccb->pmcsc;
 
   if ( error != tiSuccess )
   {
     if (error == 0xAABBCCDD)
     {
       // do nothing
     }
     else
     {
       AGTIAPI_PRINTK( "agtiapi_PrepareSMPSGListCB: error status 0x%x\n",
                       error );
       bus_dmamap_unload( pmcsc->buffer_dmat, pccb->CCB_dmamap );
       agtiapi_FreeCCB( pmcsc, pccb );
       if (error == EFBIG)
         ccb->ccb_h.status = CAM_REQ_TOO_BIG;
       else
         ccb->ccb_h.status = CAM_REQ_CMP_ERR;
       xpt_done( ccb );
       return;
     }
   }
 
   if ( nsegs > AGTIAPI_MAX_DMA_SEGS )
   {
     AGTIAPI_PRINTK( "agtiapi_PrepareSMPSGListCB: over the limit. nsegs %d "
                     "AGTIAPI_MAX_DMA_SEGS %d\n",
                     nsegs, AGTIAPI_MAX_DMA_SEGS );
     bus_dmamap_unload( pmcsc->buffer_dmat, pccb->CCB_dmamap );
     agtiapi_FreeCCB( pmcsc, pccb );
     ccb->ccb_h.status = CAM_REQ_TOO_BIG;
     xpt_done( ccb );
     return;
   }
 
   /*
    * If assigned pDevHandle is not available
    * then there is no need to send it to StartIO()
    */
   /* TODO: Add check for deviceType */
   if ( pccb->targetId < 0 || pccb->targetId >= maxTargets )
   {
     agtiapi_FreeCCB( pmcsc, pccb );
     ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
     xpt_done(ccb);
     pccb->ccb        = NULL; 
     return;
   }
   TID = INDEX( pmcsc, pccb->targetId );
   if ( (TID >= pmcsc->devDiscover) ||
        !(pccb->devHandle = pmcsc->pDevList[TID].pDevHandle) )
   {
     AGTIAPI_PRINTK( "agtiapi_PrepareSMPSGListCB: not sending ccb devH %p, "
                     "target %d tid %d/%d "
                     "card %p ERROR pccb %p\n",
                     pccb->devHandle,
                     pccb->targetId,
                     TID, 
                     pmcsc->devDiscover,
                     pmcsc,
                     pccb );
     agtiapi_FreeCCB( pmcsc, pccb );
     ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
     xpt_done( ccb );
     pccb->ccb        = NULL; 
     return;
   }
   /* TODO: add indirect handling */
   /* set the flag correctly based on Indiret SMP request and response */
 
   AGTIAPI_PRINTK( "agtiapi_PrepareSMPSGListCB: send ccb pccb->devHandle %p, "
                   "pccb->targetId %d TID %d pmcsc->devDiscover %d card %p\n",
                   pccb->devHandle,
                   pccb->targetId, TID,
                   pmcsc->devDiscover,
                   pmcsc );
   tiExpDevHandle = pccb->devHandle;
   tiExpPortalInfo = pmcsc->pDevList[TID].pPortalInfo;
   tiExpPortalContext = &tiExpPortalInfo->tiPortalContext;
   /* Look for the expander associated with the ses device */
   status = tiINIGetExpander( &pmcsc->tiRoot, 
                              tiExpPortalContext,
                              pccb->devHandle, 
                              &tiExpDevHandle );
 
   if ( status != tiSuccess )
   {
     AGTIAPI_PRINTK( "agtiapi_PrepareSMPSGListCB: Error getting Expander "
                     "device\n" );
     agtiapi_FreeCCB( pmcsc, pccb );
     ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
     xpt_done( ccb );
     pccb->ccb        = NULL; 
     return;
   }
 	
   /* this is expander device */
   pccb->devHandle = tiExpDevHandle;
   /* put the request in send queue */
   agtiapi_QueueCCB( pmcsc, &pmcsc->smpSendHead, &pmcsc->smpSendTail
                     AG_CARD_LOCAL_LOCK(&pmcsc->sendSMPLock), pccb );
 
   agtiapi_StartSMP( pmcsc );
 
   return;
 }
 
 
 /******************************************************************************
 agtiapi_Done()
 
 Purpose:
   Processing completed ccbs
 Parameters:
   struct agtiapi_softc *pmcsc (IN)   Pointer to HBA data structure
   ccb_t *pccb (IN)     A pointer to the driver's own CCB, not CAM's CCB
 Return:
 Note:
 ******************************************************************************/
 STATIC void agtiapi_Done(struct agtiapi_softc *pmcsc, ccb_t *pccb)
 {
   pccb_t pccb_curr = pccb;
   pccb_t pccb_next;
 
   tiIniScsiCmnd_t *cmnd;
   union ccb * ccb;
 
   AGTIAPI_IO("agtiapi_Done: start\n");
   while (pccb_curr)
   {
     /* start from 1st ccb in the chain */
     pccb_next = pccb_curr->pccbNext;
 
     if (agtiapi_CheckError(pmcsc, pccb_curr) != 0)
     {
       /* send command back and release the ccb */
       cmnd = &pccb_curr->tiSuperScsiRequest.scsiCmnd;
 
       if (cmnd->cdb[0] == RECEIVE_DIAGNOSTIC)
       {
         AGTIAPI_PRINTK("agtiapi_Done: RECEIVE_DIAG pg %d id %d cmnd %p pccb "
                        "%p\n", cmnd->cdb[2], pccb_curr->targetId, cmnd,
                        pccb_curr);
       }
 
       CMND_DMA_UNMAP(pmcsc, ccb);
 
       /* send the request back to the CAM */
       ccb = pccb_curr->ccb;
       agtiapi_FreeCCB(pmcsc, pccb_curr);
       xpt_done(ccb);
 	}
     pccb_curr = pccb_next;
   }
   return;
 }
 
 /******************************************************************************
 agtiapi_SMPDone()
 
 Purpose:
   Processing completed ccbs
 Parameters:
   struct agtiapi_softc *pmcsc (IN)  Ponter to HBA data structure
   ccb_t *pccb (IN)                  A pointer to the driver's own CCB, not
                                     CAM's CCB
 Return:
 Note:
 ******************************************************************************/
 STATIC void agtiapi_SMPDone(struct agtiapi_softc *pmcsc, ccb_t *pccb)
 {
   pccb_t pccb_curr = pccb;
   pccb_t pccb_next;
 
   union ccb * ccb;
 
   AGTIAPI_PRINTK("agtiapi_SMPDone: start\n");
 
   while (pccb_curr)
   {
     /* start from 1st ccb in the chain */
     pccb_next = pccb_curr->pccbNext;
 
     if (agtiapi_CheckSMPError(pmcsc, pccb_curr) != 0)
     {
       CMND_DMA_UNMAP(pmcsc, ccb);
 
       /* send the request back to the CAM */
       ccb = pccb_curr->ccb;
       agtiapi_FreeSMPCCB(pmcsc, pccb_curr);
       xpt_done(ccb);
 
     }
     pccb_curr = pccb_next;
   }
 
   AGTIAPI_PRINTK("agtiapi_SMPDone: Done\n");
   return;
 }
 
 /******************************************************************************
 agtiapi_hexdump()
 
 Purpose:
   Utility function for dumping in hex
 Parameters:
   const char *ptitle (IN)  A string to be printed
   bit8 *pbuf (IN)          A pointer to a buffer to be printed. 
   int len (IN)             The lengther of the buffer
 Return:
 Note:
 ******************************************************************************/
 void agtiapi_hexdump(const char *ptitle, bit8 *pbuf, int len)
 {
   int i;
   AGTIAPI_PRINTK("%s - hexdump(len=%d):\n", ptitle, (int)len);
   if (!pbuf)
   {
     AGTIAPI_PRINTK("pbuf is NULL\n");
     return;
   }
   for (i = 0; i < len; )
   {
     if (len - i > 4)
     {
       AGTIAPI_PRINTK( " 0x%02x, 0x%02x, 0x%02x, 0x%02x,\n", pbuf[i], pbuf[i+1],
                       pbuf[i+2], pbuf[i+3] );
       i += 4;
     }
     else
     {
       AGTIAPI_PRINTK(" 0x%02x,", pbuf[i]);
       i++;
     }
   }
   AGTIAPI_PRINTK("\n");
 }
 
 
 /******************************************************************************
 agtiapi_CheckError()
 
 Purpose:
   Processes status pertaining to the ccb -- whether it was
   completed successfully, aborted, or error encountered.
 Parameters: 
   ag_card_t *pCard (IN)  Pointer to HBA data structure
   ccb_t *pccd (IN)       A pointer to the driver's own CCB, not CAM's CCB
 Return:
   0 - the command retry is required
   1 - the command process is completed
 Note:    
 
 ******************************************************************************/
 STATIC U32 agtiapi_CheckError(struct agtiapi_softc *pmcsc, ccb_t *pccb)
 {
   ag_device_t      *pDevice;
   // union ccb * ccb = pccb->ccb;
   union ccb * ccb;
   int is_error, TID;
 
   if (pccb == NULL) {
     return 0;
   }
   ccb = pccb->ccb;
   AGTIAPI_IO("agtiapi_CheckError: start\n");
   if (ccb == NULL)
   {
     /* shouldn't be here but just in case we do */
     AGTIAPI_PRINTK("agtiapi_CheckError: CCB orphan = %p ERROR\n", pccb);
     agtiapi_FreeCCB(pmcsc, pccb);
     return 0;
   }
 
   is_error = 1;
   pDevice = NULL;
   if (pmcsc != NULL && pccb->targetId >= 0 && pccb->targetId < maxTargets)
   {
     if (pmcsc->pWWNList != NULL)
     {
       TID = INDEX(pmcsc, pccb->targetId);
       if (TID < maxTargets)
       {
         pDevice = &pmcsc->pDevList[TID];
         if (pDevice != NULL)
         {
           is_error = 0;
         }
       }
     }
   }
   if (is_error)
   {
     AGTIAPI_PRINTK("agtiapi_CheckError: pDevice == NULL\n");
     agtiapi_FreeCCB(pmcsc, pccb);
     return 0;
   }
 
   /* SCSI status */
   ccb->csio.scsi_status = pccb->scsiStatus;
 
    if(pDevice->CCBCount > 0){
     atomic_subtract_int(&pDevice->CCBCount,1);
 }
   AG_LOCAL_LOCK(&pmcsc->freezeLock);
   if(pmcsc->freezeSim == agTRUE)
   { 
     pmcsc->freezeSim = agFALSE;
     xpt_release_simq(pmcsc->sim, 1); 
   }
   AG_LOCAL_UNLOCK(&pmcsc->freezeLock);
 
   switch (pccb->ccbStatus)
   {
   case tiIOSuccess:
     AGTIAPI_IO("agtiapi_CheckError: tiIOSuccess pccb %p\n", pccb);
     /* CAM status */
     if (pccb->scsiStatus == SCSI_STATUS_OK)
     {
       ccb->ccb_h.status = CAM_REQ_CMP;
     }
     else
       if (pccb->scsiStatus == SCSI_TASK_ABORTED)
     {
       ccb->ccb_h.status = CAM_REQ_ABORTED;
     }
     else
     {
       ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR;
     }
     if (ccb->csio.scsi_status == SCSI_CHECK_CONDITION)
     {
       ccb->ccb_h.status |= CAM_AUTOSNS_VALID;
     }
  
     break;
 
   case tiIOOverRun:
     AGTIAPI_PRINTK("agtiapi_CheckError: tiIOOverRun pccb %p\n", pccb);
     /* resid is ignored for this condition */
     ccb->csio.resid = 0;
     ccb->ccb_h.status = CAM_DATA_RUN_ERR;
     break;
   case tiIOUnderRun:
     AGTIAPI_PRINTK("agtiapi_CheckError: tiIOUnderRun pccb %p\n", pccb);
     ccb->csio.resid = pccb->scsiStatus;
     ccb->ccb_h.status = CAM_REQ_CMP;
     ccb->csio.scsi_status = SCSI_STATUS_OK;
     break;
 
   case tiIOFailed:
     AGTIAPI_PRINTK( "agtiapi_CheckError: pccb %p tiIOFailed %d id %d ERROR\n",
                     pccb, pccb->scsiStatus, pccb->targetId );
     if (pccb->scsiStatus == tiDeviceBusy)
     {
       AGTIAPI_IO( "agtiapi_CheckError: pccb %p tiIOFailed - tiDetailBusy\n",
                   pccb );
       ccb->ccb_h.status &= ~CAM_STATUS_MASK;
       ccb->ccb_h.status |= CAM_REQUEUE_REQ;
       if ((ccb->ccb_h.status & CAM_DEV_QFRZN) == 0) 
       {
         ccb->ccb_h.status |= CAM_DEV_QFRZN;
         xpt_freeze_devq(ccb->ccb_h.path, /*count*/1);
       }
     }
     else if(pccb->scsiStatus == tiBusy)
     {
       AG_LOCAL_LOCK(&pmcsc->freezeLock);
       if(pmcsc->freezeSim == agFALSE)
       {
         pmcsc->freezeSim = agTRUE;
         xpt_freeze_simq(pmcsc->sim, 1);
       }
       AG_LOCAL_UNLOCK(&pmcsc->freezeLock);
       ccb->ccb_h.status &= ~CAM_SIM_QUEUED;
       ccb->ccb_h.status |= CAM_REQUEUE_REQ;
     }
     else if (pccb->scsiStatus == tiDetailNoLogin)
     {
       AGTIAPI_PRINTK( "agtiapi_CheckError: pccb %p tiIOFailed - "
                       "tiDetailNoLogin ERROR\n", pccb );
       ccb->ccb_h.status = CAM_DEV_NOT_THERE;
     }
     else if (pccb->scsiStatus == tiDetailNotValid)
     {
       AGTIAPI_PRINTK( "agtiapi_CheckError: pccb %p tiIOFailed - "
                       "tiDetailNotValid ERROR\n", pccb );
       ccb->ccb_h.status = CAM_REQ_INVALID;
     }
     else if (pccb->scsiStatus == tiDetailAbortLogin)
     {
       AGTIAPI_PRINTK( "agtiapi_CheckError: pccb %p tiIOFailed - "
                       "tiDetailAbortLogin ERROR\n", pccb );
       ccb->ccb_h.status = CAM_REQ_ABORTED;
     }
     else if (pccb->scsiStatus == tiDetailAbortReset)
     {
       AGTIAPI_PRINTK( "agtiapi_CheckError: pccb %p tiIOFailed - "
                       "tiDetailAbortReset ERROR\n", pccb );
       ccb->ccb_h.status = CAM_REQ_ABORTED;
     }
     else if (pccb->scsiStatus == tiDetailAborted)
     {
       AGTIAPI_PRINTK( "agtiapi_CheckError: pccb %p tiIOFailed - "
                       "tiDetailAborted ERROR\n", pccb );
       ccb->ccb_h.status = CAM_REQ_ABORTED;
     }
     else if (pccb->scsiStatus == tiDetailOtherError)
     {
       AGTIAPI_PRINTK( "agtiapi_CheckError: pccb %p tiIOFailed - "
                       "tiDetailOtherError ERROR\n", pccb );
       ccb->ccb_h.status = CAM_REQ_ABORTED;
     }
     break;
   case tiIODifError:
     AGTIAPI_PRINTK( "agtiapi_CheckError: pccb %p tiIOFailed %d id %d ERROR\n",
                     pccb, pccb->scsiStatus, pccb->targetId );
     if (pccb->scsiStatus == tiDetailDifAppTagMismatch)
     {
       AGTIAPI_IO( "agtiapi_CheckError: pccb %p tiIOFailed - "
                   "tiDetailDifAppTagMismatch\n", pccb );
       ccb->ccb_h.status = CAM_REQ_CMP_ERR;
     }
     else if (pccb->scsiStatus == tiDetailDifRefTagMismatch)
     {
       AGTIAPI_PRINTK( "agtiapi_CheckError: pccb %p tiIOFailed - "
                       "tiDetailDifRefTagMismatch\n", pccb );
       ccb->ccb_h.status = CAM_REQ_CMP_ERR;
     }
     else if (pccb->scsiStatus == tiDetailDifCrcMismatch)
     {
       AGTIAPI_PRINTK( "agtiapi_CheckError: pccb %p tiIOFailed - "
                       "tiDetailDifCrcMismatch\n", pccb );
       ccb->ccb_h.status = CAM_REQ_CMP_ERR;
     }
     break;
 #ifdef HIALEAH_ENCRYPTION
   case tiIOEncryptError:
     AGTIAPI_PRINTK( "agtiapi_CheckError: pccb %p tiIOFailed %d id %d ERROR\n",
                     pccb, pccb->scsiStatus, pccb->targetId );
     if (pccb->scsiStatus == tiDetailDekKeyCacheMiss) 
     {
       AGTIAPI_PRINTK( "agtiapi_CheckError: %s: pccb %p tiIOFailed - "
                       "tiDetailDekKeyCacheMiss ERROR\n",
                       __FUNCTION__, pccb );
       ccb->ccb_h.status = CAM_REQ_ABORTED;
       agtiapi_HandleEncryptedIOFailure(pDevice, pccb);
     }
     else if (pccb->scsiStatus == tiDetailDekIVMismatch)
     {
       AGTIAPI_PRINTK( "agtiapi_CheckError: %s: pccb %p tiIOFailed - "
                       "tiDetailDekIVMismatch ERROR\n", __FUNCTION__, pccb );
       ccb->ccb_h.status = CAM_REQ_ABORTED;
       agtiapi_HandleEncryptedIOFailure(pDevice, pccb);
     }
     break;
 #endif
   default:
     AGTIAPI_PRINTK( "agtiapi_CheckError: pccb %p tiIOdefault %d id %d ERROR\n",
                     pccb, pccb->ccbStatus, pccb->targetId );
     ccb->ccb_h.status = CAM_REQ_CMP_ERR;
     break;
   }
 
   return 1;
 }
 
 
 /******************************************************************************
 agtiapi_SMPCheckError()
 
 Purpose:
   Processes status pertaining to the ccb -- whether it was
   completed successfully, aborted, or error encountered.
 Parameters: 
   ag_card_t *pCard (IN)  Pointer to HBA data structure
   ccb_t *pccd (IN)       A pointer to the driver's own CCB, not CAM's CCB
 Return:
   0 - the command retry is required
   1 - the command process is completed
 Note:    
 
 ******************************************************************************/
 STATIC U32 agtiapi_CheckSMPError( struct agtiapi_softc *pmcsc, ccb_t *pccb )
 {
 	union ccb * ccb = pccb->ccb;
 
 	AGTIAPI_PRINTK("agtiapi_CheckSMPError: start\n");
 
 	if (!ccb)
 	{
 		/* shouldn't be here but just in case we do */
 		AGTIAPI_PRINTK( "agtiapi_CheckSMPError: CCB orphan = %p ERROR\n",
                               pccb );
 		agtiapi_FreeSMPCCB(pmcsc, pccb);
 		return 0;
 	}
 
 	switch (pccb->ccbStatus)
 	{
 	case tiSMPSuccess:
 		AGTIAPI_PRINTK( "agtiapi_CheckSMPError: tiSMPSuccess pccb %p\n",
                               pccb );
 		/* CAM status */
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
   case tiSMPFailed:
 		AGTIAPI_PRINTK( "agtiapi_CheckSMPError: tiSMPFailed pccb %p\n",
                               pccb );
 		/* CAM status */
 		ccb->ccb_h.status = CAM_REQ_CMP_ERR;
 		break;
   default:
 		AGTIAPI_PRINTK( "agtiapi_CheckSMPError: pccb %p tiSMPdefault %d "
                               "id %d ERROR\n",
                               pccb, 
                               pccb->ccbStatus,
                               pccb->targetId );
 		ccb->ccb_h.status = CAM_REQ_CMP_ERR;
 		break;
 	}
 
 
   return 1;
 
 }
 
 /******************************************************************************
 agtiapi_HandleEncryptedIOFailure():
 
 Purpose:
 Parameters:
 Return:
 Note: 
   Currently not used.
 ******************************************************************************/
 void agtiapi_HandleEncryptedIOFailure(ag_device_t *pDev, ccb_t *pccb)
 {
   
   AGTIAPI_PRINTK("agtiapi_HandleEncryptedIOFailure: start\n");
   return;
 }
 
 /******************************************************************************
 agtiapi_Retry()
 
 Purpose:
   Retry a ccb.
 Parameters: 
   struct agtiapi_softc *pmcsc (IN)  Pointer to the HBA structure
   ccb_t *pccb (IN)            A pointer to the driver's own CCB, not CAM's CCB 
 Return:
 Note:
   Currently not used.    
 ******************************************************************************/
 STATIC void agtiapi_Retry(struct agtiapi_softc *pmcsc, ccb_t *pccb)
 {
   pccb->retryCount++;
   pccb->flags      = ACTIVE | AGTIAPI_RETRY;
   pccb->ccbStatus  = 0;
   pccb->scsiStatus = 0;
   pccb->startTime  = ticks;
 
   AGTIAPI_PRINTK( "agtiapi_Retry: start\n" );
   AGTIAPI_PRINTK( "agtiapi_Retry: ccb %p retry %d flgs x%x\n", pccb,
                   pccb->retryCount, pccb->flags );
 
   agtiapi_QueueCCB(pmcsc, &pmcsc->ccbSendHead, &pmcsc->ccbSendTail
                    AG_CARD_LOCAL_LOCK(&pmcsc->sendLock), pccb);
   return;
 }
 
 
 /******************************************************************************
 agtiapi_DumpCCB()
 
 Purpose:
   Dump CCB for debuging
 Parameters:
   ccb_t *pccb (IN)  A pointer to the driver's own CCB, not CAM's CCB
 Return:
 Note:
 ******************************************************************************/
 STATIC void agtiapi_DumpCCB(ccb_t *pccb)
 {
   AGTIAPI_PRINTK("agtiapi_DumpCCB: pccb %p, devHandle %p, tid %d, lun %d\n", 
          pccb, 
          pccb->devHandle, 
          pccb->targetId, 
          pccb->lun);
   AGTIAPI_PRINTK("flag 0x%x, add_mode 0x%x, ccbStatus 0x%x, scsiStatus 0x%x\n", 
          pccb->flags,
          pccb->addrMode, 
          pccb->ccbStatus, 
          pccb->scsiStatus);
   AGTIAPI_PRINTK("scsi comand = 0x%x, numSgElements = %d\n", 
 	 pccb->tiSuperScsiRequest.scsiCmnd.cdb[0],
          pccb->numSgElements);
   AGTIAPI_PRINTK("dataLen = 0x%x, sens_len = 0x%x\n",
          pccb->dataLen, 
          pccb->senseLen);
   AGTIAPI_PRINTK("tiSuperScsiRequest:\n");
   AGTIAPI_PRINTK("scsiCmnd: expDataLength 0x%x, taskAttribute 0x%x\n",
          pccb->tiSuperScsiRequest.scsiCmnd.expDataLength,
          pccb->tiSuperScsiRequest.scsiCmnd.taskAttribute);
   AGTIAPI_PRINTK("cdb[0] = 0x%x, cdb[1] = 0x%x, cdb[2] = 0x%x, cdb[3] = 0x%x\n",
          pccb->tiSuperScsiRequest.scsiCmnd.cdb[0], 
          pccb->tiSuperScsiRequest.scsiCmnd.cdb[1], 
          pccb->tiSuperScsiRequest.scsiCmnd.cdb[2], 
          pccb->tiSuperScsiRequest.scsiCmnd.cdb[3]); 
   AGTIAPI_PRINTK("cdb[4] = 0x%x, cdb[5] = 0x%x, cdb[6] = 0x%x, cdb[7] = 0x%x\n",
          pccb->tiSuperScsiRequest.scsiCmnd.cdb[4], 
          pccb->tiSuperScsiRequest.scsiCmnd.cdb[5], 
          pccb->tiSuperScsiRequest.scsiCmnd.cdb[6], 
          pccb->tiSuperScsiRequest.scsiCmnd.cdb[7]);
   AGTIAPI_PRINTK( "cdb[8] = 0x%x, cdb[9] = 0x%x, cdb[10] = 0x%x, "
                   "cdb[11] = 0x%x\n",
                   pccb->tiSuperScsiRequest.scsiCmnd.cdb[8], 
                   pccb->tiSuperScsiRequest.scsiCmnd.cdb[9], 
                   pccb->tiSuperScsiRequest.scsiCmnd.cdb[10], 
                   pccb->tiSuperScsiRequest.scsiCmnd.cdb[11] );
   AGTIAPI_PRINTK("agSgl1: upper 0x%x, lower 0x%x, len 0x%x, type %d\n",
          pccb->tiSuperScsiRequest.agSgl1.upper, 
          pccb->tiSuperScsiRequest.agSgl1.lower, 
          pccb->tiSuperScsiRequest.agSgl1.len, 
          pccb->tiSuperScsiRequest.agSgl1.type); 
 }
 
 /******************************************************************************
 agtiapi_eh_HostReset()
 
 Purpose:
   A new error handler of Host Reset command.
 Parameters:
   scsi_cmnd *cmnd (IN)  Pointer to a command to the HBA to be reset
 Return:
   SUCCESS - success
   FAILED  - fail
 Note:
 ******************************************************************************/
 int agtiapi_eh_HostReset( struct agtiapi_softc *pmcsc, union ccb *cmnd )
 {
   AGTIAPI_PRINTK( "agtiapi_eh_HostReset: ccb pointer %p\n",
                   cmnd );
 
   if( cmnd == NULL )
   {
     printf( "agtiapi_eh_HostReset: null command, skipping reset.\n" );
     return tiInvalidHandle;
   }
 
 #ifdef LOGEVENT
   agtiapi_LogEvent( pmcsc,
                     IOCTL_EVT_SEV_INFORMATIONAL,
                     0,
                     agNULL,
                     0,
                     "agtiapi_eh_HostReset! " );
 #endif
 
   return agtiapi_DoSoftReset( pmcsc );
 }
 
 
 /******************************************************************************
 agtiapi_QueueCCB()
 
 Purpose:
   Put ccb in ccb queue at the tail
 Parameters:
   struct agtiapi_softc *pmcsc (IN)  Pointer to HBA data structure
   pccb_t *phead (IN)                Double pointer to ccb queue head
   pccb_t *ptail (IN)                Double pointer to ccb queue tail
   ccb_t *pccb (IN)                  Poiner to a ccb to be queued
 Return:
 Note:
   Put the ccb to the tail of queue
 ******************************************************************************/
 STATIC void agtiapi_QueueCCB( struct agtiapi_softc *pmcsc,
                               pccb_t *phead,
                               pccb_t *ptail, 
 #ifdef AGTIAPI_LOCAL_LOCK
                               struct mtx *mutex,
 #endif
                               ccb_t *pccb )
 {
   AGTIAPI_IO( "agtiapi_QueueCCB: start\n" );
   AGTIAPI_IO( "agtiapi_QueueCCB: %p to %p\n", pccb, phead );
   if (phead == NULL || ptail == NULL)
   {
     panic( "agtiapi_QueueCCB: phead %p ptail %p", phead, ptail );
   }
   pccb->pccbNext = NULL;
   AG_LOCAL_LOCK( mutex );
   if (*phead == NULL)
   {
     //WARN_ON(*ptail != NULL); /* critical, just get more logs */
     *phead = pccb;
   }
   else
   {
     //WARN_ON(*ptail == NULL); /* critical, just get more logs */
     if (*ptail)
       (*ptail)->pccbNext = pccb;
   }
   *ptail = pccb;
   AG_LOCAL_UNLOCK( mutex );
   return;
 }
 
 
 /******************************************************************************
 agtiapi_QueueCCB()
 
 Purpose:
  
 Parameters:
   
   
 Return:
 Note:
   
 ******************************************************************************/
 static int agtiapi_QueueSMP(struct agtiapi_softc *pmcsc, union ccb * ccb)
 {
   pccb_t pccb = agNULL; /* call dequeue */
   int        status = tiSuccess;
   int        targetID = xpt_path_target_id(ccb->ccb_h.path);
 
   AGTIAPI_PRINTK("agtiapi_QueueSMP: start\n");  
 
   /* get a ccb */
   if ((pccb = agtiapi_GetCCB(pmcsc)) == NULL)
   {
     AGTIAPI_PRINTK("agtiapi_QueueSMP: GetCCB ERROR\n");
     ccb->ccb_h.status = CAM_REQ_CMP_ERR;
     xpt_done(ccb);
     return tiBusy;
   }
   pccb->pmcsc = pmcsc;
 
   /* initialize Command Control Block (CCB) */
   pccb->targetId   = targetID;
   pccb->ccb        = ccb;	/* for struct scsi_cmnd */
 
   status = agtiapi_PrepareSMPSGList(pmcsc, pccb);
 
   if (status != tiSuccess)
   {
     AGTIAPI_PRINTK("agtiapi_QueueSMP: agtiapi_PrepareSMPSGList failure\n");
     agtiapi_FreeCCB(pmcsc, pccb);
     if (status == tiReject)
     {
       ccb->ccb_h.status = CAM_REQ_INVALID;
     }
     else
     {
       ccb->ccb_h.status = CAM_REQ_CMP;
     }
     xpt_done(ccb);
     return tiError;
   }
 
   return status;
 }
 
 /******************************************************************************
 agtiapi_SetLunField()
 
 Purpose:
   Set LUN field based on different address mode
 Parameters:
   ccb_t *pccb (IN)  A pointer to the driver's own CCB, not CAM's CCB
 Return:
 Note:
 ******************************************************************************/
 void agtiapi_SetLunField(ccb_t *pccb)
 {
   U08 *pchar;
 
   pchar = (U08 *)&pccb->tiSuperScsiRequest.scsiCmnd.lun;
 
 //  AGTIAPI_PRINTK("agtiapi_SetLunField: start\n");
   
   switch (pccb->addrMode)
   {
   case AGTIAPI_PERIPHERAL:
        *pchar++ = 0;
        *pchar   = (U08)pccb->lun;
        break;
   case AGTIAPI_VOLUME_SET:
        *pchar++ = (AGTIAPI_VOLUME_SET << AGTIAPI_ADDRMODE_SHIFT) | 
                   (U08)((pccb->lun >> 8) & 0x3F);
        *pchar   = (U08)pccb->lun;
        break;
   case AGTIAPI_LUN_ADDR:
        *pchar++ = (AGTIAPI_LUN_ADDR << AGTIAPI_ADDRMODE_SHIFT) | 
                   pccb->targetId;
        *pchar   = (U08)pccb->lun;
        break;
   }
 
 
 }
 
 
 /*****************************************************************************
 agtiapi_FreeCCB()
 
 Purpose:
   Free a ccb and put it back to ccbFreeList.
 Parameters:
   struct agtiapi_softc *pmcsc (IN)  Pointer to HBA data structure
   pccb_t pccb (IN)                  A pointer to the driver's own CCB, not
                                     CAM's CCB
 Returns:
 Note:
 *****************************************************************************/
 STATIC void agtiapi_FreeCCB(struct agtiapi_softc *pmcsc, pccb_t pccb)
 {
   union ccb *ccb = pccb->ccb;
   bus_dmasync_op_t op;
 
   AG_LOCAL_LOCK(&pmcsc->ccbLock);
   AGTIAPI_IO( "agtiapi_FreeCCB: start %p\n", pccb );
 
 #ifdef AGTIAPI_TEST_EPL
   tiEncrypt_t *encrypt;
 #endif
 
   agtiapi_DumpCDB( "agtiapi_FreeCCB", pccb );
 
   if (pccb->sgList != agNULL)
   {
     AGTIAPI_IO( "agtiapi_FreeCCB: pccb->sgList is NOT null\n" );
   }
   else
   {
     AGTIAPI_PRINTK( "agtiapi_FreeCCB: pccb->sgList is null\n" );
   }
 
   /* set data transfer direction */
   if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_OUT) 
   {
     op = BUS_DMASYNC_POSTWRITE;
   }
   else 
   {
     op = BUS_DMASYNC_POSTREAD;
   }
 
   if (pccb->numSgElements == 0)
   {
     // do nothing
     AGTIAPI_IO( "agtiapi_FreeCCB: numSgElements zero\n" );
   }
   else if (pccb->numSgElements == 1)
   {
     AGTIAPI_IO( "agtiapi_FreeCCB: numSgElements is one\n" );
     //op is either BUS_DMASYNC_POSTWRITE or BUS_DMASYNC_POSTREAD
     bus_dmamap_sync(pmcsc->buffer_dmat, pccb->CCB_dmamap, op);
     bus_dmamap_unload(pmcsc->buffer_dmat, pccb->CCB_dmamap);
   }
   else
   {
     AGTIAPI_PRINTK( "agtiapi_FreeCCB: numSgElements 2 or higher \n" );
     //op is either BUS_DMASYNC_POSTWRITE or BUS_DMASYNC_POSTREAD
     bus_dmamap_sync(pmcsc->buffer_dmat, pccb->CCB_dmamap, op);
     bus_dmamap_unload(pmcsc->buffer_dmat, pccb->CCB_dmamap);
   }
 
 #ifdef AGTIAPI_TEST_DPL
   if (pccb->tiSuperScsiRequest.Dif.enableDIFPerLA == TRUE) {
     if(pccb->dplPtr)
         memset( (char *) pccb->dplPtr,
                 0,
                 MAX_DPL_REGIONS * sizeof(dplaRegion_t) );
     pccb->tiSuperScsiRequest.Dif.enableDIFPerLA = FALSE;
     pccb->tiSuperScsiRequest.Dif.DIFPerLAAddrLo = 0;
     pccb->tiSuperScsiRequest.Dif.DIFPerLAAddrHi = 0;
   }
 #endif
 
 #ifdef AGTIAPI_TEST_EPL
   encrypt = &pccb->tiSuperScsiRequest.Encrypt;
   if (encrypt->enableEncryptionPerLA == TRUE) {
     encrypt->enableEncryptionPerLA = FALSE;
     encrypt->EncryptionPerLAAddrLo = 0;
     encrypt->EncryptionPerLAAddrHi = 0;
   }
 #endif
 
 #ifdef ENABLE_SATA_DIF
   if (pccb->holePtr && pccb->dmaHandleHole)
     pci_free_consistent( pmcsc->pCardInfo->pPCIDev,
                          512,
                          pccb->holePtr,
                          pccb->dmaHandleHole );
   pccb->holePtr    = 0;
   pccb->dmaHandleHole = 0;
 #endif
 
   pccb->dataLen    = 0;
   pccb->retryCount = 0;
   pccb->ccbStatus  = 0;
   pccb->scsiStatus = 0;
   pccb->startTime  = 0;
   pccb->dmaHandle  = 0;
   pccb->numSgElements = 0;
   pccb->tiIORequest.tdData = 0;
   memset((void *)&pccb->tiSuperScsiRequest, 0, AGSCSI_INIT_XCHG_LEN);
 
 #ifdef HIALEAH_ENCRYPTION
   if (pmcsc->encrypt)
     agtiapi_CleanupEncryptedIO(pmcsc, pccb);
 #endif
 
   pccb->flags      = 0;
   pccb->ccb        = NULL;
   pccb->pccbIO = NULL;
   pccb->pccbNext     = (pccb_t)pmcsc->ccbFreeList;
   pmcsc->ccbFreeList = (caddr_t *)pccb;
 
   pmcsc->activeCCB--;
 
   AG_LOCAL_UNLOCK(&pmcsc->ccbLock);
   return;
 }
 
 
 /******************************************************************************
 agtiapi_FlushCCBs()
 
 Purpose:
   Flush all in processed ccbs.
 Parameters:
   ag_card_t *pCard (IN)  Pointer to HBA data structure
   U32 flag (IN)            Flag to call back
 Return:
 Note:
 ******************************************************************************/
 STATIC void agtiapi_FlushCCBs( struct agtiapi_softc *pCard, U32 flag )
 {
   union ccb *ccb;
   ccb_t     *pccb;
 
   AGTIAPI_PRINTK( "agtiapi_FlushCCBs: enter \n" );
   for( pccb = (pccb_t)pCard->ccbChainList;
        pccb != NULL;
        pccb = pccb->pccbChainNext ) {
     if( pccb->flags == 0 )
     {
       // printf( "agtiapi_FlushCCBs: nothing, continue \n" );
       continue;
     }
     ccb = pccb->ccb;
     if ( pccb->flags & ( TASK_MANAGEMENT | DEV_RESET ) )
     {
       AGTIAPI_PRINTK( "agtiapi_FlushCCBs: agtiapi_FreeTMCCB \n" );
       agtiapi_FreeTMCCB( pCard, pccb );
     }
     else
     {
       if ( pccb->flags & TAG_SMP )
       {
         AGTIAPI_PRINTK( "agtiapi_FlushCCBs: agtiapi_FreeSMPCCB \n" );
         agtiapi_FreeSMPCCB( pCard, pccb );
       }
       else
       {
         AGTIAPI_PRINTK( "agtiapi_FlushCCBs: agtiapi_FreeCCB \n" );
         agtiapi_FreeCCB( pCard, pccb );
       }
       if( ccb ) {
         CMND_DMA_UNMAP( pCard, ccb );
         if( flag == AGTIAPI_CALLBACK ) {
           ccb->ccb_h.status = CAM_SCSI_BUS_RESET;
           xpt_done( ccb );
         }
       }
     }
   }
 }
 
 /*****************************************************************************
 agtiapi_FreeSMPCCB()
 
 Purpose:
   Free a ccb and put it back to ccbFreeList.
 Parameters:
   struct agtiapi_softc *pmcsc (IN)  Pointer to HBA data structure
   pccb_t pccb (IN)                  A pointer to the driver's own CCB, not
                                     CAM's CCB
 Returns:
 Note:
 *****************************************************************************/
 STATIC void agtiapi_FreeSMPCCB(struct agtiapi_softc *pmcsc, pccb_t pccb)
 {
   union ccb *ccb = pccb->ccb;
   bus_dmasync_op_t op;
 
   AG_LOCAL_LOCK(&pmcsc->ccbLock);
   AGTIAPI_PRINTK("agtiapi_FreeSMPCCB: start %p\n", pccb);
 
   /* set data transfer direction */
   if ((ccb->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_OUT)
   {
     op = BUS_DMASYNC_POSTWRITE;
   }
   else
   {
     op = BUS_DMASYNC_POSTREAD;
   }
 
   if (pccb->numSgElements == 0)
   {
     // do nothing
     AGTIAPI_PRINTK("agtiapi_FreeSMPCCB: numSgElements 0\n");
   }
   else if (pccb->numSgElements == 1)
   {
     AGTIAPI_PRINTK("agtiapi_FreeSMPCCB: numSgElements 1\n");
     //op is either BUS_DMASYNC_POSTWRITE or BUS_DMASYNC_POSTREAD
     bus_dmamap_sync(pmcsc->buffer_dmat, pccb->CCB_dmamap, op);
     bus_dmamap_unload(pmcsc->buffer_dmat, pccb->CCB_dmamap);
   }
   else
   {
     AGTIAPI_PRINTK("agtiapi_FreeSMPCCB: numSgElements 2 or higher \n");
     //op is either BUS_DMASYNC_POSTWRITE or BUS_DMASYNC_POSTREAD
     bus_dmamap_sync(pmcsc->buffer_dmat, pccb->CCB_dmamap, op);
     bus_dmamap_unload(pmcsc->buffer_dmat, pccb->CCB_dmamap);
   }
 
   /*dma api cleanning*/
   pccb->dataLen    = 0;
   pccb->retryCount = 0;
   pccb->ccbStatus  = 0;
   pccb->startTime  = 0;
   pccb->dmaHandle  = 0;
   pccb->numSgElements = 0;
   pccb->tiIORequest.tdData = 0;
   memset((void *)&pccb->tiSMPFrame, 0, AGSMP_INIT_XCHG_LEN);
 
   pccb->flags        = 0;
   pccb->ccb = NULL;
   pccb->pccbNext     = (pccb_t)pmcsc->ccbFreeList;
   pmcsc->ccbFreeList = (caddr_t *)pccb;
 
   pmcsc->activeCCB--;
 
   AG_LOCAL_UNLOCK(&pmcsc->ccbLock);
   return;
 
 }
 
 /*****************************************************************************
 agtiapi_FreeTMCCB()
 
 Purpose:
   Free a ccb and put it back to ccbFreeList.
 Parameters:
   struct agtiapi_softc *pmcsc (IN)  Pointer to HBA data structure
   pccb_t pccb (IN)                  A pointer to the driver's own CCB, not
                                     CAM's CCB
 Returns:
 Note:
 *****************************************************************************/
 STATIC void agtiapi_FreeTMCCB(struct agtiapi_softc *pmcsc, pccb_t pccb)
 {
   AG_LOCAL_LOCK(&pmcsc->ccbLock);
   AGTIAPI_PRINTK("agtiapi_FreeTMCCB: start %p\n", pccb);
   pccb->dataLen    = 0;
   pccb->retryCount = 0;
   pccb->ccbStatus  = 0;
   pccb->scsiStatus = 0;
   pccb->startTime  = 0;
   pccb->dmaHandle  = 0;
   pccb->numSgElements = 0;
   pccb->tiIORequest.tdData = 0;
   memset((void *)&pccb->tiSuperScsiRequest, 0, AGSCSI_INIT_XCHG_LEN);
   pccb->flags        = 0;
   pccb->ccb = NULL;
   pccb->pccbIO = NULL;
   pccb->pccbNext     = (pccb_t)pmcsc->ccbFreeList;
   pmcsc->ccbFreeList = (caddr_t *)pccb;
   pmcsc->activeCCB--;
   AG_LOCAL_UNLOCK(&pmcsc->ccbLock);
   return;
 }
 /******************************************************************************
 agtiapi_CheckAllVectors():
 
 Purpose:
 Parameters:
 Return:
 Note:
   Currently, not used.
 ******************************************************************************/
 void agtiapi_CheckAllVectors( struct agtiapi_softc *pCard, bit32 context )
 {
 #ifdef SPC_MSIX_INTR
   if (!agtiapi_intx_mode)
   {
     int i;
 
     for (i = 0; i < pCard->pCardInfo->maxInterruptVectors; i++)
       if (tiCOMInterruptHandler(&pCard->tiRoot, i) == agTRUE)
         tiCOMDelayedInterruptHandler(&pCard->tiRoot, i, 100, context);
   }
   else
   if (tiCOMInterruptHandler(&pCard->tiRoot, 0) == agTRUE)
     tiCOMDelayedInterruptHandler(&pCard->tiRoot, 0, 100, context);
 #else
   if (tiCOMInterruptHandler(&pCard->tiRoot, 0) == agTRUE)
     tiCOMDelayedInterruptHandler(&pCard->tiRoot, 0, 100, context);
 #endif
 
 }
 
 
 /******************************************************************************
 agtiapi_CheckCB()
 
 Purpose:
   Check call back function returned event for process completion
 Parameters: 
   struct agtiapi_softc *pCard  Pointer to card data structure
   U32 milisec (IN)       Waiting time for expected event
   U32 flag (IN)          Flag of the event to check
   U32 *pStatus (IN)      Pointer to status of the card or port to check
 Return:
   AGTIAPI_SUCCESS - event comes as expected
   AGTIAPI_FAIL    - event not coming
 Note:
   Currently, not used    
 ******************************************************************************/
 agBOOLEAN agtiapi_CheckCB( struct agtiapi_softc *pCard,
                            U32 milisec,
                            U32 flag,
                            volatile U32 *pStatus )
 {
   U32    msecsPerTick = pCard->pCardInfo->tiRscInfo.tiInitiatorResource.
                         initiatorOption.usecsPerTick / 1000;
   S32    i = milisec/msecsPerTick;
   AG_GLOBAL_ARG( _flags );
 
   AGTIAPI_PRINTK( "agtiapi_CheckCB: start\n" );
   AGTIAPI_FLOW(   "agtiapi_CheckCB: start\n" );
 
   if( i <= 0 )
     i = 1;
   while (i > 0)
   {
     if (*pStatus & TASK_MANAGEMENT)
     {
       if (*pStatus & AGTIAPI_CB_DONE) 
       {
         if( flag == 0 || *pStatus & flag )
           return AGTIAPI_SUCCESS;
         else
           return AGTIAPI_FAIL;
       }
     }
     else if (pCard->flags & AGTIAPI_CB_DONE) 
     {
       if( flag == 0 || *pStatus & flag )
         return AGTIAPI_SUCCESS;
       else
         return AGTIAPI_FAIL;
     }
 
     agtiapi_DelayMSec( msecsPerTick );
 
     AG_SPIN_LOCK_IRQ( agtiapi_host_lock, _flags );
     tiCOMTimerTick( &pCard->tiRoot );
 
     agtiapi_CheckAllVectors( pCard, tiNonInterruptContext );
     AG_SPIN_UNLOCK_IRQ( agtiapi_host_lock, _flags );
 
     i--;
   }
 
   if( *pStatus & TASK_MANAGEMENT )
     *pStatus |= TASK_TIMEOUT;
 
   return AGTIAPI_FAIL;
 }
 
 
 /******************************************************************************
 agtiapi_DiscoverTgt()
 
 Purpose:
   Discover available devices
 Parameters:
   struct agtiapi_softc *pCard (IN)  Pointer to the HBA data structure
 Return:
 Note:
 ******************************************************************************/
 STATIC void agtiapi_DiscoverTgt(struct agtiapi_softc *pCard)
 {
 
   ag_portal_data_t *pPortalData;
   U32              count;
 
   AGTIAPI_PRINTK("agtiapi_DiscoverTgt: start\n");
   AGTIAPI_FLOW("agtiapi_DiscoverTgt\n");
   AGTIAPI_INIT("agtiapi_DiscoverTgt\n");
 
   pPortalData = pCard->pPortalData;
   for (count = 0; count < pCard->portCount; count++, pPortalData++)
   {
     pCard->flags &= ~AGTIAPI_CB_DONE;
     if (!(PORTAL_STATUS(pPortalData) & AGTIAPI_PORT_DISC_READY))
     {
       if (pCard->flags & AGTIAPI_INIT_TIME)
       {
         if (agtiapi_CheckCB(pCard, 5000, AGTIAPI_PORT_DISC_READY, 
             &PORTAL_STATUS(pPortalData)) == AGTIAPI_FAIL)
         {
           AGTIAPI_PRINTK( "agtiapi_DiscoverTgt: Port %p / %d not ready for "
                           "discovery\n", 
                           pPortalData, count );
           /* 
            * There is no need to spend time on discovering device 
            * if port is not ready to do so.
            */
           continue;
         }
       }
       else
         continue;
     }
 
     AGTIAPI_FLOW( "agtiapi_DiscoverTgt: Portal %p DiscoverTargets starts\n",
                   pPortalData );
     AGTIAPI_INIT_DELAY(1000);
 
     pCard->flags &= ~AGTIAPI_CB_DONE;
     if (tiINIDiscoverTargets(&pCard->tiRoot, 
                              &pPortalData->portalInfo.tiPortalContext,
                              FORCE_PERSISTENT_ASSIGN_MASK)
         != tiSuccess)
       AGTIAPI_PRINTK("agtiapi_DiscoverTgt: tiINIDiscoverTargets ERROR\n");
 
     /*
      * Should wait till discovery completion to start
      * next portal. However, lower layer have issue on 
      * multi-portal case under Linux.
      */
   }
 
   pPortalData = pCard->pPortalData;
   for (count = 0; count < pCard->portCount; count++, pPortalData++)
   {
     if ((PORTAL_STATUS(pPortalData) & AGTIAPI_PORT_DISC_READY))
     {
       if (agtiapi_CheckCB(pCard, 20000, AGTIAPI_DISC_COMPLETE,
           &PORTAL_STATUS(pPortalData)) == AGTIAPI_FAIL)
       {
         if ((PORTAL_STATUS(pPortalData) & AGTIAPI_DISC_COMPLETE))
           AGTIAPI_PRINTK( "agtiapi_DiscoverTgt: Portal %p discover complete, "
                           "status 0x%x\n",
                           pPortalData,
                           PORTAL_STATUS(pPortalData) );
         else
           AGTIAPI_PRINTK( "agtiapi_DiscoverTgt: Portal %p discover is not "
                           "completed, status 0x%x\n",
                           pPortalData, PORTAL_STATUS(pPortalData) );
         continue;
       }
       AGTIAPI_PRINTK( "agtiapi_DiscoverTgt: Portal %d discover target "
                       "success\n",
                       count );
     }
   }
 
   /* 
    * Calling to get device handle should be done per portal based 
    * and better right after discovery is done. However, lower iscsi
    * layer may not returns discovery complete in correct sequence or we
    * ran out time. We get device handle for all portals together
    * after discovery is done or timed out.
    */
   pPortalData = pCard->pPortalData;
   for (count = 0; count < pCard->portCount; count++, pPortalData++)
   {
     /* 
      * We try to get device handle no matter 
      * if discovery is completed or not. 
      */
     if (PORTAL_STATUS(pPortalData) & AGTIAPI_PORT_DISC_READY)
     {
       U32 i;
 
       for (i = 0; i < AGTIAPI_GET_DEV_MAX; i++)
       {
         if (agtiapi_GetDevHandle(pCard, &pPortalData->portalInfo, 0, 0) != 0)
           break;
         agtiapi_DelayMSec(AGTIAPI_EXTRA_DELAY);
       }
 
       if ((PORTAL_STATUS(pPortalData) & AGTIAPI_DISC_COMPLETE) ||
           (pCard->tgtCount > 0))
         PORTAL_STATUS(pPortalData) |= ( AGTIAPI_DISC_DONE |
                                         AGTIAPI_PORT_LINK_UP );
     }
   }
   
   return;
 
 }
 
 
 
 /******************************************************************************
 agtiapi_PrepCCBs()
 
 Purpose:
   Prepares CCB including DMA map.
 Parameters: 
   struct agtiapi_softc *pCard (IN)  Pointer to the HBA data structure
   ccb_hdr_t *hdr (IN)               Pointer to the CCB header
   U32 size (IN)                     size
   U32 max_ccb (IN)                  count
   
 Return:
 Note:    
 ******************************************************************************/
 STATIC void agtiapi_PrepCCBs( struct agtiapi_softc *pCard,
                               ccb_hdr_t *hdr,
                               U32 size,
                               U32 max_ccb,
                               int tid )
 {
 
   int i;
   U32 hdr_sz, ccb_sz;
   ccb_t *pccb = NULL;
   int offset = 0;
   int nsegs = 0;
   int sgl_sz = 0;
 
   AGTIAPI_PRINTK("agtiapi_PrepCCBs: start\n");
   offset = tid * AGTIAPI_CCB_PER_DEVICE;
   nsegs = AGTIAPI_NSEGS;
   sgl_sz = sizeof(tiSgl_t) * nsegs;
   AGTIAPI_PRINTK( "agtiapi_PrepCCBs: tid %d offset %d nsegs %d sizeof(tiSgl_t) "
                   "%lu, max_ccb %d\n",
                   tid,
                   offset,
                   nsegs,
                   sizeof(tiSgl_t),
                   max_ccb );
 
   ccb_sz = roundup2(AGTIAPI_CCB_SIZE, cache_line_size());
   hdr_sz = roundup2(sizeof(*hdr), cache_line_size());
 
   AGTIAPI_PRINTK("agtiapi_PrepCCBs: after cache line\n");
 
   memset((void *)hdr, 0, size);
   hdr->next = pCard->ccbAllocList;
   pCard->ccbAllocList = hdr;
 
   AGTIAPI_PRINTK("agtiapi_PrepCCBs: after memset\n");
 
   pccb = (ccb_t*) ((char*)hdr + hdr_sz);
 
   for (i = 0; i < max_ccb; i++, pccb = (ccb_t*)((char*)pccb + ccb_sz))
   {
     pccb->tiIORequest.osData = (void *)pccb;
 
     /*
      * Initially put all the ccbs on the free list
      * in addition to chainlist.
      * ccbChainList is a list of all available ccbs
      * (free/active everything)
      */
     pccb->pccbChainNext = (pccb_t)pCard->ccbChainList;
     pccb->pccbNext      = (pccb_t)pCard->ccbFreeList;
 
     pCard->ccbChainList = (caddr_t *)pccb;
     pCard->ccbFreeList  = (caddr_t *)pccb;
     pCard->ccbTotal++;
 
 #ifdef AGTIAPI_ALIGN_CHECK
     if (&pccb & 0x63)
       AGTIAPI_PRINTK("pccb = %p\n", pccb);
     if (pccb->devHandle & 0x63)
       AGTIAPI_PRINTK("devHandle addr = %p\n", &pccb->devHandle);
     if (&pccb->lun & 0x63)
       AGTIAPI_PRINTK("lun addr = %p\n", &pccb->lun);
     if (&pccb->targetId & 0x63)
       AGTIAPI_PRINTK("tig addr = %p\n", &pccb->targetId);
     if (&pccb->ccbStatus & 0x63)
       AGTIAPI_PRINTK("ccbStatus addr = %p\n", &pccb->ccbStatus);
     if (&pccb->scsiStatus & 0x63)
       AGTIAPI_PRINTK("scsiStatus addr = %p\n", &pccb->scsiStatus);
     if (&pccb->dataLen & 0x63)
       AGTIAPI_PRINTK("dataLen addr = %p\n", &pccb->dataLen);
     if (&pccb->senseLen & 0x63)
       AGTIAPI_PRINTK("senseLen addr = %p\n", &pccb->senseLen);
     if (&pccb->numSgElements & 0x63)
       AGTIAPI_PRINTK("numSgElements addr = %p\n", &pccb->numSgElements);
     if (&pccb->retryCount & 0x63)
       AGTIAPI_PRINTK("retry cnt addr = %p\n", &pccb->retryCount);
     if (&pccb->flags & 0x63)
       AGTIAPI_PRINTK("flag addr = %p\n", &pccb->flags);
     if (&pccb->pSenseData & 0x63)
       AGTIAPI_PRINTK("senseData addr = %p\n", &pccb->pSenseData);
     if (&pccb->sgList[0] & 0x63)
       AGTIAPI_PRINTK("SgList 0 = %p\n", &pccb->sgList[0]);
     if (&pccb->pccbNext & 0x63)
       AGTIAPI_PRINTK("ccb next = %p\n", &pccb->pccbNext);
     if (&pccb->pccbChainNext & 0x63)
       AGTIAPI_PRINTK("ccbChainNext = %p\n", &pccb->pccbChainNext);
     if (&pccb->cmd & 0x63)
       AGTIAPI_PRINTK("command = %p\n", &pccb->cmd);
     if( &pccb->startTime & 0x63 )
       AGTIAPI_PRINTK( "startTime = %p\n", &pccb->startTime );
     if (&pccb->tiIORequest & 0x63)
       AGTIAPI_PRINTK("tiIOReq addr = %p\n", &pccb->tiIORequest);
     if (&pccb->tdIOReqBody & 0x63)
       AGTIAPI_PRINTK("tdIORequestBody addr = %p\n", &pccb->tdIOReqBody);
     if (&pccb->tiSuperScsiRequest & 0x63)
       AGTIAPI_PRINTK( "InitiatorExchange addr = %p\n",
                       &pccb->tiSuperScsiRequest );
 #endif
     if ( bus_dmamap_create( pCard->buffer_dmat, 0, &pccb->CCB_dmamap ) !=
          tiSuccess)
     {
       AGTIAPI_PRINTK("agtiapi_PrepCCBs: can't create dma\n");
       return;
     }      
     /* assigns tiSgl_t memory to pccb */
     pccb->sgList = (void*)((U64)pCard->tisgl_mem + ((i + offset) * sgl_sz));
     pccb->tisgl_busaddr = pCard->tisgl_busaddr + ((i + offset) * sgl_sz);
     pccb->ccb = NULL;      
     pccb->pccbIO = NULL;      
     pccb->startTime = 0;
   }
 
 #ifdef AGTIAPI_ALIGN_CHECK
   AGTIAPI_PRINTK("ccb size = %d / %d\n", sizeof(ccb_t), ccb_sz);
 #endif
   return;
 }
 
 /******************************************************************************
 agtiapi_InitCCBs()
 
 Purpose:
   Create and initialize per card based CCB pool.
 Parameters: 
   struct agtiapi_softc *pCard (IN)  Pointer to the HBA data structure
   int tgtCount (IN)                 Count
 Return:
   Total number of ccb allocated
 Note:    
 ******************************************************************************/
 STATIC U32 agtiapi_InitCCBs(struct agtiapi_softc *pCard, int tgtCount, int tid)
 {
 
   U32   max_ccb, size, ccb_sz, hdr_sz;
   int   no_allocs = 0, i;
   ccb_hdr_t  *hdr = NULL;
 
   AGTIAPI_PRINTK("agtiapi_InitCCBs: start\n");
   AGTIAPI_PRINTK("agtiapi_InitCCBs: tgtCount %d tid %d\n", tgtCount, tid);
   AGTIAPI_FLOW("agtiapi_InitCCBs: tgtCount %d tid %d\n", tgtCount, tid);
 
 #ifndef HOTPLUG_SUPPORT
   if (pCard->tgtCount > AGSA_MAX_INBOUND_Q)
     return 1;
 #else
   if (tgtCount > AGSA_MAX_INBOUND_Q)
     tgtCount = AGSA_MAX_INBOUND_Q;
 #endif
 
   max_ccb = tgtCount * AGTIAPI_CCB_PER_DEVICE;//      / 4; // TBR
   ccb_sz = roundup2(AGTIAPI_CCB_SIZE, cache_line_size());
   hdr_sz = roundup2(sizeof(*hdr), cache_line_size());
   size = ccb_sz * max_ccb + hdr_sz;
   
   for (i = 0; i < (1 << no_allocs); i++) 
   {
     hdr = (ccb_hdr_t*)malloc( size, M_PMC_MCCB, M_NOWAIT );
     if( !hdr )
     {
       panic( "agtiapi_InitCCBs: bug!!!\n" );
     }
     else
     {
       agtiapi_PrepCCBs( pCard, hdr, size, max_ccb, tid );
     }
   }
 
   return 1;
 
 }
 
 
 #ifdef LINUX_PERBI_SUPPORT
 /******************************************************************************
 agtiapi_GetWWNMappings()
 
 Purpose:
   Get the mappings from target IDs to WWNs, if any.
   Store them in the WWN_list array, indexed by target ID.
   Leave the devListIndex field blank; this will be filled-in later.
 Parameters:
   ag_card_t *pCard (IN)        Pointer to HBA data structure
   ag_mapping_t *pMapList (IN)  Pointer to mapped device list
 Return:
 Note:  The boot command line parameters are used to load the
   mapping information, which is contained in the system
   configuration file.
 ******************************************************************************/
 STATIC void agtiapi_GetWWNMappings( struct agtiapi_softc *pCard,
                                     ag_mapping_t         *pMapList )
 {
   int           devDisc;
   int           lIdx = 0;
   ag_tgt_map_t *pWWNList;
   ag_slr_map_t *pSLRList;
   ag_device_t  *pDevList;
 
   if( !pCard )
     panic( "agtiapi_GetWWNMappings: no pCard \n" );
 
   AGTIAPI_PRINTK( "agtiapi_GetWWNMappings: start\n" );
 
   pWWNList = pCard->pWWNList;
   pSLRList = pCard->pSLRList;
   pDevList = pCard->pDevList;
   pCard->numTgtHardMapped = 0;
   devDisc = pCard->devDiscover;
 
   pWWNList[devDisc-1].devListIndex  = maxTargets;
   pSLRList[devDisc-1].localeNameLen = -2;
   pSLRList[devDisc-1].remoteNameLen = -2;
   pDevList[devDisc-1].targetId      = maxTargets;
 
   /*
    * Get the mappings from holding area which contains
    * the input of the system file and store them
    * in the WWN_list array, indexed by target ID.
    */
   for ( lIdx = 0; lIdx < devDisc - 1; lIdx++) {
     pWWNList[lIdx].flags = 0;
     pWWNList[lIdx].devListIndex  = maxTargets;
     pSLRList[lIdx].localeNameLen = -1;
     pSLRList[lIdx].remoteNameLen = -1;
   }
 
   //  this is where we would propagate values fed to pMapList
 
 } /* agtiapi_GetWWNMappings */
 
 #endif
 
 
 /******************************************************************************
 agtiapi_FindWWNListNext()
 Purpose:
   finds first available new (unused) wwn list entry
 
 Parameters:
   ag_tgt_map_t *pWWNList              Pointer to head of wwn list
   int lstMax                          Number of entries in WWNList
 Return:
   index into WWNList indicating available entry space;
   if available entry space is not found, return negative value
 ******************************************************************************/
 STATIC int agtiapi_FindWWNListNext( ag_tgt_map_t *pWWNList, int lstMax )
 {
   int  lLstIdx;
 
   for ( lLstIdx = 0; lLstIdx < lstMax; lLstIdx++ )
   {
     if ( pWWNList[lLstIdx].devListIndex == lstMax &&
          pWWNList[lLstIdx].targetLen == 0 )
     {
       AGTIAPI_PRINTK( "agtiapi_FindWWNListNext: %d %d %d %d v. %d\n",
                       lLstIdx,
                       pWWNList[lLstIdx].devListIndex,
                       pWWNList[lLstIdx].targetLen,
                       pWWNList[lLstIdx].portId,
                       lstMax );
       return lLstIdx;
     }
   }
   return -1;
 }
 
 
 /******************************************************************************
 agtiapi_GetDevHandle()
 
 Purpose:
   Get device handle.  Handles will be placed in the
   devlist array with same order as TargetList provided and
   will be mapped to a scsi target id and registered to OS later.
 Parameters:
   struct agtiapi_softc *pCard (IN)    Pointer to the HBA data structure
   ag_portal_info_t *pPortalInfo (IN)  Pointer to the portal data structure
   U32 eType (IN)                      Port event
   U32 eStatus (IN)                    Port event status
 Return:
   Number of device handle slot present
 Note:
   The sequence of device handle will match the sequence of taregt list
 ******************************************************************************/
 STATIC U32 agtiapi_GetDevHandle( struct agtiapi_softc *pCard,
                                  ag_portal_info_t *pPortalInfo,
                                  U32 eType,
                                  U32 eStatus )
 {
   ag_device_t       *pDevice;
   // tiDeviceHandle_t *agDev[pCard->devDiscover];
   tiDeviceHandle_t **agDev;
   int                devIdx, szdv, devTotal, cmpsetRtn;
   int                lDevIndex = 0, lRunScanFlag = FALSE;
   int               *lDevFlags;
   tiPortInfo_t       portInfT;
   ag_device_t        lTmpDevice;
   ag_tgt_map_t      *pWWNList;
   ag_slr_map_t      *pSLRList;
   bit32              lReadRm;
   bit16              lReadCt;
 
 
   AGTIAPI_PRINTK( "agtiapi_GetDevHandle: start\n" );
   AGTIAPI_PRINTK( "agtiapi_GetDevHandle: pCard->devDiscover %d / tgtCt %d\n",
                   pCard->devDiscover, pCard->tgtCount );
   AGTIAPI_FLOW( "agtiapi_GetDevHandle: portalInfo %p\n", pPortalInfo );
   AGTIAPI_INIT_DELAY( 1000 );
 
   agDev = (tiDeviceHandle_t **) malloc( sizeof(tiDeviceHandle_t *) * pCard->devDiscover,
                                         M_PMC_MDEV, M_ZERO | M_NOWAIT);
   if (agDev == NULL) 
   {
     AGTIAPI_PRINTK( "agtiapi_GetDevHandle: failed to alloc agDev[]\n" );
     return 0;
   }
 
   lDevFlags = (int *) malloc( sizeof(int) * pCard->devDiscover,
                               M_PMC_MFLG, M_ZERO | M_NOWAIT );
   if (lDevFlags == NULL)
   {
     free((caddr_t)agDev, M_PMC_MDEV);
     AGTIAPI_PRINTK( "agtiapi_GetDevHandle: failed to alloc lDevFlags[]\n" );
     return 0;
   }
 
   pWWNList = pCard->pWWNList;
   pSLRList = pCard->pSLRList;
 
   memset( (void *)agDev, 0, sizeof(void *) * pCard->devDiscover );
   memset( lDevFlags,     0, sizeof(int)    * pCard->devDiscover );
 
   // get device handles
   devTotal = tiINIGetDeviceHandles( &pCard->tiRoot,
                                     &pPortalInfo->tiPortalContext,
                                     (tiDeviceHandle_t **)agDev,
                                     pCard->devDiscover );
 
   AGTIAPI_PRINTK( "agtiapi_GetDevHandle: portalInfo %p port id %d event %u "
                   "status %u card %p pCard->devDiscover %d devTotal %d "
                   "pPortalInfo->devTotal %d pPortalInfo->devPrev %d "
                   "AGTIAPI_INIT_TIME %x\n",
                   pPortalInfo, pPortalInfo->portID, eType, eStatus, pCard,
                   pCard->devDiscover, devTotal, pPortalInfo->devTotal,
                   pPortalInfo->devPrev,
                   pCard->flags & AGTIAPI_INIT_TIME );
 
   // reset devTotal from any previous runs of this
   pPortalInfo->devPrev  = devTotal;
   pPortalInfo->devTotal = devTotal;
 
   AG_LIST_LOCK( &pCard->devListLock );
 
   if ( tiCOMGetPortInfo( &pCard->tiRoot,
                          &pPortalInfo->tiPortalContext,
                          &portInfT )
        != tiSuccess)
   {
     AGTIAPI_PRINTK( "agtiapi_GetDevHandle: tiCOMGetPortInfo did not succeed. \n" );
   }
 
 
   szdv = sizeof( pPortalInfo->pDevList ) / sizeof( pPortalInfo->pDevList[0] );
   if (szdv > pCard->devDiscover)
   {
     szdv = pCard->devDiscover;
   }
 
   // reconstructing dev list via comparison of wwn
 
   for ( devIdx = 0; devIdx < pCard->devDiscover; devIdx++ )
   {
     if ( agDev[devIdx] != NULL )
     {
       // AGTIAPI_PRINTK( "agtiapi_GetDevHandle: agDev %d not NULL %p\n",
       //                 devIdx, agDev[devIdx] );
 
       // pack temp device structure for tiINIGetDeviceInfo call
       pDevice                  = &lTmpDevice;
       pDevice->devType         = DIRECT_DEVICE;
       pDevice->pCard           = (void *)pCard;
       pDevice->flags           = ACTIVE;
       pDevice->pPortalInfo     = pPortalInfo;
       pDevice->pDevHandle      = agDev[devIdx];
       pDevice->qbusy           = agFALSE; 
 
       //AGTIAPI_PRINTK( "agtiapi_GetDevHandle: idx %d / %d : %p \n",
       //                devIdx, pCard->devDiscover, agDev[devIdx] );
 
       tiINIGetDeviceInfo( &pCard->tiRoot, agDev[devIdx],
                           &pDevice->devInfo );
 
       //AGTIAPI_PRINTK( "agtiapi_GetDevHandle: wwn sizes %ld %d/%d ",
       //                sizeof(pDevice->targetName),
       //                pDevice->devInfo.osAddress1,
       //                pDevice->devInfo.osAddress2 );
 
       wwncpy( pDevice );
       wwnprintk( (unsigned char*)pDevice->targetName, pDevice->targetLen );
 
       for ( lDevIndex = 0; lDevIndex < szdv; lDevIndex++ ) // match w/ wwn list
       {
         if ( (pCard->pDevList[lDevIndex].portalId == pPortalInfo->portID) &&
              pDevice->targetLen     > 0 &&
              portInfT.localNameLen  > 0 &&
              portInfT.remoteNameLen > 0 &&
              pSLRList[pWWNList[lDevIndex].sasLrIdx].localeNameLen > 0 &&
              pSLRList[pWWNList[lDevIndex].sasLrIdx].remoteNameLen > 0 &&
              ( portInfT.localNameLen ==
                pSLRList[pWWNList[lDevIndex].sasLrIdx].localeNameLen ) &&
              ( portInfT.remoteNameLen ==
                pSLRList[pWWNList[lDevIndex].sasLrIdx].remoteNameLen ) &&
              memcmp( pWWNList[lDevIndex].targetName, pDevice->targetName,
                      pDevice->targetLen )   == 0  &&
              memcmp( pSLRList[pWWNList[lDevIndex].sasLrIdx].localeName,
                      portInfT.localName,
                      portInfT.localNameLen )   == 0  &&
              memcmp( pSLRList[pWWNList[lDevIndex].sasLrIdx].remoteName,
                      portInfT.remoteName,
                      portInfT.remoteNameLen )   == 0  )
         {
           AGTIAPI_PRINTK( " pWWNList match @ %d/%d/%d \n",
                           lDevIndex, devIdx, pPortalInfo->portID );
 
           if ( (pCard->pDevList[lDevIndex].targetId == lDevIndex) &&
                ( pPortalInfo->pDevList[lDevIndex] ==
                  &pCard->pDevList[lDevIndex] )  ) // active
           {
 
             AGTIAPI_PRINTK( "agtiapi_GetDevHandle: dev in use %d of %d/%d\n",
                             lDevIndex, devTotal, pPortalInfo->portID );
             lDevFlags[devIdx]    |= DPMC_LEANFLAG_AGDEVUSED; // agDev handle
             lDevFlags[lDevIndex] |= DPMC_LEANFLAG_PDEVSUSED; // pDevice used
             lReadRm = atomic_readandclear_32( &pWWNList[lDevIndex].devRemoved );
             if ( lReadRm )   // cleared timeout, now remove count for timer
             {
               AGTIAPI_PRINTK( "agtiapi_GetDevHandle: clear timer count for"
                               " %d of %d\n",
                               lDevIndex, pPortalInfo->portID );
               atomic_subtract_16( &pCard->rmChkCt, 1 );
               lReadCt = atomic_load_acq_16( &pCard->rmChkCt );
               if ( 0 == lReadCt )
               {
                 callout_stop( &pCard->devRmTimer );
               }
             }
             break;
           }
 
           AGTIAPI_PRINTK( "agtiapi_GetDevHandle: goin fresh on %d of %d/%d\n",
                           lDevIndex,  // reactivate now
                           devTotal, pPortalInfo->portID );
 
           // pDevice going fresh
           lRunScanFlag = TRUE; // scan and clear outstanding removals
 
           // pCard->tgtCount++; ##
           pDevice->targetId  = lDevIndex;
           pDevice->portalId  = pPortalInfo->portID;
 
           memcpy ( &pCard->pDevList[lDevIndex], pDevice, sizeof(lTmpDevice) );
           agDev[devIdx]->osData = (void *)&pCard->pDevList[lDevIndex];
           if ( agtiapi_InitCCBs( pCard, 1, pDevice->targetId ) == 0 )
           {
             AGTIAPI_PRINTK( "agtiapi_GetDevHandle: InitCCB "
                             "tgtCnt %d ERROR!\n", pCard->tgtCount );
             AG_LIST_UNLOCK( &pCard->devListLock );
             free((caddr_t)lDevFlags, M_PMC_MFLG);
             free((caddr_t)agDev, M_PMC_MDEV);
             return 0;
           }
           pPortalInfo->pDevList[lDevIndex] = &pCard->pDevList[lDevIndex];     // (ag_device_t *)
           if ( 0 == lDevFlags[devIdx] )
           {
             pPortalInfo->devTotal++;
             lDevFlags[devIdx]    |= DPMC_LEANFLAG_AGDEVUSED; // agDev used
             lDevFlags[lDevIndex] |= DPMC_LEANFLAG_PDEVSUSED; // pDevice used
           }
           else
           {
             AGTIAPI_PRINTK( "agtiapi_GetDevHandle: odd dev handle "
                             "status inspect %d %d %d\n",
                             lDevFlags[devIdx], devIdx, lDevIndex );
             pPortalInfo->devTotal++;
             lDevFlags[devIdx]    |= DPMC_LEANFLAG_AGDEVUSED; // agDev used
             lDevFlags[lDevIndex] |= DPMC_LEANFLAG_PDEVSUSED; // pDevice used
 
           }
           break;
         }
       }
       // end: match this wwn with previous wwn list
 
       // we have an agDev entry, but no pWWNList target for it
       if ( !(lDevFlags[devIdx] & DPMC_LEANFLAG_AGDEVUSED) )
       { // flag dev handle not accounted for yet
         lDevFlags[devIdx] |= DPMC_LEANFLAG_NOWWNLIST;
         // later, get an empty pDevice and map this agDev.
         // AGTIAPI_PRINTK( "agtiapi_GetDevHandle: devIdx %d flags 0x%x, %d\n",
         //                 devIdx, lDevFlags[devIdx], (lDevFlags[devIdx] & 8) );
       }
     }
     else
     {
       lDevFlags[devIdx] |= DPMC_LEANFLAG_NOAGDEVYT; // known empty agDev handle
     }
   }
 
   // AGTIAPI_PRINTK( "agtiapi_GetDevHandle: all WWN all the time, "
   //                 "devLstIdx/flags/(WWNL)portId ... \n" );
   // review device list for further action needed
   for ( devIdx = 0; devIdx < pCard->devDiscover; devIdx++ )
   {
     if ( lDevFlags[devIdx] & DPMC_LEANFLAG_NOWWNLIST ) // new target, register
     {
       int lNextDyad; // find next available dyad entry
 
       AGTIAPI_PRINTK( "agtiapi_GetDevHandle: register new target, "
                       "devIdx %d -- %d \n", devIdx, pCard->devDiscover );
       lRunScanFlag = TRUE; // scan and clear outstanding removals
       for ( lNextDyad = 0; lNextDyad < pCard->devDiscover; lNextDyad++ )
       {
         if ( pSLRList[lNextDyad].localeNameLen < 0 &&
              pSLRList[lNextDyad].remoteNameLen < 0    )
           break;
       }
 
       if ( lNextDyad == pCard->devDiscover )
       {
         printf( "agtiapi_GetDevHandle: failed to find available SAS LR\n" );
         AG_LIST_UNLOCK( &pCard->devListLock );
         free( (caddr_t)lDevFlags, M_PMC_MFLG );
         free( (caddr_t)agDev, M_PMC_MDEV );
         return 0;
       }
       // index of new entry
       lDevIndex = agtiapi_FindWWNListNext( pWWNList, pCard->devDiscover );
       AGTIAPI_PRINTK( "agtiapi_GetDevHandle: listIdx new target %d of %d/%d\n",
                       lDevIndex, devTotal, pPortalInfo->portID );
       if ( 0 > lDevIndex )
       {
         printf( "agtiapi_GetDevHandle: WARNING -- WWNList exhausted.\n" );
         continue;
       }
 
       pDevice = &pCard->pDevList[lDevIndex];
 
       tiINIGetDeviceInfo( &pCard->tiRoot, agDev[devIdx], &pDevice->devInfo );
       wwncpy( pDevice );
       agtiapi_InitCCBs( pCard, 1, lDevIndex );
 
       pDevice->pCard   = (void *)pCard;
       pDevice->devType = DIRECT_DEVICE;
 
       // begin to populate new WWNList entry
       memcpy( pWWNList[lDevIndex].targetName, pDevice->targetName, pDevice->targetLen );
       pWWNList[lDevIndex].targetLen = pDevice->targetLen;
 
       pWWNList[lDevIndex].flags         = SOFT_MAPPED;
       pWWNList[lDevIndex].portId        = pPortalInfo->portID;
       pWWNList[lDevIndex].devListIndex  = lDevIndex;
       pWWNList[lDevIndex].sasLrIdx      = lNextDyad;
 
       pSLRList[lNextDyad].localeNameLen = portInfT.localNameLen;
       pSLRList[lNextDyad].remoteNameLen = portInfT.remoteNameLen;
       memcpy( pSLRList[lNextDyad].localeName, portInfT.localName, portInfT.localNameLen );
       memcpy( pSLRList[lNextDyad].remoteName, portInfT.remoteName, portInfT.remoteNameLen );
       // end of populating new WWNList entry
 
       pDevice->targetId = lDevIndex;
 
       pDevice->flags = ACTIVE;
       pDevice->CCBCount = 0; 
       pDevice->pDevHandle = agDev[devIdx];
       agDev[devIdx]->osData = (void*)pDevice;
 
       pDevice->pPortalInfo = pPortalInfo;
       pDevice->portalId = pPortalInfo->portID;
       pPortalInfo->pDevList[lDevIndex] = (void*)pDevice;
       lDevFlags[lDevIndex] |= DPMC_LEANFLAG_PDEVSUSED; // mark pDevice slot used
     }
 
     if ( (pCard->pDevList[devIdx].portalId == pPortalInfo->portID) &&
          !(lDevFlags[devIdx] & DPMC_LEANFLAG_PDEVSUSED) ) // pDevice not used
     {
       pDevice = &pCard->pDevList[devIdx];
       //pDevice->flags &= ~ACTIVE;
       if ( ( pDevice->pDevHandle != NULL ||
              pPortalInfo->pDevList[devIdx] != NULL ) )
       {
         atomic_add_16( &pCard->rmChkCt, 1 );      // show count of lost device
 
         if (FALSE == lRunScanFlag)
         {
 
           AGTIAPI_PRINTK( "agtiapi_GetDevHandle: targ dropped out %d of %d/%d\n",
                           devIdx, devTotal, pPortalInfo->portID );
           // if ( 0 == pWWNList[devIdx].devRemoved ) '.devRemoved = 5;
           cmpsetRtn = atomic_cmpset_32( &pWWNList[devIdx].devRemoved, 0, 5 );
           if ( 0 == cmpsetRtn )
           {
             AGTIAPI_PRINTK( "agtiapi_GetDevHandle: target %d timer already set\n",
                     devIdx );
           }
           else
           {
             callout_reset( &pCard->devRmTimer, 1 * hz, agtiapi_devRmCheck, pCard );
           }
         }
         // else ... scan coming soon enough anyway, ignore timer for dropout
       }
     }
   } // end of for ( devIdx = 0; ...
 
   AG_LIST_UNLOCK( &pCard->devListLock );
 
   free((caddr_t)lDevFlags, M_PMC_MFLG);
   free((caddr_t)agDev, M_PMC_MDEV);
 
   if ( TRUE == lRunScanFlag )
     agtiapi_clrRmScan( pCard );
 
   return devTotal;
 } // end  agtiapi_GetDevHandle
 
 /******************************************************************************
 agtiapi_scan()
 
 Purpose:
   Triggers CAM's scan
 Parameters: 
   struct agtiapi_softc *pCard (IN)    Pointer to the HBA data structure
 Return:
 Note:    
 ******************************************************************************/
 static void agtiapi_scan(struct agtiapi_softc *pmcsc)
 {
   union ccb *ccb;
   int bus, tid, lun;
  
   AGTIAPI_PRINTK("agtiapi_scan: start cardNO %d \n", pmcsc->cardNo);
     
   bus = cam_sim_path(pmcsc->sim);
  
   tid = CAM_TARGET_WILDCARD;
   lun = CAM_LUN_WILDCARD;
 
   mtx_lock(&(pmcsc->pCardInfo->pmIOLock)); 
   ccb = xpt_alloc_ccb_nowait();
   if (ccb == agNULL)
   {
     mtx_unlock(&(pmcsc->pCardInfo->pmIOLock)); 
     return;
   }
   if (xpt_create_path(&ccb->ccb_h.path, agNULL, bus, tid,
 		      CAM_LUN_WILDCARD) != CAM_REQ_CMP) 
   { 
     mtx_unlock(&(pmcsc->pCardInfo->pmIOLock)); 
     xpt_free_ccb(ccb);
     return;
   }
 
   mtx_unlock(&(pmcsc->pCardInfo->pmIOLock)); 
   pmcsc->dev_scan = agTRUE;
   xpt_rescan(ccb);
   return;
 }
 
 /******************************************************************************
 agtiapi_DeQueueCCB()
 
 Purpose:
   Remove a ccb from a queue
 Parameters: 
   struct agtiapi_softc *pCard (IN)  Pointer to the card structure
   pccb_t *phead (IN)     Pointer to a head of ccb queue
   ccb_t  *pccd  (IN)     Pointer to the ccb to be processed
 Return:
   AGTIAPI_SUCCESS - the ccb is removed from queue
   AGTIAPI_FAIL    - the ccb is not found from queue
 Note:    
 ******************************************************************************/
 STATIC agBOOLEAN 
 agtiapi_DeQueueCCB(struct agtiapi_softc *pCard, pccb_t *phead, pccb_t *ptail, 
 #ifdef AGTIAPI_LOCAL_LOCK
                    struct mtx *lock,
 #endif
                    ccb_t *pccb)
 {
   ccb_t  *pccb_curr;
   U32     status = AGTIAPI_FAIL;
 
   AGTIAPI_PRINTK("agtiapi_DeQueueCCB: %p from %p\n", pccb, phead);
 
   if (pccb == NULL || *phead == NULL)
   {
     return AGTIAPI_FAIL;
   }
 
   AGTIAPI_PRINTK("agtiapi_DeQueueCCB: %p from %p\n", pccb, phead);
   AG_LOCAL_LOCK(lock);
 
   if (pccb == *phead)
   {
     *phead = (*phead)->pccbNext;
     if (pccb == *ptail)
     {
       *ptail = NULL;
     }
     else
       pccb->pccbNext = NULL;
     status = AGTIAPI_SUCCESS;
   }
   else
   {
     pccb_curr = *phead;
     while (pccb_curr->pccbNext != NULL)
     {
       if (pccb_curr->pccbNext == pccb)
       {
         pccb_curr->pccbNext = pccb->pccbNext;
         pccb->pccbNext = NULL;
         if (pccb == *ptail)
         {
           *ptail = pccb_curr;
         }
         else
           pccb->pccbNext = NULL;
         status = AGTIAPI_SUCCESS;
         break;
       }
       pccb_curr = pccb_curr->pccbNext;
     }
   }
   AG_LOCAL_UNLOCK(lock);
 
   return status;
 }
 
 
 STATIC void wwnprintk( unsigned char *name, int len )
 {
   int i;
 
   for (i = 0; i < len; i++, name++)
     AGTIAPI_PRINTK("%02x", *name); 
   AGTIAPI_PRINTK("\n");
 }
 /* 
  * SAS and SATA behind expander has 8 byte long unique address. 
  * However, direct connect SATA device use 512 byte unique device id.
  * SPC uses remoteName to indicate length of ID and remoteAddress for the
  * address of memory that holding ID.
  */ 
 STATIC int wwncpy( ag_device_t      *pDevice )
 {
   int rc = 0;
 
   if (sizeof(pDevice->targetName) >= pDevice->devInfo.osAddress1 + 
                                      pDevice->devInfo.osAddress2) 
   {
     memcpy(pDevice->targetName, 
              pDevice->devInfo.remoteName, 
              pDevice->devInfo.osAddress1);
     memcpy(pDevice->targetName + pDevice->devInfo.osAddress1, 
              pDevice->devInfo.remoteAddress, 
              pDevice->devInfo.osAddress2);
     pDevice->targetLen = pDevice->devInfo.osAddress1 + 
                          pDevice->devInfo.osAddress2;
     rc = pDevice->targetLen;
   }
   else 
   {
     AGTIAPI_PRINTK("WWN wrong size: %d + %d ERROR\n", 
            pDevice->devInfo.osAddress1, pDevice->devInfo.osAddress2);
     rc = -1;
   }
   return rc;
 }
 
 
 /******************************************************************************
 agtiapi_ReleaseCCBs()
 
 Purpose:
   Free all allocated CCB memories for the Host Adapter.
 Parameters:
   struct agtiapi_softc *pCard (IN)  Pointer to HBA data structure
 Return:
 Note:
 ******************************************************************************/
 STATIC void agtiapi_ReleaseCCBs( struct agtiapi_softc *pCard )
 {
 
   ccb_hdr_t *hdr;
   U32 hdr_sz;
   ccb_t *pccb = NULL;
 
   AGTIAPI_PRINTK( "agtiapi_ReleaseCCBs: start\n" );
 
 #if ( defined AGTIAPI_TEST_DPL || defined AGTIAPI_TEST_EPL )
   ccb_t *pccb;
 #endif
 
 #ifdef AGTIAPI_TEST_DPL
   for (pccb = (pccb_t)pCard->ccbChainList; pccb != NULL;
        pccb = pccb->pccbChainNext)
   {
     if(pccb->dplPtr && pccb->dplDma)
       pci_pool_free(pCard->dpl_ctx_pool,   pccb->dplPtr, pccb->dplDma);
   }
 #endif
 
 #ifdef AGTIAPI_TEST_EPL
   for (pccb = (pccb_t)pCard->ccbChainList; pccb != NULL;
        pccb = pccb->pccbChainNext)
   {
     if(pccb->epl_ptr && pccb->epl_dma_ptr)
         pci_pool_free(
             pCard->epl_ctx_pool,
             pccb->epl_ptr, 
             pccb->epl_dma_ptr
         );
   }
 #endif
 
   while ((hdr = pCard->ccbAllocList) != NULL)
   {
     pCard->ccbAllocList = hdr->next;
     hdr_sz = roundup2(sizeof(*hdr), cache_line_size());
     pccb = (ccb_t*) ((char*)hdr + hdr_sz);
     if (pCard->buffer_dmat != NULL && pccb->CCB_dmamap != NULL)
     {
       bus_dmamap_destroy(pCard->buffer_dmat, pccb->CCB_dmamap);
     }
     free(hdr, M_PMC_MCCB);
   }
   pCard->ccbAllocList = NULL;
 
 
   return;
 }
 
 /******************************************************************************
 agtiapi_TITimer()
 
 Purpose:
   Timer tick for tisa common layer
 Parameters:
   void *data (IN)  Pointer to the HBA data structure
 Return:
 Note:
 ******************************************************************************/
 STATIC void agtiapi_TITimer( void *data )
 {
 
   U32                   next_tick;
   struct agtiapi_softc *pCard;
 
   pCard = (struct agtiapi_softc *)data;
 
 //  AGTIAPI_PRINTK("agtiapi_TITimer: start\n");
   AG_GLOBAL_ARG( flags );
 
   next_tick = pCard->pCardInfo->tiRscInfo.tiLoLevelResource.
               loLevelOption.usecsPerTick / USEC_PER_TICK;
 
   if( next_tick == 0 )               /* no timer required */
     return;
   AG_SPIN_LOCK_IRQ( agtiapi_host_lock, flags );
   if( pCard->flags & AGTIAPI_SHUT_DOWN )
     goto ext;
   tiCOMTimerTick( &pCard->tiRoot );  /* tisa common layer timer tick */
 
   //add for polling mode
 #ifdef PMC_SPC
   if( agtiapi_polling_mode )
     agtiapi_CheckAllVectors( pCard, tiNonInterruptContext );
 #endif
   callout_reset( &pCard->OS_timer, next_tick, agtiapi_TITimer, pCard );
 ext:
   AG_SPIN_UNLOCK_IRQ( agtiapi_host_lock, flags );
   return;
 }
 
 /******************************************************************************
 agtiapi_clrRmScan()
 
 Purpose:
   Clears device list entries scheduled for timeout and calls scan
 Parameters:
   struct agtiapi_softc *pCard (IN)  Pointer to HBA data structure
 ******************************************************************************/
 STATIC void agtiapi_clrRmScan( struct agtiapi_softc *pCard )
 {
   ag_tgt_map_t         *pWWNList;
   ag_portal_info_t     *pPortalInfo;
   ag_portal_data_t     *pPortalData;
   int                   lIdx;
   bit32                 lReadRm;
   bit16                 lReadCt;
 
   pWWNList = pCard->pWWNList;
 
   AGTIAPI_PRINTK( "agtiapi_clrRmScan: start\n" );
 
   AG_LIST_LOCK( &pCard->devListLock );
 
   for ( lIdx = 0; lIdx < pCard->devDiscover; lIdx++ )
   {
     lReadCt = atomic_load_acq_16( &pCard->rmChkCt );
     if ( 0 == lReadCt )
     {
       break;  // trim to who cares
     }
 
     lReadRm = atomic_readandclear_32( &pWWNList[lIdx].devRemoved );
     if ( lReadRm > 0 )
     {
       pCard->pDevList[lIdx].flags &= ~ACTIVE;
       pCard->pDevList[lIdx].pDevHandle = NULL;
 
       pPortalData = &pCard->pPortalData[pWWNList[lIdx].portId];
       pPortalInfo = &pPortalData->portalInfo;
       pPortalInfo->pDevList[lIdx] = NULL;
       AGTIAPI_PRINTK( "agtiapi_clrRmScan: cleared dev %d at port %d\n",
                       lIdx, pWWNList[lIdx].portId );
       atomic_subtract_16( &pCard->rmChkCt, 1 );
     }
   }
   AG_LIST_UNLOCK( &pCard->devListLock );
 
   agtiapi_scan( pCard );
 }
 
 
 /******************************************************************************
 agtiapi_devRmCheck()
 
 Purpose:
   Timer tick to check for timeout on missing targets
   Removes device list entry when timeout is reached
 Parameters:
   void *data (IN)  Pointer to the HBA data structure
 ******************************************************************************/
 STATIC void agtiapi_devRmCheck( void *data )
 {
   struct agtiapi_softc *pCard;
   ag_tgt_map_t         *pWWNList;
   int                   lIdx, cmpsetRtn, lRunScanFlag = FALSE;
   bit16                 lReadCt;
   bit32                 lReadRm;
 
   pCard = ( struct agtiapi_softc * )data;
 
   // routine overhead
   if ( callout_pending( &pCard->devRmTimer ) )  // callout was reset
   {
     return;
   }
   if ( !callout_active( &pCard->devRmTimer ) )  // callout was stopped
   {
     return;
   }
   callout_deactivate( &pCard->devRmTimer );
 
   if( pCard->flags & AGTIAPI_SHUT_DOWN )
   {
     return;  // implicit timer clear
   }
 
   pWWNList = pCard->pWWNList;
 
   AG_LIST_LOCK( &pCard->devListLock );
   lReadCt = atomic_load_acq_16( &pCard->rmChkCt );
   if ( lReadCt )
   {
     if ( callout_pending(&pCard->devRmTimer) == FALSE )
     {
       callout_reset( &pCard->devRmTimer, 1 * hz, agtiapi_devRmCheck, pCard );
     }
     else
     {
       AG_LIST_UNLOCK( &pCard->devListLock );
 	  return;
     }
 
     for ( lIdx = 0; lIdx < pCard->devDiscover; lIdx++ )
     {
       lReadCt = atomic_load_acq_16( &pCard->rmChkCt );
       if ( 0 == lReadCt )
       {
         break;  // if handled somewhere else, get out
       }
 
       lReadRm = atomic_load_acq_32( &pWWNList[lIdx].devRemoved );
       if ( lReadRm > 0 )
       {
         if ( 1 == lReadRm ) // timed out
         { // no decrement of devRemoved as way to leave a clrRmScan marker
           lRunScanFlag = TRUE; // other devRemoved values are about to get wiped
           break; // ... so bail out
         }
         else
         {
           AGTIAPI_PRINTK( "agtiapi_devRmCheck: counting down dev %d @ %d; %d\n",
                           lIdx, lReadRm, lReadCt );
           cmpsetRtn = atomic_cmpset_32( &pWWNList[lIdx].devRemoved,
                                         lReadRm,
                                         lReadRm-1 );
           if ( 0 == cmpsetRtn )
           {
             printf( "agtiapi_devRmCheck: %d decrement already handled\n",
                     lIdx );
           }
         }
       }
     }
     AG_LIST_UNLOCK( &pCard->devListLock );
 
     if ( TRUE == lRunScanFlag )
       agtiapi_clrRmScan( pCard );
   }
   else
   {
     AG_LIST_UNLOCK( &pCard->devListLock );
   }
 
   return;
 }
 
 
 static void agtiapi_cam_poll( struct cam_sim *asim )
 {
   return;
 }
 
 /*****************************************************************************
 agtiapi_ResetCard()
 
 Purpose:
   Hard or soft reset on the controller and resend any
   outstanding requests if needed.
 Parameters:
   struct agtiapi_softc *pCard (IN)  Pointer to HBA data structure
   unsigned lomg flags (IN/OUT) Flags used in locking done from calling layers
 Return:
   AGTIAPI_SUCCESS - reset successful
   AGTIAPI_FAIL    - reset failed
 Note:
 *****************************************************************************/
 U32 agtiapi_ResetCard( struct agtiapi_softc *pCard, unsigned long *flags )
 {
   ag_device_t      *pDevice;
   U32               lIdx = 0;
   U32               lFlagVal;
   agBOOLEAN         ret;
   ag_portal_info_t *pPortalInfo;
   ag_portal_data_t *pPortalData;
   U32               count, loop;
   int               szdv;
 
   if( pCard->flags & AGTIAPI_RESET ) {
     AGTIAPI_PRINTK( "agtiapi_ResetCard: reset card already in progress!\n" );
     return AGTIAPI_FAIL;
   }
 
   AGTIAPI_PRINTK( "agtiapi_ResetCard: Enter cnt %d\n",
                   pCard->resetCount );
 #ifdef LOGEVENT
   agtiapi_LogEvent( pCard,
                     IOCTL_EVT_SEV_INFORMATIONAL,
                     0,
                     agNULL,
                     0,
                     "Reset initiator time = %d!",
                     pCard->resetCount + 1 );
 #endif
 
   pCard->flags |= AGTIAPI_RESET;
   pCard->flags &= ~(AGTIAPI_CB_DONE | AGTIAPI_RESET_SUCCESS);
   tiCOMSystemInterruptsActive( &pCard->tiRoot, FALSE );
   pCard->flags &= ~AGTIAPI_SYS_INTR_ON;
 
   agtiapi_FlushCCBs( pCard, AGTIAPI_CALLBACK );
 
   for ( lIdx = 1; 3 >= lIdx; lIdx++ ) // we try reset up to 3 times
   {
     if( pCard->flags & AGTIAPI_SOFT_RESET )
     {
       AGTIAPI_PRINTK( "agtiapi_ResetCard: soft variant\n" );
       tiCOMReset( &pCard->tiRoot, tiSoftReset );
     }
     else
     {
       AGTIAPI_PRINTK( "agtiapi_ResetCard: no flag, no reset!\n" );
     }
 
     lFlagVal = AGTIAPI_RESET_SUCCESS;
     AG_SPIN_UNLOCK_IRQ( agtiapi_host_lock, *flags );
     ret = agtiapi_CheckCB( pCard, 50000, lFlagVal, &pCard->flags );
     AG_SPIN_LOCK_IRQ( agtiapi_host_lock, *flags );
 
     if( ret == AGTIAPI_FAIL )
     {
       AGTIAPI_PRINTK( "agtiapi_ResetCard: CheckCB indicates failed reset call, "
               "try again?\n" );
     }
     else
     {
       break;
     }
   }
   if ( 1 < lIdx )
   {
     if ( AGTIAPI_FAIL == ret )
     {
       AGTIAPI_PRINTK( "agtiapi_ResetCard: soft reset failed after try %d\n",
                       lIdx );
     }
     else
     {
       AGTIAPI_PRINTK( "agtiapi_ResetCard: soft reset success at try %d\n",
                       lIdx );
     }
   }
   if( AGTIAPI_FAIL == ret )
   {
     printf( "agtiapi_ResetCard: reset ERROR\n" );
     pCard->flags &= ~AGTIAPI_INSTALLED;
     return AGTIAPI_FAIL;
   }
 
   pCard->flags &= ~AGTIAPI_SOFT_RESET;
 
   // disable all devices
   pDevice = pCard->pDevList;
   for( lIdx = 0; lIdx < maxTargets; lIdx++, pDevice++ )
   {
     /* if ( pDevice->flags & ACTIVE )
     {
       printf( "agtiapi_ResetCard: before ... active device %d\n", lIdx );
     } */
     pDevice->flags &= ~ACTIVE;
   }
 
   AG_SPIN_UNLOCK_IRQ( agtiapi_host_lock, *flags );
   if( tiCOMPortInit( &pCard->tiRoot, agFALSE ) != tiSuccess )
     printf( "agtiapi_ResetCard: tiCOMPortInit FAILED \n" );
   else
     AGTIAPI_PRINTK( "agtiapi_ResetCard: tiCOMPortInit success\n" );
 
   if( !pCard->pDevList ) {  // try to get a little sanity here
     AGTIAPI_PRINTK( "agtiapi_ResetCard: no pDevList ERROR %p\n",
                     pCard->pDevList );
     return AGTIAPI_FAIL;
   }
 
   AGTIAPI_PRINTK( "agtiapi_ResetCard: pre target-count %d port-count %d\n",
                   pCard->tgtCount, pCard->portCount );
   pCard->tgtCount = 0;
 
   DELAY( 500000 );
 
   pCard->flags &= ~AGTIAPI_CB_DONE;
 
   pPortalData = pCard->pPortalData;
 
   for( count = 0; count < pCard->portCount; count++ ) {
     AG_SPIN_LOCK_IRQ( agtiapi_host_lock, flags );
     pPortalInfo = &pPortalData->portalInfo;
     pPortalInfo->portStatus = 0;
     pPortalInfo->portStatus &= ~( AGTIAPI_PORT_START      |
                                   AGTIAPI_PORT_DISC_READY |
                                   AGTIAPI_DISC_DONE       |
                                   AGTIAPI_DISC_COMPLETE );
 
     szdv =
       sizeof( pPortalInfo->pDevList ) / sizeof( pPortalInfo->pDevList[0] );
     if (szdv > pCard->devDiscover)
     {
       szdv = pCard->devDiscover;
     }
     
     for( lIdx = 0, loop = 0;
          lIdx < szdv  &&  loop < pPortalInfo->devTotal;
          lIdx++ )
     {
       pDevice = (ag_device_t*)pPortalInfo->pDevList[lIdx];
       if( pDevice )
       {
         loop++;
         pDevice->pDevHandle = 0; // mark for availability in pCard->pDevList[]
         // don't erase more as the device is scheduled for removal on DPC
       }
       AGTIAPI_PRINTK( "agtiapi_ResetCard: reset pDev %p pDevList %p idx %d\n",
                       pDevice, pPortalInfo->pDevList, lIdx );
       pPortalInfo->devTotal = pPortalInfo->devPrev = 0;
     }
 
     for( lIdx = 0; lIdx < maxTargets; lIdx++ )
     { // we reconstruct dev list later in get dev handle
       pPortalInfo->pDevList[lIdx] = NULL;
     }
 
     for( loop = 0; loop < AGTIAPI_LOOP_MAX; loop++ )
     {
       AGTIAPI_PRINTK( "agtiapi_ResetCard: tiCOMPortStart entry data "
                       "%p / %d / %p\n",
                       &pCard->tiRoot,
                       pPortalInfo->portID,
                       &pPortalInfo->tiPortalContext );
 
       if( tiCOMPortStart( &pCard->tiRoot,
                           pPortalInfo->portID,
                           &pPortalInfo->tiPortalContext,
                           0 )
           != tiSuccess )
       {
         printf( "agtiapi_ResetCard: tiCOMPortStart %d FAILED\n",
                 pPortalInfo->portID );
       }
       else
       {
         AGTIAPI_PRINTK( "agtiapi_ResetCard: tiCOMPortStart %d success\n",
                         pPortalInfo->portID );
         break;
       }
     }
     AG_SPIN_UNLOCK_IRQ( agtiapi_host_lock, flags );
     tiCOMGetPortInfo( &pCard->tiRoot,
                       &pPortalInfo->tiPortalContext,
                       &pPortalInfo->tiPortInfo );
     pPortalData++;
   }
   // ## fail case:  pCard->flags &= ~AGTIAPI_INSTALLED;
 
 
   AG_SPIN_LOCK_IRQ(agtiapi_host_lock, *flags);
 
   if( !(pCard->flags & AGTIAPI_INSTALLED) ) // driver not installed !
   {
     printf( "agtiapi_ResetCard: error, driver not intstalled? "
             "!AGTIAPI_INSTALLED \n" );
     return AGTIAPI_FAIL;
   }
 
   AGTIAPI_PRINTK( "agtiapi_ResetCard: total device %d\n", pCard->tgtCount );
 
 #ifdef LOGEVENT
   agtiapi_LogEvent( pCard,
                     IOCTL_EVT_SEV_INFORMATIONAL,
                     0,
                     agNULL,
                     0,
                     "Reset initiator total device = %d!",
                     pCard->tgtCount );
 #endif
   pCard->resetCount++;
 
   AGTIAPI_PRINTK( "agtiapi_ResetCard: clear send and done queues\n" );
   // clear send & done queue
   AG_LOCAL_LOCK( &pCard->sendLock );
   pCard->ccbSendHead = NULL;
   pCard->ccbSendTail = NULL;
   AG_LOCAL_UNLOCK( &pCard->sendLock );
 
   AG_LOCAL_LOCK( &pCard->doneLock );
   pCard->ccbDoneHead = NULL;
   pCard->ccbDoneTail = NULL;
   AG_LOCAL_UNLOCK( &pCard->doneLock );
 
   // clear smp queues also
   AG_LOCAL_LOCK( &pCard->sendSMPLock );
   pCard->smpSendHead = NULL;
   pCard->smpSendTail = NULL;
   AG_LOCAL_UNLOCK( &pCard->sendSMPLock );
 
   AG_LOCAL_LOCK( &pCard->doneSMPLock );
   pCard->smpDoneHead = NULL;
   pCard->smpDoneTail = NULL;
   AG_LOCAL_UNLOCK( &pCard->doneSMPLock );
 
   // finished with all reset stuff, now start things back up
   tiCOMSystemInterruptsActive( &pCard->tiRoot, TRUE );
   pCard->flags |= AGTIAPI_SYS_INTR_ON;
   pCard->flags |= AGTIAPI_HAD_RESET;
   pCard->flags &= ~AGTIAPI_RESET;  // ##
   agtiapi_StartIO( pCard );
   AGTIAPI_PRINTK( "agtiapi_ResetCard: local return success\n" );
   return AGTIAPI_SUCCESS;
 } // agtiapi_ResetCard
 
 
 /******************************************************************************
 agtiapi_ReleaseHBA()
 
 Purpose:
   Releases all resources previously acquired to support 
   a specific Host Adapter, including the I/O Address range, 
   and unregisters the agtiapi Host Adapter.
 Parameters: 
   device_t dev (IN)  - device pointer
 Return:
   always return 0 - success
 Note:    
 ******************************************************************************/
 int agtiapi_ReleaseHBA( device_t dev )
 {
   
   int thisCard = device_get_unit( dev ); // keeping get_unit call to once
   int i;
   ag_card_info_t *thisCardInst = &agCardInfoList[ thisCard ];
   struct ccb_setasync csa; 
   struct agtiapi_softc *pCard;
   pCard = device_get_softc( dev );
   ag_card_info_t *pCardInfo = pCard->pCardInfo;
   ag_resource_info_t *pRscInfo = &thisCardInst->tiRscInfo;
   
   AG_GLOBAL_ARG(flags);
 
   AGTIAPI_PRINTK( "agtiapi_ReleaseHBA: start\n" );
   
   if (thisCardInst != pCardInfo)
   {
     AGTIAPI_PRINTK( "agtiapi_ReleaseHBA: Wrong ag_card_info_t thisCardInst %p "
                     "pCardInfo %p\n",
                     thisCardInst,
                     pCardInfo );
     panic( "agtiapi_ReleaseHBA: Wrong ag_card_info_t thisCardInst %p pCardInfo "
            "%p\n",
            thisCardInst,
            pCardInfo );
     return( EIO );
   }
 
 
   AGTIAPI_PRINTK( "agtiapi_ReleaseHBA card %p\n", pCard );
   pCard->flags |= AGTIAPI_SHUT_DOWN;
 
 
   // remove timer
   if (pCard->flags & AGTIAPI_TIMER_ON)
   {
     AG_SPIN_LOCK_IRQ( agtiapi_host_lock, flags );
     callout_drain( &pCard->OS_timer );
     callout_drain( &pCard->devRmTimer );
     callout_drain(&pCard->IO_timer);
     AG_SPIN_UNLOCK_IRQ( agtiapi_host_lock, flags );
     AGTIAPI_PRINTK( "agtiapi_ReleaseHBA: timer released\n" );
   }
 
 #ifdef HIALEAH_ENCRYPTION
 //Release encryption table memory - Fix it
    //if(pCard->encrypt && (pCard->flags & AGTIAPI_INSTALLED))
 	//agtiapi_CleanupEncryption(pCard);
 #endif
 
   /*
    * Shutdown the channel so that chip gets frozen
    * and it does not do any more pci-bus accesses.
    */
   if (pCard->flags & AGTIAPI_SYS_INTR_ON)
   {
     tiCOMSystemInterruptsActive( &pCard->tiRoot, FALSE );
     pCard->flags &= ~AGTIAPI_SYS_INTR_ON;
     AGTIAPI_PRINTK( "agtiapi_ReleaseHBA: card interrupt off\n" );
   }
   if (pCard->flags & AGTIAPI_INSTALLED)
   {
     tiCOMShutDown( &pCard->tiRoot );
     AGTIAPI_PRINTK( "agtiapi_ReleaseHBA: low layers shutdown\n" );
   }
   
   /* 
    * first release IRQ, so that we do not get any more interrupts
    * from this host
    */
   if (pCard->flags & AGTIAPI_IRQ_REQUESTED)
   {
     if (!agtiapi_intx_mode)
     {
       int i;
       for (i = 0; i< MAX_MSIX_NUM_VECTOR; i++)
       {
         if (pCard->irq[i] != agNULL && pCard->rscID[i] != 0)
         {
           bus_teardown_intr(dev, pCard->irq[i], pCard->intrcookie[i]);
           bus_release_resource( dev,
                                 SYS_RES_IRQ,
                                 pCard->rscID[i],
                                 pCard->irq[i] );
         }
       }
       pci_release_msi(dev);
     }    
     pCard->flags &= ~AGTIAPI_IRQ_REQUESTED;
 
 
 
 #ifdef AGTIAPI_DPC
     for (i = 0; i < MAX_MSIX_NUM_DPC; i++)
       tasklet_kill(&pCard->tasklet_dpc[i]);
 #endif
     AGTIAPI_PRINTK("agtiapi_ReleaseHBA: IRQ released\n");
   }
 
   // release memory vs. alloc in agtiapi_alloc_ostimem; used in ostiAllocMemory
   if( pCard->osti_busaddr != 0 ) {
     bus_dmamap_unload( pCard->osti_dmat, pCard->osti_mapp );
   }
   if( pCard->osti_mem != NULL )  {
     bus_dmamem_free( pCard->osti_dmat, pCard->osti_mem, pCard->osti_mapp );
   }    
   if( pCard->osti_dmat != NULL ) {
     bus_dma_tag_destroy( pCard->osti_dmat );
   }
 
   /* unmap the mapped PCI memory */ 
   /* calls bus_release_resource( ,SYS_RES_MEMORY, ..) */ 
   agtiapi_ReleasePCIMem(thisCardInst);
 
   /* release all ccbs */
   if (pCard->ccbTotal)
   {
     //calls bus_dmamap_destroy() for all pccbs
     agtiapi_ReleaseCCBs(pCard);
     AGTIAPI_PRINTK("agtiapi_ReleaseHBA: CCB released\n");
   }
 
 #ifdef HIALEAH_ENCRYPTION
 /*release encryption resources - Fix it*/
   if(pCard->encrypt)
   {
     /*Check that all IO's are completed */
     if(atomic_read (&outstanding_encrypted_io_count) > 0)
     {
        printf("%s: WARNING: %d outstanding encrypted IOs !\n", __FUNCTION__, atomic_read(&outstanding_encrypted_io_count));
     }
     //agtiapi_CleanupEncryptionPools(pCard);
   }
 #endif
 
 
   /* release device list */
   if( pCard->pDevList ) {
     free((caddr_t)pCard->pDevList, M_PMC_MDVT);
     pCard->pDevList = NULL;
     AGTIAPI_PRINTK("agtiapi_ReleaseHBA: device list released\n");
   }
 #ifdef LINUX_PERBI_SUPPORT // ## review use of PERBI
   AGTIAPI_PRINTK( "agtiapi_ReleaseHBA: WWN list %p \n", pCard->pWWNList );
   if( pCard->pWWNList ) {
     free( (caddr_t)pCard->pWWNList, M_PMC_MTGT );
     pCard->pWWNList = NULL;
     AGTIAPI_PRINTK("agtiapi_ReleaseHBA: WWN list released\n");
   }
   if( pCard->pSLRList ) {
     free( (caddr_t)pCard->pSLRList, M_PMC_MSLR );
     pCard->pSLRList = NULL;
     AGTIAPI_PRINTK("agtiapi_ReleaseHBA: SAS Local Remote list released\n");
   }
 
 #endif
   if (pCard->pPortalData)
   {
     free((caddr_t)pCard->pPortalData, M_PMC_MPRT);
     pCard->pPortalData = NULL;
     AGTIAPI_PRINTK("agtiapi_ReleaseHBA: PortalData released\n");
   }
-  //calls contigfree() or free()  
   agtiapi_MemFree(pCardInfo);
   AGTIAPI_PRINTK("agtiapi_ReleaseHBA: low level resource released\n");
 
 #ifdef HOTPLUG_SUPPORT
   if (pCard->flags & AGTIAPI_PORT_INITIALIZED)
   {
     //    agtiapi_FreeDevWorkList(pCard);
     AGTIAPI_PRINTK("agtiapi_ReleaseHBA: (HP dev) work resources released\n");
   }
 #endif
 
   /* 
    * TBD, scsi_unregister may release wrong host data structure
    * which cause NULL pointer shows up.  
    */
   if (pCard->flags & AGTIAPI_SCSI_REGISTERED)
   {
     pCard->flags &= ~AGTIAPI_SCSI_REGISTERED;
 
 
 #ifdef AGTIAPI_LOCAL_LOCK
     if (pCard->STLock)
     {
       //destroy mtx
       int maxLocks;
       maxLocks = pRscInfo->tiLoLevelResource.loLevelOption.numOfQueuesPerPort;
 
       for( i = 0; i < maxLocks; i++ ) 
       { 
         mtx_destroy(&pCard->STLock[i]);
       }     
       free(pCard->STLock, M_PMC_MSTL);
       pCard->STLock = NULL;
     }
 #endif
 
   }
   ag_card_good--;
 
   /* reset agtiapi_1st_time if this is the only card */
   if (!ag_card_good && !agtiapi_1st_time)
   {
     agtiapi_1st_time = 1;
   }
 
   /* for tiSgl_t memeory */
   if (pCard->tisgl_busaddr != 0)
   {
     bus_dmamap_unload(pCard->tisgl_dmat, pCard->tisgl_map);
   }    
   if (pCard->tisgl_mem != NULL)
   {  
     bus_dmamem_free(pCard->tisgl_dmat, pCard->tisgl_mem, pCard->tisgl_map);
   }    
   if (pCard->tisgl_dmat != NULL)
   {  
     bus_dma_tag_destroy(pCard->tisgl_dmat);
   }
       
   if (pCard->buffer_dmat != agNULL)
   {
     bus_dma_tag_destroy(pCard->buffer_dmat);
   }
   
   if (pCard->sim != NULL) 
   {
     mtx_lock(&thisCardInst->pmIOLock);
       memset(&csa, 0, sizeof(csa));
       xpt_setup_ccb(&csa.ccb_h, pCard->path, 5);
       csa.ccb_h.func_code = XPT_SASYNC_CB;
       csa.event_enable = 0;
       csa.callback = agtiapi_async;
       csa.callback_arg = pCard;
       xpt_action((union ccb *)&csa);
       xpt_free_path(pCard->path);
  //   if (pCard->ccbTotal == 0)
     if (pCard->ccbTotal <= thisCard)
     {
       /*
         no link up so that simq has not been released.
         In order to remove cam, we call this.
       */
       xpt_release_simq(pCard->sim, 1);
     }
     xpt_bus_deregister(cam_sim_path(pCard->sim));
     cam_sim_free(pCard->sim, FALSE);
     mtx_unlock(&thisCardInst->pmIOLock);
   }
   if (pCard->devq != NULL)
   {
     cam_simq_free(pCard->devq);
   }
 
   //destroy mtx
   mtx_destroy( &thisCardInst->pmIOLock );
   mtx_destroy( &pCard->sendLock );
   mtx_destroy( &pCard->doneLock );
   mtx_destroy( &pCard->sendSMPLock );
   mtx_destroy( &pCard->doneSMPLock );
   mtx_destroy( &pCard->ccbLock );
   mtx_destroy( &pCard->devListLock );
   mtx_destroy( &pCard->OS_timer_lock );
   mtx_destroy( &pCard->devRmTimerLock );
   mtx_destroy( &pCard->memLock );
   mtx_destroy( &pCard->freezeLock );
 
   destroy_dev( pCard->my_cdev );
   memset((void *)pCardInfo, 0, sizeof(ag_card_info_t));
   return 0;
 }
 
 
 // Called during system shutdown after sync
 static int agtiapi_shutdown( device_t dev )
 {
   AGTIAPI_PRINTK( "agtiapi_shutdown\n" );
   return( 0 );
 }
 
 static int agtiapi_suspend( device_t dev )  // Device suspend routine.
 {
   AGTIAPI_PRINTK( "agtiapi_suspend\n" );
   return( 0 );
 }
 
 static int agtiapi_resume( device_t dev ) // Device resume routine.
 {
   AGTIAPI_PRINTK( "agtiapi_resume\n" );
   return( 0 );
 }
 
 static device_method_t agtiapi_methods[] = {   // Device interface
   DEVMETHOD( device_probe,    agtiapi_probe      ),
   DEVMETHOD( device_attach,   agtiapi_attach     ),
   DEVMETHOD( device_detach,   agtiapi_ReleaseHBA ),
   DEVMETHOD( device_shutdown, agtiapi_shutdown   ),
   DEVMETHOD( device_suspend,  agtiapi_suspend    ),
   DEVMETHOD( device_resume,   agtiapi_resume     ),
   { 0, 0 }
 };
 
 static driver_t pmspcv_driver = {
   "pmspcv",
   agtiapi_methods,
   sizeof( struct agtiapi_softc )
 };
 
 DRIVER_MODULE( pmspcv, pci, pmspcv_driver, 0, 0 );
 MODULE_DEPEND( pmspcv, cam, 1, 1, 1 );
 MODULE_DEPEND( pmspcv, pci, 1, 1, 1 );
 
 #include <dev/pms/freebsd/driver/common/lxosapi.c>
 #include <dev/pms/freebsd/driver/ini/src/osapi.c>
 #include <dev/pms/freebsd/driver/common/lxutil.c>
 #include <dev/pms/freebsd/driver/common/lxencrypt.c>
 
 
diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c
index 03eca4d96286..353d41808800 100644
--- a/sys/dev/pst/pst-iop.c
+++ b/sys/dev/pst/pst-iop.c
@@ -1,501 +1,501 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (c) 2001,2002,2003 Søren Schmidt <sos@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,
  *    without modification, immediately at the beginning of the file.
  * 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.
  * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * 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.
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/bio.h>
 #include <sys/malloc.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 
 #include "dev/pst/pst-iop.h"
 
 struct iop_request {
     struct i2o_single_reply *reply;
     u_int32_t mfa;
 };
 
 /* local vars */
 MALLOC_DEFINE(M_PSTIOP, "PSTIOP", "Promise SuperTrak IOP driver");
 
 int
 iop_init(struct iop_softc *sc)
 {
     int mfa, timeout = 10000;
 
     while ((mfa = sc->reg->iqueue) == 0xffffffff && --timeout)
 	DELAY(1000);
     if (!timeout) {
 	printf("pstiop: no free mfa\n");
 	return 0;
     }
     iop_free_mfa(sc, mfa);
 
     sc->reg->oqueue_intr_mask = 0xffffffff;
 
     if (!iop_reset(sc)) {
 	printf("pstiop: no reset response\n");
 	return 0;
     }
 
     if (!iop_init_outqueue(sc)) {
 	printf("pstiop: init outbound queue failed\n");
 	return 0;
     }
 
     /* register iop_attach to be run when interrupts are enabled */
     if (!(sc->iop_delayed_attach = (struct intr_config_hook *)
 				   malloc(sizeof(struct intr_config_hook),
 				   M_PSTIOP, M_NOWAIT | M_ZERO))) {
 	printf("pstiop: malloc of delayed attach hook failed\n");
 	return 0;
     }
     sc->iop_delayed_attach->ich_func = iop_attach;
     sc->iop_delayed_attach->ich_arg = sc;
     if (config_intrhook_establish(sc->iop_delayed_attach)) {
 	printf("pstiop: config_intrhook_establish failed\n");
 	free(sc->iop_delayed_attach, M_PSTIOP);
     }
     return 1;
 }
 
 void
 iop_attach(void *arg)
 {
     struct iop_softc *sc;
     int i;
 
     sc = arg;
     if (sc->iop_delayed_attach) {
 	config_intrhook_disestablish(sc->iop_delayed_attach);
 	free(sc->iop_delayed_attach, M_PSTIOP);
 	sc->iop_delayed_attach = NULL;
     }
 
     if (!iop_get_lct(sc)) {
 	printf("pstiop: get LCT failed\n");
 	return;
     }
 
     /* figure out what devices are here and config as needed */
     for (i = 0; sc->lct[i].entry_size == I2O_LCT_ENTRYSIZE; i++) {
 #ifdef PSTDEBUG
 	struct i2o_get_param_reply *reply;
 
 	printf("pstiop: LCT entry %d ", i);
 	printf("class=%04x ", sc->lct[i].class);
 	printf("sub=%04x ", sc->lct[i].sub_class);
 	printf("localtid=%04x ", sc->lct[i].local_tid);
 	printf("usertid=%04x ", sc->lct[i].user_tid);
 	printf("parentid=%04x\n", sc->lct[i].parent_tid);
 
 	if ((reply = iop_get_util_params(sc, sc->lct[i].local_tid,
 					 I2O_PARAMS_OPERATION_FIELD_GET,
 					 I2O_UTIL_DEVICE_IDENTITY_GROUP_NO))) {
 	    struct i2o_device_identity *ident =
 		(struct i2o_device_identity *)reply->result;
 	    printf("pstiop: vendor=<%.16s> product=<%.16s>\n",
 		   ident->vendor, ident->product);
 	    printf("pstiop: description=<%.16s> revision=<%.8s>\n",
 		   ident->description, ident->revision);
-	    contigfree(reply, PAGE_SIZE, M_PSTIOP);
+	    free(reply, M_PSTIOP);
 	}
 #endif
 
 	if (sc->lct[i].user_tid != I2O_TID_NONE &&
 	    sc->lct[i].user_tid != I2O_TID_HOST)
 	    continue;
 
 	switch (sc->lct[i].class) {
 	case I2O_CLASS_DDM:
 	    if (sc->lct[i].sub_class == I2O_SUBCLASS_ISM)
 		sc->ism = sc->lct[i].local_tid;
 	    break;
 
 	case I2O_CLASS_RANDOM_BLOCK_STORAGE:
 	    pst_add_raid(sc, &sc->lct[i]);
 	    break;
 	}
     }
 
     /* setup and enable interrupts */
     bus_setup_intr(sc->dev, sc->r_irq, INTR_TYPE_BIO|INTR_ENTROPY|INTR_MPSAFE,
 		   NULL, iop_intr, sc, &sc->handle);
     sc->reg->oqueue_intr_mask = 0x0;
 }
 
 void
 iop_intr(void *data)
 {
     struct iop_softc *sc = (struct iop_softc *)data;
     struct i2o_single_reply *reply;
     u_int32_t mfa;
 
     /* we might get more than one finished request pr interrupt */
     mtx_lock(&sc->mtx);
     while (1) {
 	if ((mfa = sc->reg->oqueue) == 0xffffffff)
 	    if ((mfa = sc->reg->oqueue) == 0xffffffff)
 		break;
 
 	reply = (struct i2o_single_reply *)(sc->obase + (mfa - sc->phys_obase));
 
 	/* if this is an event register reply, shout! */
 	if (reply->function == I2O_UTIL_EVENT_REGISTER) {
 	    struct i2o_util_event_reply_message *event =
 		(struct i2o_util_event_reply_message *)reply;
 
 	    printf("pstiop: EVENT!! idx=%08x data=%08x\n",
 		   event->event_mask, event->event_data[0]);
 	    break;
 	}
 
 	/* if reply is a failurenotice we need to free the original mfa */
 	if (reply->message_flags & I2O_MESSAGE_FLAGS_FAIL)
 	    iop_free_mfa(sc,((struct i2o_fault_reply *)(reply))->preserved_mfa);
 
 	/* reply->initiator_context points to the service routine */
 	((void (*)(struct iop_softc *, u_int32_t, struct i2o_single_reply *))
 	    (reply->initiator_context))(sc, mfa, reply);
     }
     mtx_unlock(&sc->mtx);
 }
 
 int
 iop_reset(struct iop_softc *sc)
 {
     struct i2o_exec_iop_reset_message *msg;
     int mfa, timeout = 5000;
     volatile u_int32_t reply = 0;
 
     mfa = iop_get_mfa(sc);
     msg = (struct i2o_exec_iop_reset_message *)(sc->ibase + mfa);
     bzero(msg, sizeof(struct i2o_exec_iop_reset_message));
     msg->version_offset = 0x1;
     msg->message_flags = 0x0;
     msg->message_size = sizeof(struct i2o_exec_iop_reset_message) >> 2;
     msg->target_address = I2O_TID_IOP;
     msg->initiator_address = I2O_TID_HOST;
     msg->function = I2O_EXEC_IOP_RESET;
     msg->status_word_low_addr = vtophys(&reply);
     msg->status_word_high_addr = 0;
 
     sc->reg->iqueue = mfa;
 
     while (--timeout && !reply)
 	DELAY(1000);
 
     /* wait for iqueue ready */
     timeout = 10000;
     while ((mfa = sc->reg->iqueue) == 0xffffffff && --timeout)
 	DELAY(1000);
 
     iop_free_mfa(sc, mfa);
     return reply;
 }
 
 int
 iop_init_outqueue(struct iop_softc *sc)
 {
     struct i2o_exec_init_outqueue_message *msg;
     int i, mfa, timeout = 5000;
     volatile u_int32_t reply = 0;
 
     if (!(sc->obase = contigmalloc(I2O_IOP_OUTBOUND_FRAME_COUNT *
 				   I2O_IOP_OUTBOUND_FRAME_SIZE,
 				   M_PSTIOP, M_NOWAIT,
 				   0x00010000, 0xFFFFFFFF,
 				   PAGE_SIZE, 0))) {
 	printf("pstiop: contigmalloc of outqueue buffers failed!\n");
 	return 0;
     }
     sc->phys_obase = vtophys(sc->obase);
     mfa = iop_get_mfa(sc);
     msg = (struct i2o_exec_init_outqueue_message *)(sc->ibase + mfa);
     bzero(msg, sizeof(struct i2o_exec_init_outqueue_message));
     msg->version_offset = 0x61;
     msg->message_flags = 0x0;
     msg->message_size = sizeof(struct i2o_exec_init_outqueue_message) >> 2;
     msg->target_address = I2O_TID_IOP;
     msg->initiator_address = I2O_TID_HOST;
     msg->function = I2O_EXEC_OUTBOUND_INIT;
     msg->host_pagesize = PAGE_SIZE;
     msg->init_code = 0x00; /* SOS XXX should be 0x80 == OS */
     msg->queue_framesize = I2O_IOP_OUTBOUND_FRAME_SIZE / sizeof(u_int32_t);
     msg->sgl[0].flags = I2O_SGL_SIMPLE | I2O_SGL_END | I2O_SGL_EOB;
     msg->sgl[0].count = sizeof(reply);
     msg->sgl[0].phys_addr[0] = vtophys(&reply);
     msg->sgl[1].flags = I2O_SGL_END | I2O_SGL_EOB;
     msg->sgl[1].count = 1;
     msg->sgl[1].phys_addr[0] = 0;
 
     sc->reg->iqueue = mfa;
 
     /* wait for init to complete */
     while (--timeout && reply != I2O_EXEC_OUTBOUND_INIT_COMPLETE)
 	DELAY(1000);
 
     if (!timeout) {
 	printf("pstiop: timeout waiting for init-complete response\n");
 	iop_free_mfa(sc, mfa);
 	return 0;
     }
 
     /* now init our oqueue bufs */
     for (i = 0; i < I2O_IOP_OUTBOUND_FRAME_COUNT; i++) {
 	sc->reg->oqueue = sc->phys_obase + (i * I2O_IOP_OUTBOUND_FRAME_SIZE);
 	DELAY(1000);
     }
 
     return 1;
 }
 
 int
 iop_get_lct(struct iop_softc *sc)
 {
     struct i2o_exec_get_lct_message *msg;
     struct i2o_get_lct_reply *reply;
     int mfa;
 #define ALLOCSIZE	 (PAGE_SIZE + (256 * sizeof(struct i2o_lct_entry)))
 
     if (!(reply = contigmalloc(ALLOCSIZE, M_PSTIOP, M_NOWAIT | M_ZERO,
 			       0x00010000, 0xFFFFFFFF, PAGE_SIZE, 0)))
 	return 0;
 
     mfa = iop_get_mfa(sc);
     msg = (struct i2o_exec_get_lct_message *)(sc->ibase + mfa);
     bzero(msg, sizeof(struct i2o_exec_get_lct_message));
     msg->version_offset = 0x61;
     msg->message_flags = 0x0;
     msg->message_size = sizeof(struct i2o_exec_get_lct_message) >> 2;
     msg->target_address = I2O_TID_IOP;
     msg->initiator_address = I2O_TID_HOST;
     msg->function = I2O_EXEC_LCT_NOTIFY;
     msg->class = I2O_CLASS_MATCH_ANYCLASS;
     msg->last_change_id = 0;
 
     msg->sgl.flags = I2O_SGL_SIMPLE | I2O_SGL_END | I2O_SGL_EOB;
     msg->sgl.count = ALLOCSIZE;
     msg->sgl.phys_addr[0] = vtophys(reply);
 
     if (iop_queue_wait_msg(sc, mfa, (struct i2o_basic_message *)msg)) {
-	contigfree(reply, ALLOCSIZE, M_PSTIOP);
+	free(reply, M_PSTIOP);
 	return 0;
     }
     if (!(sc->lct = malloc(reply->table_size * sizeof(struct i2o_lct_entry),
 			   M_PSTIOP, M_NOWAIT | M_ZERO))) {
-	contigfree(reply, ALLOCSIZE, M_PSTIOP);
+	free(reply, M_PSTIOP);
 	return 0;
     }
     bcopy(&reply->entry[0], sc->lct,
 	  reply->table_size * sizeof(struct i2o_lct_entry));
     sc->lct_count = reply->table_size;
-    contigfree(reply, ALLOCSIZE, M_PSTIOP);
+    free(reply, M_PSTIOP);
     return 1;
 }
 
 struct i2o_get_param_reply *
 iop_get_util_params(struct iop_softc *sc, int target, int operation, int group)
 {
     struct i2o_util_get_param_message *msg;
     struct i2o_get_param_operation *param;
     struct i2o_get_param_reply *reply;
     int mfa;
 
     if (!(param = contigmalloc(PAGE_SIZE, M_PSTIOP, M_NOWAIT | M_ZERO,
 			       0x00010000, 0xFFFFFFFF, PAGE_SIZE, 0)))
 	return NULL;
 
     if (!(reply = contigmalloc(PAGE_SIZE, M_PSTIOP, M_NOWAIT | M_ZERO,
 			       0x00010000, 0xFFFFFFFF, PAGE_SIZE, 0)))
 	return NULL;
 
     mfa = iop_get_mfa(sc);
     msg = (struct i2o_util_get_param_message *)(sc->ibase + mfa);
     bzero(msg, sizeof(struct i2o_util_get_param_message));
     msg->version_offset = 0x51;
     msg->message_flags = 0x0;
     msg->message_size = sizeof(struct i2o_util_get_param_message) >> 2;
     msg->target_address = target;
     msg->initiator_address = I2O_TID_HOST;
     msg->function = I2O_UTIL_PARAMS_GET;
     msg->operation_flags = 0;
 
     param->operation_count = 1;
     param->operation[0].operation = operation;
     param->operation[0].group = group;
     param->operation[0].field_count = 0xffff;
 
     msg->sgl[0].flags = I2O_SGL_SIMPLE | I2O_SGL_DIR | I2O_SGL_EOB;
     msg->sgl[0].count = sizeof(struct i2o_get_param_operation);
     msg->sgl[0].phys_addr[0] = vtophys(param);
 
     msg->sgl[1].flags = I2O_SGL_SIMPLE | I2O_SGL_END | I2O_SGL_EOB;
     msg->sgl[1].count = PAGE_SIZE;
     msg->sgl[1].phys_addr[0] = vtophys(reply);
 
     if (iop_queue_wait_msg(sc, mfa, (struct i2o_basic_message *)msg) ||
 	reply->error_info_size) {
-	contigfree(reply, PAGE_SIZE, M_PSTIOP);
+	free(reply, M_PSTIOP);
 	reply = NULL;
     }
-    contigfree(param, PAGE_SIZE, M_PSTIOP);
+    free(param, M_PSTIOP);
     return reply;
 }
 
 u_int32_t
 iop_get_mfa(struct iop_softc *sc)
 {
     u_int32_t mfa;
     int timeout = 10000;
 
     while ((mfa = sc->reg->iqueue) == 0xffffffff && timeout) {
 	DELAY(1000);
 	timeout--;
     }
     if (!timeout)
 	printf("pstiop: no free mfa\n");
     return mfa;
 }
 
 void
 iop_free_mfa(struct iop_softc *sc, int mfa)
 {
     struct i2o_basic_message *msg = (struct i2o_basic_message *)(sc->ibase+mfa);
 
     bzero(msg, sizeof(struct i2o_basic_message));
     msg->version = 0x01;
     msg->message_flags = 0x0;
     msg->message_size = sizeof(struct i2o_basic_message) >> 2;
     msg->target_address = I2O_TID_IOP;
     msg->initiator_address = I2O_TID_HOST;
     msg->function = I2O_UTIL_NOP;
     sc->reg->iqueue = mfa;
 }
 
 static void
 iop_done(struct iop_softc *sc, u_int32_t mfa, struct i2o_single_reply *reply)
 {
     struct iop_request *request =
         (struct iop_request *)reply->transaction_context;
     
     request->reply = reply;
     request->mfa = mfa;
     wakeup(request);
 }
 
 int
 iop_queue_wait_msg(struct iop_softc *sc, int mfa, struct i2o_basic_message *msg)
 {
     struct i2o_single_reply *reply;
     struct iop_request request;
     u_int32_t out_mfa;
     int status, timeout = 10000;
 
     mtx_lock(&sc->mtx);
     if ((sc->reg->oqueue_intr_mask & I2O_OUT_INTR_QUEUE) == 0) {
         msg->transaction_context = (u_int32_t)&request;
         msg->initiator_context = (u_int32_t)iop_done;
         sc->reg->iqueue = mfa;
         if (msleep(&request, &sc->mtx, PRIBIO, "pstwt", 10 * hz)) {
 	    printf("pstiop: timeout waiting for message response\n");
 	    iop_free_mfa(sc, mfa);
 	    mtx_unlock(&sc->mtx);
 	    return -1;
 	}
         status = request.reply->status;
         sc->reg->oqueue = request.mfa;
     }
     else {
 	sc->reg->iqueue = mfa;
 	while (--timeout && ((out_mfa = sc->reg->oqueue) == 0xffffffff))
 	    DELAY(1000);
 	if (!timeout) {
 	    printf("pstiop: timeout waiting for message response\n");
 	    iop_free_mfa(sc, mfa);
 	    mtx_unlock(&sc->mtx);
 	    return -1;
 	}
 	reply = (struct i2o_single_reply *)(sc->obase+(out_mfa-sc->phys_obase));
 	status = reply->status;
 	sc->reg->oqueue = out_mfa;
     }
     mtx_unlock(&sc->mtx);
     return status;
 }
 
 int
 iop_create_sgl(struct i2o_basic_message *msg, caddr_t data, int count, int dir)
 {
     struct i2o_sgl *sgl = (struct i2o_sgl *)((int32_t *)msg + msg->offset);
     u_int32_t sgl_count, sgl_phys;
     int i = 0;
 
     if (((uintptr_t)data & 3) || (count & 3)) {
 	printf("pstiop: non aligned DMA transfer attempted\n");
 	return 0;
     }
     if (!count) {
 	printf("pstiop: zero length DMA transfer attempted\n");
 	return 0;
     }
 
     sgl_count = min(count, (PAGE_SIZE - ((uintptr_t)data & PAGE_MASK)));
     sgl_phys = vtophys(data);
     sgl->flags = dir | I2O_SGL_PAGELIST | I2O_SGL_EOB | I2O_SGL_END;
     sgl->count = count;
     data += sgl_count;
     count -= sgl_count;
 
     while (count) {
 	sgl->phys_addr[i] = sgl_phys;
 	sgl_phys = vtophys(data);
 	data += min(count, PAGE_SIZE);
 	count -= min(count, PAGE_SIZE);
 	if (++i >= I2O_SGL_MAX_SEGS) {
 	    printf("pstiop: too many segments in SGL\n");
 	    return 0;
 	}
     }
     sgl->phys_addr[i] = sgl_phys;
     msg->message_size += i;
     return 1;
 }
diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c
index 47739f02ee82..f1d66f7598ed 100644
--- a/sys/dev/pst/pst-raid.c
+++ b/sys/dev/pst/pst-raid.c
@@ -1,380 +1,380 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2001,2002,2003 Søren Schmidt <sos@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,
  *    without modification, immediately at the beginning of the file.
  * 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.
  * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * 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.
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/module.h>
 #include <sys/bio.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/rman.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #include <machine/stdarg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include "dev/pst/pst-iop.h"
 
 #include <geom/geom_disk.h>
 
 struct pst_softc {
     struct iop_softc		*iop;
     struct i2o_lct_entry	*lct;
     struct i2o_bsa_device	*info;
     struct disk			*disk;
     struct bio_queue_head	queue;
 };
 
 struct pst_request {
     struct pst_softc		*psc;		/* pointer to softc */
     u_int32_t			mfa;		/* frame addreess */
     struct callout		timeout;	/* timeout timer */
     struct bio			*bp;		/* associated bio ptr */
 };
 
 /* prototypes */
 static disk_strategy_t pststrategy;
 static int pst_probe(device_t);
 static int pst_attach(device_t);
 static void pst_shutdown_post_sync(device_t, int);
 static void pst_start(struct pst_softc *);
 static void pst_done(struct iop_softc *, u_int32_t, struct i2o_single_reply *);
 static int pst_rw(struct pst_request *);
 static void pst_timeout(void *);
 static void bpack(int8_t *, int8_t *, int);
 
 /* local vars */
 static MALLOC_DEFINE(M_PSTRAID, "pst", "Promise SuperTrak RAID driver");
 
 int
 pst_add_raid(struct iop_softc *sc, struct i2o_lct_entry *lct)
 {
     struct pst_softc *psc;
     device_t child = device_add_child(sc->dev, "pst", DEVICE_UNIT_ANY);
 
     if (!child)
 	return ENOMEM;
     if (!(psc = malloc(sizeof(struct pst_softc), 
 		       M_PSTRAID, M_NOWAIT | M_ZERO))) {
 	device_delete_child(sc->dev, child);
 	return ENOMEM;
     }
     psc->iop = sc;
     psc->lct = lct;
     device_set_softc(child, psc);
     return device_probe_and_attach(child);
 }
 
 static int
 pst_probe(device_t dev)
 {
     device_set_desc(dev, "Promise SuperTrak RAID");
     return 0;
 }
 
 static int
 pst_attach(device_t dev)
 {
     struct pst_softc *psc = device_get_softc(dev);
     struct i2o_get_param_reply *reply;
     struct i2o_device_identity *ident;
     int lun = device_get_unit(dev);
     int8_t name [32];
 
     if (!(reply = iop_get_util_params(psc->iop, psc->lct->local_tid,
 				      I2O_PARAMS_OPERATION_FIELD_GET,
 				      I2O_BSA_DEVICE_INFO_GROUP_NO)))
 	return ENODEV;
 
     if (!(psc->info = (struct i2o_bsa_device *)
 	    malloc(sizeof(struct i2o_bsa_device), M_PSTRAID, M_NOWAIT))) {
-	contigfree(reply, PAGE_SIZE, M_PSTIOP);
+	free(reply, M_PSTIOP);
 	return ENOMEM;
     }
     bcopy(reply->result, psc->info, sizeof(struct i2o_bsa_device));
-    contigfree(reply, PAGE_SIZE, M_PSTIOP);
+    free(reply, M_PSTIOP);
 
     if (!(reply = iop_get_util_params(psc->iop, psc->lct->local_tid,
 				      I2O_PARAMS_OPERATION_FIELD_GET,
 				      I2O_UTIL_DEVICE_IDENTITY_GROUP_NO)))
 	return ENODEV;
     ident = (struct i2o_device_identity *)reply->result;
 #ifdef PSTDEBUG	   
     printf("pst: vendor=<%.16s> product=<%.16s>\n",
 	   ident->vendor, ident->product);
     printf("pst: description=<%.16s> revision=<%.8s>\n",
 	   ident->description, ident->revision);
     printf("pst: capacity=%lld blocksize=%d\n",
 	   psc->info->capacity, psc->info->block_size);
 #endif
     bpack(ident->vendor, ident->vendor, 16);
     bpack(ident->product, ident->product, 16);
     sprintf(name, "%s %s", ident->vendor, ident->product);
-    contigfree(reply, PAGE_SIZE, M_PSTIOP);
+    free(reply, M_PSTIOP);
 
     bioq_init(&psc->queue);
 
     psc->disk = disk_alloc();
     psc->disk->d_name = "pst";
     psc->disk->d_strategy = pststrategy;
     psc->disk->d_maxsize = 64 * 1024; /*I2O_SGL_MAX_SEGS * PAGE_SIZE;*/
     psc->disk->d_drv1 = psc;
     psc->disk->d_unit = lun;
 
     psc->disk->d_sectorsize = psc->info->block_size;
     psc->disk->d_mediasize = psc->info->capacity;
     psc->disk->d_fwsectors = 63;
     psc->disk->d_fwheads = 255;
 
     disk_create(psc->disk, DISK_VERSION);
 
     printf("pst%d: %lluMB <%.40s> [%lld/%d/%d] on %.16s\n", lun,
 	   (unsigned long long)psc->info->capacity / (1024 * 1024),
 	   name, psc->info->capacity/(512*255*63), 255, 63,
 	   device_get_nameunit(psc->iop->dev));
 
     EVENTHANDLER_REGISTER(shutdown_post_sync, pst_shutdown_post_sync,
 			  dev, SHUTDOWN_PRI_FIRST);
     return 0;
 }
 
 static void
 pst_shutdown_post_sync(device_t dev, int howto __unused)
 {
     struct pst_softc *psc = device_get_softc(dev);
     struct i2o_bsa_cache_flush_message *msg;
     int mfa;
 
     if (SCHEDULER_STOPPED()) {
 	/* Request polled shutdown. */
 	psc->iop->reg->oqueue_intr_mask = 0xffffffff;
     }
 
     mfa = iop_get_mfa(psc->iop);
     msg = (struct i2o_bsa_cache_flush_message *)(psc->iop->ibase + mfa);
     bzero(msg, sizeof(struct i2o_bsa_cache_flush_message));
     msg->version_offset = 0x01;
     msg->message_flags = 0x0;
     msg->message_size = sizeof(struct i2o_bsa_cache_flush_message) >> 2;
     msg->target_address = psc->lct->local_tid;
     msg->initiator_address = I2O_TID_HOST;
     msg->function = I2O_BSA_CACHE_FLUSH;
     msg->control_flags = 0x0; /* 0x80 = post progress reports */
     if (iop_queue_wait_msg(psc->iop, mfa, (struct i2o_basic_message *)msg))
 	printf("pst: shutdown failed!\n");
 }
 
 static void
 pststrategy(struct bio *bp)
 {
     struct pst_softc *psc = bp->bio_disk->d_drv1;
     
     mtx_lock(&psc->iop->mtx);
     bioq_disksort(&psc->queue, bp);
     pst_start(psc);
     mtx_unlock(&psc->iop->mtx);
 }
 
 static void
 pst_start(struct pst_softc *psc)
 {
     struct pst_request *request;
     struct bio *bp;
     u_int32_t mfa;
     int error;
 
     if (psc->iop->outstanding < (I2O_IOP_OUTBOUND_FRAME_COUNT - 1) &&
 	(bp = bioq_first(&psc->queue))) {
 	if ((mfa = iop_get_mfa(psc->iop)) != 0xffffffff) {
 	    bioq_remove(&psc->queue, bp);
 	    if (!(request = malloc(sizeof(struct pst_request),
 				   M_PSTRAID, M_NOWAIT | M_ZERO))) {
 		printf("pst: out of memory in start\n");
 		biofinish(request->bp, NULL, ENOMEM);
 		iop_free_mfa(psc->iop, mfa);
 		return;
 	    }
 	    callout_init_mtx(&request->timeout, &psc->iop->mtx, 0);
 	    psc->iop->outstanding++;
 	    request->psc = psc;
 	    request->mfa = mfa;
 	    request->bp = bp;
 	    if ((error = pst_rw(request)) != 0) {
 		biofinish(request->bp, NULL, error);
 		iop_free_mfa(request->psc->iop, request->mfa);
 		psc->iop->outstanding--;
 		free(request, M_PSTRAID);
 	    }
 	}
     }
 }
 
 static void
 pst_done(struct iop_softc *sc, u_int32_t mfa, struct i2o_single_reply *reply)
 {
     struct pst_request *request =
 	(struct pst_request *)reply->transaction_context;
     struct pst_softc *psc = request->psc;
 
     callout_stop(&request->timeout);
     request->bp->bio_resid = request->bp->bio_bcount - reply->donecount;
     biofinish(request->bp, NULL, reply->status ? EIO : 0);
     free(request, M_PSTRAID);
     psc->iop->reg->oqueue = mfa;
     psc->iop->outstanding--;
     pst_start(psc);
 }
 
 int
 pst_rw(struct pst_request *request)
 {
     struct i2o_bsa_rw_block_message *msg;
     int sgl_flag;
 
     msg = (struct i2o_bsa_rw_block_message *)
 	  (request->psc->iop->ibase + request->mfa);
     bzero(msg, sizeof(struct i2o_bsa_rw_block_message));
     msg->version_offset = 0x81;
     msg->message_flags = 0x0;
     msg->message_size = sizeof(struct i2o_bsa_rw_block_message) >> 2;
     msg->target_address = request->psc->lct->local_tid;
     msg->initiator_address = I2O_TID_HOST;
     switch (request->bp->bio_cmd) {
     case BIO_READ:
 	msg->function = I2O_BSA_BLOCK_READ;
 	msg->control_flags = 0x0; /* 0x0c = read cache + readahead */
 	msg->fetch_ahead = 0x0; /* 8 Kb */
 	sgl_flag = 0;
 	break;
     case BIO_WRITE:
 	msg->function = I2O_BSA_BLOCK_WRITE;
 	msg->control_flags = 0x0; /* 0x10 = write behind cache */
 	msg->fetch_ahead = 0x0;
 	sgl_flag = I2O_SGL_DIR;
 	break;
     default:
 	printf("pst: unknown command type 0x%02x\n", request->bp->bio_cmd);
 	return EOPNOTSUPP;
     }
     msg->initiator_context = (u_int32_t)pst_done;
     msg->transaction_context = (u_int32_t)request;
     msg->time_multiplier = 1;
     msg->bytecount = request->bp->bio_bcount;
     msg->lba = ((u_int64_t)request->bp->bio_pblkno) * (DEV_BSIZE * 1LL);
 
     if (!iop_create_sgl((struct i2o_basic_message *)msg, request->bp->bio_data,
 			request->bp->bio_bcount, sgl_flag))
 	return EIO;
 
     request->psc->iop->reg->iqueue = request->mfa;
 
     if (!dumping)
 	callout_reset(&request->timeout, 10 * hz, pst_timeout, request);
     return 0;
 }
 
 static void
 pst_timeout(void *arg)
 {
     struct pst_request *request;
     int error;
 
     request = arg;
     printf("pst: timeout mfa=0x%08x cmd=0x%02x\n",
 	   request->mfa, request->bp->bio_cmd);
     mtx_assert(&request->psc->iop->mtx, MA_OWNED);
     iop_free_mfa(request->psc->iop, request->mfa);
     if ((request->mfa = iop_get_mfa(request->psc->iop)) == 0xffffffff) {
 	printf("pst: timeout no mfa possible\n");
 	biofinish(request->bp, NULL, EIO);
 	request->psc->iop->outstanding--;
 	return;
     }
     if ((error = pst_rw(request)) != 0) {
 	iop_free_mfa(request->psc->iop, request->mfa);
 	biofinish(request->bp, NULL, error);
 	request->psc->iop->outstanding--;
     }
 }
 
 static void
 bpack(int8_t *src, int8_t *dst, int len)
 {
     int i, j, blank;
     int8_t *ptr, *buf = dst;
 
     for (i = j = blank = 0 ; i < len; i++) {
 	if (blank && src[i] == ' ')
 	    continue;
 	if (blank && src[i] != ' ') {
 	    dst[j++] = src[i];
 	    blank = 0;
 	    continue;
 	}
 	if (src[i] == ' ') {
 	    blank = 1;
 	    if (i == 0)
 		continue;
 	}
 	dst[j++] = src[i];
     }
     if (j < len) 
 	dst[j] = 0x00;
     for (ptr = buf; ptr < buf+len; ++ptr)
 	if (!*ptr)
 	    *ptr = ' ';
     for (ptr = buf + len - 1; ptr >= buf && *ptr == ' '; --ptr)
         *ptr = 0;
 }
 
 static device_method_t pst_methods[] = {
     DEVMETHOD(device_probe,	pst_probe),
     DEVMETHOD(device_attach,	pst_attach),
     { 0, 0 }
 };
 
 static driver_t pst_driver = {
     "pst",
     pst_methods,
     sizeof(struct pst_softc),
 };
 
 DRIVER_MODULE(pst, pstpci, pst_driver, 0, 0);
diff --git a/sys/dev/qat/qat/qat_ocf.c b/sys/dev/qat/qat/qat_ocf.c
index b25135b6a678..3ec8f802f324 100644
--- a/sys/dev/qat/qat/qat_ocf.c
+++ b/sys/dev/qat/qat/qat_ocf.c
@@ -1,1302 +1,1300 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
 /* System headers */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 
 /* Cryptodev headers */
 #include <opencrypto/cryptodev.h>
 #include "cryptodev_if.h"
 
 /* QAT specific headers */
 #include "cpa.h"
 #include "cpa_cy_im.h"
 #include "cpa_cy_sym_dp.h"
 #include "adf_accel_devices.h"
 #include "adf_common_drv.h"
 #include "lac_sym_hash_defs.h"
 #include "lac_sym_qat_hash_defs_lookup.h"
 
 /* To get only IRQ instances */
 #include "icp_accel_devices.h"
 #include "icp_adf_accel_mgr.h"
 #include "lac_sal_types.h"
 
 /* To disable AEAD HW MAC verification */
 #include "icp_sal_user.h"
 
 /* QAT OCF specific headers */
 #include "qat_ocf_mem_pool.h"
 #include "qat_ocf_utils.h"
 
 #define QAT_OCF_MAX_INSTANCES (256)
 #define QAT_OCF_SESSION_WAIT_TIMEOUT_MS (1000)
 
 MALLOC_DEFINE(M_QAT_OCF, "qat_ocf", "qat_ocf(4) memory allocations");
 
 /* QAT OCF internal structures */
 struct qat_ocf_softc {
 	device_t sc_dev;
 	struct sysctl_oid *rc;
 	uint32_t enabled;
 	int32_t cryptodev_id;
 	struct qat_ocf_instance cyInstHandles[QAT_OCF_MAX_INSTANCES];
 	int32_t numCyInstances;
 };
 
 /* Function definitions */
 static void qat_ocf_freesession(device_t dev, crypto_session_t cses);
 static int qat_ocf_probesession(device_t dev,
 				const struct crypto_session_params *csp);
 static int qat_ocf_newsession(device_t dev,
 			      crypto_session_t cses,
 			      const struct crypto_session_params *csp);
 static int qat_ocf_attach(device_t dev);
 static int qat_ocf_detach(device_t dev);
 
 static void
 symDpCallback(CpaCySymDpOpData *pOpData,
 	      CpaStatus result,
 	      CpaBoolean verifyResult)
 {
 	struct qat_ocf_cookie *qat_cookie;
 	struct cryptop *crp;
 	struct qat_ocf_dsession *qat_dsession = NULL;
 	struct qat_ocf_session *qat_session = NULL;
 	struct qat_ocf_instance *qat_instance = NULL;
 	CpaStatus status;
 	int rc = 0;
 
 	qat_cookie = (struct qat_ocf_cookie *)pOpData->pCallbackTag;
 	if (!qat_cookie)
 		return;
 
 	crp = qat_cookie->crp_op;
 
 	qat_dsession = crypto_get_driver_session(crp->crp_session);
 	qat_instance = qat_dsession->qatInstance;
 
 	status = qat_ocf_cookie_dma_post_sync(crp, pOpData);
 	if (CPA_STATUS_SUCCESS != status) {
 		rc = EIO;
 		goto exit;
 	}
 
 	status = qat_ocf_cookie_dma_unload(crp, pOpData);
 	if (CPA_STATUS_SUCCESS != status) {
 		rc = EIO;
 		goto exit;
 	}
 
 	/* Verify result */
 	if (CPA_STATUS_SUCCESS != result) {
 		rc = EBADMSG;
 		goto exit;
 	}
 
 	/* Verify digest by FW (GCM and CCM only) */
 	if (CPA_TRUE != verifyResult) {
 		rc = EBADMSG;
 		goto exit;
 	}
 
 	if (CRYPTO_OP_IS_ENCRYPT(crp->crp_op))
 		qat_session = &qat_dsession->encSession;
 	else
 		qat_session = &qat_dsession->decSession;
 
 	/* Copy back digest result if it's stored in separated buffer */
 	if (pOpData->digestResult && qat_session->authLen > 0) {
 		if ((crp->crp_op & CRYPTO_OP_VERIFY_DIGEST) != 0) {
 			char icv[QAT_OCF_MAX_DIGEST] = { 0 };
 			crypto_copydata(crp,
 					crp->crp_digest_start,
 					qat_session->authLen,
 					icv);
 			if (timingsafe_bcmp(icv,
 					    qat_cookie->qat_ocf_digest,
 					    qat_session->authLen) != 0) {
 				rc = EBADMSG;
 				goto exit;
 			}
 		} else {
 			crypto_copyback(crp,
 					crp->crp_digest_start,
 					qat_session->authLen,
 					qat_cookie->qat_ocf_digest);
 		}
 	}
 
 exit:
 	qat_ocf_cookie_free(qat_instance, qat_cookie);
 	crp->crp_etype = rc;
 	crypto_done(crp);
 
 	return;
 }
 
 static inline CpaPhysicalAddr
 qatVirtToPhys(void *virtAddr)
 {
 	return (CpaPhysicalAddr)vtophys(virtAddr);
 }
 
 static int
 qat_ocf_probesession(device_t dev, const struct crypto_session_params *csp)
 {
 	if ((csp->csp_flags & ~(CSP_F_SEPARATE_OUTPUT | CSP_F_SEPARATE_AAD)) !=
 	    0) {
 		return EINVAL;
 	}
 
 	switch (csp->csp_mode) {
 	case CSP_MODE_CIPHER:
 		switch (csp->csp_cipher_alg) {
 		case CRYPTO_AES_CBC:
 		case CRYPTO_AES_ICM:
 			if (csp->csp_ivlen != AES_BLOCK_LEN)
 				return EINVAL;
 			break;
 		case CRYPTO_AES_XTS:
 			if (csp->csp_ivlen != AES_XTS_IV_LEN)
 				return EINVAL;
 			break;
 		default:
 			return EINVAL;
 		}
 		break;
 	case CSP_MODE_DIGEST:
 		switch (csp->csp_auth_alg) {
 		case CRYPTO_SHA1:
 		case CRYPTO_SHA1_HMAC:
 		case CRYPTO_SHA2_256:
 		case CRYPTO_SHA2_256_HMAC:
 		case CRYPTO_SHA2_384:
 		case CRYPTO_SHA2_384_HMAC:
 		case CRYPTO_SHA2_512:
 		case CRYPTO_SHA2_512_HMAC:
 			break;
 		case CRYPTO_AES_NIST_GMAC:
 			if (csp->csp_ivlen != AES_GCM_IV_LEN)
 				return EINVAL;
 			break;
 		default:
 			return EINVAL;
 		}
 		break;
 	case CSP_MODE_AEAD:
 		switch (csp->csp_cipher_alg) {
 		case CRYPTO_AES_NIST_GCM_16:
 			if (csp->csp_ivlen != AES_GCM_IV_LEN)
 				return EINVAL;
 			break;
 		default:
 			return EINVAL;
 		}
 		break;
 	case CSP_MODE_ETA:
 		switch (csp->csp_auth_alg) {
 		case CRYPTO_SHA1_HMAC:
 		case CRYPTO_SHA2_256_HMAC:
 		case CRYPTO_SHA2_384_HMAC:
 		case CRYPTO_SHA2_512_HMAC:
 			switch (csp->csp_cipher_alg) {
 			case CRYPTO_AES_CBC:
 			case CRYPTO_AES_ICM:
 				if (csp->csp_ivlen != AES_BLOCK_LEN)
 					return EINVAL;
 				break;
 			case CRYPTO_AES_XTS:
 				if (csp->csp_ivlen != AES_XTS_IV_LEN)
 					return EINVAL;
 				break;
 			default:
 				return EINVAL;
 			}
 			break;
 		default:
 			return EINVAL;
 		}
 		break;
 	default:
 		return EINVAL;
 	}
 
 	return CRYPTODEV_PROBE_HARDWARE;
 }
 
 static CpaStatus
 qat_ocf_session_init(device_t dev,
 		     struct cryptop *crp,
 		     struct qat_ocf_instance *qat_instance,
 		     struct qat_ocf_session *qat_ssession)
 {
 	CpaStatus status = CPA_STATUS_SUCCESS;
 	/* Crytpodev structures */
 	crypto_session_t cses;
 	const struct crypto_session_params *csp;
 	/* DP API Session configuration */
 	CpaCySymSessionSetupData sessionSetupData = { 0 };
 	CpaCySymSessionCtx sessionCtx = NULL;
 	Cpa32U sessionCtxSize = 0;
 
 	cses = crp->crp_session;
 	if (NULL == cses) {
 		device_printf(dev, "no crypto session in cryptodev request\n");
 		return CPA_STATUS_FAIL;
 	}
 
 	csp = crypto_get_params(cses);
 	if (NULL == csp) {
 		device_printf(dev, "no session in cryptodev session\n");
 		return CPA_STATUS_FAIL;
 	}
 
 	/* Common fields */
 	sessionSetupData.sessionPriority = CPA_CY_PRIORITY_HIGH;
 	/* Cipher key */
 	if (crp->crp_cipher_key)
 		sessionSetupData.cipherSetupData.pCipherKey =
 		    crp->crp_cipher_key;
 	else
 		sessionSetupData.cipherSetupData.pCipherKey =
 		    csp->csp_cipher_key;
 	sessionSetupData.cipherSetupData.cipherKeyLenInBytes =
 	    csp->csp_cipher_klen;
 
 	/* Auth key */
 	if (crp->crp_auth_key)
 		sessionSetupData.hashSetupData.authModeSetupData.authKey =
 		    crp->crp_auth_key;
 	else
 		sessionSetupData.hashSetupData.authModeSetupData.authKey =
 		    csp->csp_auth_key;
 	sessionSetupData.hashSetupData.authModeSetupData.authKeyLenInBytes =
 	    csp->csp_auth_klen;
 
 	qat_ssession->aadLen = crp->crp_aad_length;
 	if (CPA_TRUE == is_sep_aad_supported(csp))
 		sessionSetupData.hashSetupData.authModeSetupData.aadLenInBytes =
 		    crp->crp_aad_length;
 	else
 		sessionSetupData.hashSetupData.authModeSetupData.aadLenInBytes =
 		    0;
 
 	/* Just setup algorithm - regardless of mode */
 	if (csp->csp_cipher_alg) {
 		sessionSetupData.symOperation = CPA_CY_SYM_OP_CIPHER;
 
 		switch (csp->csp_cipher_alg) {
 		case CRYPTO_AES_CBC:
 			sessionSetupData.cipherSetupData.cipherAlgorithm =
 			    CPA_CY_SYM_CIPHER_AES_CBC;
 			break;
 		case CRYPTO_AES_ICM:
 			sessionSetupData.cipherSetupData.cipherAlgorithm =
 			    CPA_CY_SYM_CIPHER_AES_CTR;
 			break;
 		case CRYPTO_AES_XTS:
 			sessionSetupData.cipherSetupData.cipherAlgorithm =
 			    CPA_CY_SYM_CIPHER_AES_XTS;
 			break;
 		case CRYPTO_AES_NIST_GCM_16:
 			sessionSetupData.cipherSetupData.cipherAlgorithm =
 			    CPA_CY_SYM_CIPHER_AES_GCM;
 			sessionSetupData.hashSetupData.hashAlgorithm =
 			    CPA_CY_SYM_HASH_AES_GCM;
 			sessionSetupData.hashSetupData.hashMode =
 			    CPA_CY_SYM_HASH_MODE_AUTH;
 			break;
 		default:
 			device_printf(dev,
 				      "cipher_alg: %d not supported\n",
 				      csp->csp_cipher_alg);
 			status = CPA_STATUS_UNSUPPORTED;
 			goto fail;
 		}
 	}
 
 	if (csp->csp_auth_alg) {
 		switch (csp->csp_auth_alg) {
 		case CRYPTO_SHA1_HMAC:
 			sessionSetupData.hashSetupData.hashAlgorithm =
 			    CPA_CY_SYM_HASH_SHA1;
 			sessionSetupData.hashSetupData.hashMode =
 			    CPA_CY_SYM_HASH_MODE_AUTH;
 			break;
 		case CRYPTO_SHA1:
 			sessionSetupData.hashSetupData.hashAlgorithm =
 			    CPA_CY_SYM_HASH_SHA1;
 			sessionSetupData.hashSetupData.hashMode =
 			    CPA_CY_SYM_HASH_MODE_PLAIN;
 			break;
 
 		case CRYPTO_SHA2_256_HMAC:
 			sessionSetupData.hashSetupData.hashAlgorithm =
 			    CPA_CY_SYM_HASH_SHA256;
 			sessionSetupData.hashSetupData.hashMode =
 			    CPA_CY_SYM_HASH_MODE_AUTH;
 			break;
 		case CRYPTO_SHA2_256:
 			sessionSetupData.hashSetupData.hashAlgorithm =
 			    CPA_CY_SYM_HASH_SHA256;
 			sessionSetupData.hashSetupData.hashMode =
 			    CPA_CY_SYM_HASH_MODE_PLAIN;
 			break;
 
 		case CRYPTO_SHA2_224_HMAC:
 			sessionSetupData.hashSetupData.hashAlgorithm =
 			    CPA_CY_SYM_HASH_SHA224;
 			sessionSetupData.hashSetupData.hashMode =
 			    CPA_CY_SYM_HASH_MODE_AUTH;
 			break;
 		case CRYPTO_SHA2_224:
 			sessionSetupData.hashSetupData.hashAlgorithm =
 			    CPA_CY_SYM_HASH_SHA224;
 			sessionSetupData.hashSetupData.hashMode =
 			    CPA_CY_SYM_HASH_MODE_PLAIN;
 			break;
 
 		case CRYPTO_SHA2_384_HMAC:
 			sessionSetupData.hashSetupData.hashAlgorithm =
 			    CPA_CY_SYM_HASH_SHA384;
 			sessionSetupData.hashSetupData.hashMode =
 			    CPA_CY_SYM_HASH_MODE_AUTH;
 			break;
 		case CRYPTO_SHA2_384:
 			sessionSetupData.hashSetupData.hashAlgorithm =
 			    CPA_CY_SYM_HASH_SHA384;
 			sessionSetupData.hashSetupData.hashMode =
 			    CPA_CY_SYM_HASH_MODE_PLAIN;
 			break;
 
 		case CRYPTO_SHA2_512_HMAC:
 			sessionSetupData.hashSetupData.hashAlgorithm =
 			    CPA_CY_SYM_HASH_SHA512;
 			sessionSetupData.hashSetupData.hashMode =
 			    CPA_CY_SYM_HASH_MODE_AUTH;
 			break;
 		case CRYPTO_SHA2_512:
 			sessionSetupData.hashSetupData.hashAlgorithm =
 			    CPA_CY_SYM_HASH_SHA512;
 			sessionSetupData.hashSetupData.hashMode =
 			    CPA_CY_SYM_HASH_MODE_PLAIN;
 			break;
 		case CRYPTO_AES_NIST_GMAC:
 			sessionSetupData.hashSetupData.hashAlgorithm =
 			    CPA_CY_SYM_HASH_AES_GMAC;
 			break;
 		default:
 			status = CPA_STATUS_UNSUPPORTED;
 			goto fail;
 		}
 	} /* csp->csp_auth_alg */
 
 	/* Setting digest-length if no cipher-only mode is set */
 	if (csp->csp_mode != CSP_MODE_CIPHER) {
 		lac_sym_qat_hash_defs_t *pHashDefsInfo = NULL;
 		if (csp->csp_auth_mlen) {
 			sessionSetupData.hashSetupData.digestResultLenInBytes =
 			    csp->csp_auth_mlen;
 			qat_ssession->authLen = csp->csp_auth_mlen;
 		} else {
 			LacSymQat_HashDefsLookupGet(
 			    qat_instance->cyInstHandle,
 			    sessionSetupData.hashSetupData.hashAlgorithm,
 			    &pHashDefsInfo);
 			if (NULL == pHashDefsInfo) {
 				device_printf(
 				    dev,
 				    "unable to find corresponding hash data\n");
 				status = CPA_STATUS_UNSUPPORTED;
 				goto fail;
 			}
 			sessionSetupData.hashSetupData.digestResultLenInBytes =
 			    pHashDefsInfo->algInfo->digestLength;
 			qat_ssession->authLen =
 			    pHashDefsInfo->algInfo->digestLength;
 		}
 		sessionSetupData.verifyDigest = CPA_FALSE;
 	}
 
 	switch (csp->csp_mode) {
 	case CSP_MODE_AEAD:
 	case CSP_MODE_ETA:
 		sessionSetupData.symOperation =
 		    CPA_CY_SYM_OP_ALGORITHM_CHAINING;
 		/* Place the digest result in a buffer unrelated to srcBuffer */
 		sessionSetupData.digestIsAppended = CPA_FALSE;
 		/* Due to FW limitation to verify only appended MACs */
 		sessionSetupData.verifyDigest = CPA_FALSE;
 		if (CRYPTO_OP_IS_ENCRYPT(crp->crp_op)) {
 			sessionSetupData.cipherSetupData.cipherDirection =
 			    CPA_CY_SYM_CIPHER_DIRECTION_ENCRYPT;
 			sessionSetupData.algChainOrder =
 			    CPA_CY_SYM_ALG_CHAIN_ORDER_CIPHER_THEN_HASH;
 		} else {
 			sessionSetupData.cipherSetupData.cipherDirection =
 			    CPA_CY_SYM_CIPHER_DIRECTION_DECRYPT;
 			sessionSetupData.algChainOrder =
 			    CPA_CY_SYM_ALG_CHAIN_ORDER_HASH_THEN_CIPHER;
 		}
 		break;
 	case CSP_MODE_CIPHER:
 		if (CRYPTO_OP_IS_ENCRYPT(crp->crp_op)) {
 			sessionSetupData.cipherSetupData.cipherDirection =
 			    CPA_CY_SYM_CIPHER_DIRECTION_ENCRYPT;
 		} else {
 			sessionSetupData.cipherSetupData.cipherDirection =
 			    CPA_CY_SYM_CIPHER_DIRECTION_DECRYPT;
 		}
 		sessionSetupData.symOperation = CPA_CY_SYM_OP_CIPHER;
 		break;
 	case CSP_MODE_DIGEST:
 		sessionSetupData.symOperation = CPA_CY_SYM_OP_HASH;
 		if (csp->csp_auth_alg == CRYPTO_AES_NIST_GMAC) {
 			sessionSetupData.symOperation =
 			    CPA_CY_SYM_OP_ALGORITHM_CHAINING;
 			/* GMAC is always encrypt */
 			sessionSetupData.cipherSetupData.cipherDirection =
 			    CPA_CY_SYM_CIPHER_DIRECTION_ENCRYPT;
 			sessionSetupData.algChainOrder =
 			    CPA_CY_SYM_ALG_CHAIN_ORDER_CIPHER_THEN_HASH;
 			sessionSetupData.cipherSetupData.cipherAlgorithm =
 			    CPA_CY_SYM_CIPHER_AES_GCM;
 			sessionSetupData.hashSetupData.hashAlgorithm =
 			    CPA_CY_SYM_HASH_AES_GMAC;
 			sessionSetupData.hashSetupData.hashMode =
 			    CPA_CY_SYM_HASH_MODE_AUTH;
 			/* Same key for cipher and auth */
 			sessionSetupData.cipherSetupData.pCipherKey =
 			    csp->csp_auth_key;
 			sessionSetupData.cipherSetupData.cipherKeyLenInBytes =
 			    csp->csp_auth_klen;
 			/* Generated GMAC stored in separated buffer */
 			sessionSetupData.digestIsAppended = CPA_FALSE;
 			/* Digest verification not allowed in GMAC case */
 			sessionSetupData.verifyDigest = CPA_FALSE;
 			/* No AAD allowed */
 			sessionSetupData.hashSetupData.authModeSetupData
 			    .aadLenInBytes = 0;
 		} else {
 			sessionSetupData.cipherSetupData.cipherDirection =
 			    CPA_CY_SYM_CIPHER_DIRECTION_ENCRYPT;
 			sessionSetupData.symOperation = CPA_CY_SYM_OP_HASH;
 			sessionSetupData.digestIsAppended = CPA_FALSE;
 		}
 		break;
 	default:
 		device_printf(dev,
 			      "%s: unhandled crypto algorithm %d, %d\n",
 			      __func__,
 			      csp->csp_cipher_alg,
 			      csp->csp_auth_alg);
 		status = CPA_STATUS_FAIL;
 		goto fail;
 	}
 
 	/* Extracting session size */
 	status = cpaCySymSessionCtxGetSize(qat_instance->cyInstHandle,
 					   &sessionSetupData,
 					   &sessionCtxSize);
 	if (CPA_STATUS_SUCCESS != status) {
 		device_printf(dev, "unable to get session size\n");
 		goto fail;
 	}
 
 	/* Allocating contiguous memory for session */
 	sessionCtx = contigmalloc(sessionCtxSize,
 				  M_QAT_OCF,
 				  M_NOWAIT,
 				  0,
 				  ~1UL,
 				  1 << (ilog2(sessionCtxSize - 1) + 1),
 				  0);
 	if (NULL == sessionCtx) {
 		device_printf(dev, "unable to allocate memory for session\n");
 		status = CPA_STATUS_RESOURCE;
 		goto fail;
 	}
 
 	status = cpaCySymDpInitSession(qat_instance->cyInstHandle,
 				       &sessionSetupData,
 				       sessionCtx);
 	if (CPA_STATUS_SUCCESS != status) {
 		device_printf(dev, "session initialization failed\n");
 		goto fail;
 	}
 
 	/* NOTE: lets keep double session (both directions) approach to overcome
 	 * lack of direction update in FBSD QAT.
 	 */
 	qat_ssession->sessionCtx = sessionCtx;
 	qat_ssession->sessionCtxSize = sessionCtxSize;
 
 	return CPA_STATUS_SUCCESS;
 
 fail:
 	/* Release resources if any */
 	if (sessionCtx)
-		contigfree(sessionCtx, sessionCtxSize, M_QAT_OCF);
+		free(sessionCtx, M_QAT_OCF);
 
 	return status;
 }
 
 static int
 qat_ocf_newsession(device_t dev,
 		   crypto_session_t cses,
 		   const struct crypto_session_params *csp)
 {
 	/* Cryptodev QAT structures */
 	struct qat_ocf_softc *qat_softc;
 	struct qat_ocf_dsession *qat_dsession;
 	struct qat_ocf_instance *qat_instance;
 	u_int cpu_id = PCPU_GET(cpuid);
 
 	/* Create cryptodev session */
 	qat_softc = device_get_softc(dev);
 	if (qat_softc->numCyInstances > 0) {
 		qat_instance =
 		    &qat_softc
 			 ->cyInstHandles[cpu_id % qat_softc->numCyInstances];
 		qat_dsession = crypto_get_driver_session(cses);
 		if (NULL == qat_dsession) {
 			device_printf(dev, "Unable to create new session\n");
 			return (EINVAL);
 		}
 
 		/* Add only instance at this point remaining operations moved to
 		 * lazy session init */
 		qat_dsession->qatInstance = qat_instance;
 	} else {
 		return ENXIO;
 	}
 
 	return 0;
 }
 
 static CpaStatus
 qat_ocf_remove_session(device_t dev,
 		       CpaInstanceHandle cyInstHandle,
 		       struct qat_ocf_session *qat_session)
 {
 	CpaStatus status = CPA_STATUS_SUCCESS;
 
 	if (NULL == qat_session->sessionCtx)
 		return CPA_STATUS_SUCCESS;
 
 	/* User callback is executed right before decrementing pending
 	 * callback atomic counter. To avoid removing session rejection
 	 * we have to wait a very short while for counter update
 	 * after call back execution. */
 	status = qat_ocf_wait_for_session(qat_session->sessionCtx,
 					  QAT_OCF_SESSION_WAIT_TIMEOUT_MS);
 	if (CPA_STATUS_SUCCESS != status) {
 		device_printf(dev, "waiting for session un-busy failed\n");
 		return CPA_STATUS_FAIL;
 	}
 
 	status = cpaCySymDpRemoveSession(cyInstHandle, qat_session->sessionCtx);
 	if (CPA_STATUS_SUCCESS != status) {
 		device_printf(dev, "error while removing session\n");
 		return CPA_STATUS_FAIL;
 	}
 
 	explicit_bzero(qat_session->sessionCtx, qat_session->sessionCtxSize);
-	contigfree(qat_session->sessionCtx,
-		   qat_session->sessionCtxSize,
-		   M_QAT_OCF);
+	free(qat_session->sessionCtx, M_QAT_OCF);
 	qat_session->sessionCtx = NULL;
 	qat_session->sessionCtxSize = 0;
 
 	return CPA_STATUS_SUCCESS;
 }
 
 static void
 qat_ocf_freesession(device_t dev, crypto_session_t cses)
 {
 	CpaStatus status = CPA_STATUS_SUCCESS;
 	struct qat_ocf_dsession *qat_dsession = NULL;
 	struct qat_ocf_instance *qat_instance = NULL;
 
 	qat_dsession = crypto_get_driver_session(cses);
 	qat_instance = qat_dsession->qatInstance;
 	mtx_lock(&qat_instance->cyInstMtx);
 	status = qat_ocf_remove_session(dev,
 					qat_dsession->qatInstance->cyInstHandle,
 					&qat_dsession->encSession);
 	if (CPA_STATUS_SUCCESS != status)
 		device_printf(dev, "unable to remove encrypt session\n");
 	status = qat_ocf_remove_session(dev,
 					qat_dsession->qatInstance->cyInstHandle,
 					&qat_dsession->decSession);
 	if (CPA_STATUS_SUCCESS != status)
 		device_printf(dev, "unable to remove decrypt session\n");
 	mtx_unlock(&qat_instance->cyInstMtx);
 }
 
 /* QAT GCM/CCM FW API are only algorithms which support separated AAD. */
 static CpaStatus
 qat_ocf_load_aad_gcm(struct cryptop *crp, struct qat_ocf_cookie *qat_cookie)
 {
 	CpaCySymDpOpData *pOpData;
 
 	pOpData = &qat_cookie->pOpdata;
 
 	if (NULL != crp->crp_aad)
 		memcpy(qat_cookie->qat_ocf_gcm_aad,
 		       crp->crp_aad,
 		       crp->crp_aad_length);
 	else
 		crypto_copydata(crp,
 				crp->crp_aad_start,
 				crp->crp_aad_length,
 				qat_cookie->qat_ocf_gcm_aad);
 
 	pOpData->pAdditionalAuthData = qat_cookie->qat_ocf_gcm_aad;
 	pOpData->additionalAuthData = qat_cookie->qat_ocf_gcm_aad_paddr;
 
 	return CPA_STATUS_SUCCESS;
 }
 
 static CpaStatus
 qat_ocf_load_aad(struct cryptop *crp, struct qat_ocf_cookie *qat_cookie)
 {
 	CpaStatus status = CPA_STATUS_SUCCESS;
 	const struct crypto_session_params *csp;
 	CpaCySymDpOpData *pOpData;
 	struct qat_ocf_load_cb_arg args;
 
 	pOpData = &qat_cookie->pOpdata;
 	pOpData->pAdditionalAuthData = NULL;
 	pOpData->additionalAuthData = 0UL;
 
 	if (crp->crp_aad_length == 0)
 		return CPA_STATUS_SUCCESS;
 
 	if (crp->crp_aad_length > ICP_QAT_FW_CCM_GCM_AAD_SZ_MAX)
 		return CPA_STATUS_FAIL;
 
 	csp = crypto_get_params(crp->crp_session);
 
 	/* Handle GCM/CCM case */
 	if (CPA_TRUE == is_sep_aad_supported(csp))
 		return qat_ocf_load_aad_gcm(crp, qat_cookie);
 
 	if (NULL == crp->crp_aad) {
 		/* AAD already embedded in source buffer */
 		pOpData->messageLenToCipherInBytes = crp->crp_payload_length;
 		pOpData->cryptoStartSrcOffsetInBytes = crp->crp_payload_start;
 
 		pOpData->messageLenToHashInBytes =
 		    crp->crp_aad_length + crp->crp_payload_length;
 		pOpData->hashStartSrcOffsetInBytes = crp->crp_aad_start;
 
 		return CPA_STATUS_SUCCESS;
 	}
 
 	/* Separated AAD not supported by QAT - lets place the content
 	 * of ADD buffer at the very beginning of source SGL */
 	args.crp_op = crp;
 	args.qat_cookie = qat_cookie;
 	args.pOpData = pOpData;
 	args.error = 0;
 	status = bus_dmamap_load(qat_cookie->gcm_aad_dma_mem.dma_tag,
 				 qat_cookie->gcm_aad_dma_mem.dma_map,
 				 crp->crp_aad,
 				 crp->crp_aad_length,
 				 qat_ocf_crypto_load_aadbuf_cb,
 				 &args,
 				 BUS_DMA_NOWAIT);
 	qat_cookie->is_sep_aad_used = CPA_TRUE;
 
 	/* Right after this step we have AAD placed in the first flat buffer
 	 * in source SGL */
 	pOpData->messageLenToCipherInBytes = crp->crp_payload_length;
 	pOpData->cryptoStartSrcOffsetInBytes =
 	    crp->crp_aad_length + crp->crp_aad_start + crp->crp_payload_start;
 
 	pOpData->messageLenToHashInBytes =
 	    crp->crp_aad_length + crp->crp_payload_length;
 	pOpData->hashStartSrcOffsetInBytes = crp->crp_aad_start;
 
 	return status;
 }
 
 static CpaStatus
 qat_ocf_load(struct cryptop *crp, struct qat_ocf_cookie *qat_cookie)
 {
 	CpaStatus status = CPA_STATUS_SUCCESS;
 	CpaCySymDpOpData *pOpData;
 	struct qat_ocf_load_cb_arg args;
 	/* cryptodev internals */
 	const struct crypto_session_params *csp;
 
 	pOpData = &qat_cookie->pOpdata;
 
 	csp = crypto_get_params(crp->crp_session);
 
 	/* Load IV buffer if present */
 	if (csp->csp_ivlen > 0) {
 		memset(qat_cookie->qat_ocf_iv_buf,
 		       0,
 		       sizeof(qat_cookie->qat_ocf_iv_buf));
 		crypto_read_iv(crp, qat_cookie->qat_ocf_iv_buf);
 		pOpData->iv = qat_cookie->qat_ocf_iv_buf_paddr;
 		pOpData->pIv = qat_cookie->qat_ocf_iv_buf;
 		pOpData->ivLenInBytes = csp->csp_ivlen;
 	}
 
 	/* GCM/CCM - load AAD to separated buffer
 	 * AES+SHA - load AAD to first flat in SGL */
 	status = qat_ocf_load_aad(crp, qat_cookie);
 	if (CPA_STATUS_SUCCESS != status)
 		goto fail;
 
 	/* Load source buffer */
 	args.crp_op = crp;
 	args.qat_cookie = qat_cookie;
 	args.pOpData = pOpData;
 	args.error = 0;
 	status = bus_dmamap_load_crp_buffer(qat_cookie->src_dma_mem.dma_tag,
 					    qat_cookie->src_dma_mem.dma_map,
 					    &crp->crp_buf,
 					    qat_ocf_crypto_load_buf_cb,
 					    &args,
 					    BUS_DMA_NOWAIT);
 	if (CPA_STATUS_SUCCESS != status)
 		goto fail;
 	pOpData->srcBuffer = qat_cookie->src_buffer_list_paddr;
 	pOpData->srcBufferLen = CPA_DP_BUFLIST;
 
 	/* Load destination buffer */
 	if (CRYPTO_HAS_OUTPUT_BUFFER(crp)) {
 		status =
 		    bus_dmamap_load_crp_buffer(qat_cookie->dst_dma_mem.dma_tag,
 					       qat_cookie->dst_dma_mem.dma_map,
 					       &crp->crp_obuf,
 					       qat_ocf_crypto_load_obuf_cb,
 					       &args,
 					       BUS_DMA_NOWAIT);
 		if (CPA_STATUS_SUCCESS != status)
 			goto fail;
 		pOpData->dstBuffer = qat_cookie->dst_buffer_list_paddr;
 		pOpData->dstBufferLen = CPA_DP_BUFLIST;
 	} else {
 		pOpData->dstBuffer = pOpData->srcBuffer;
 		pOpData->dstBufferLen = pOpData->srcBufferLen;
 	}
 
 	if (CPA_TRUE == is_use_sep_digest(csp))
 		pOpData->digestResult = qat_cookie->qat_ocf_digest_paddr;
 	else
 		pOpData->digestResult = 0UL;
 
 	/* GMAC - aka zero length buffer */
 	if (CPA_TRUE == is_gmac_exception(csp))
 		pOpData->messageLenToCipherInBytes = 0;
 
 fail:
 	return status;
 }
 
 static int
 qat_ocf_check_input(device_t dev, struct cryptop *crp)
 {
 	const struct crypto_session_params *csp;
 	csp = crypto_get_params(crp->crp_session);
 
 	if (crypto_buffer_len(&crp->crp_buf) > QAT_OCF_MAX_LEN)
 		return E2BIG;
 
 	if (CPA_TRUE == is_sep_aad_supported(csp) &&
 	    (crp->crp_aad_length > ICP_QAT_FW_CCM_GCM_AAD_SZ_MAX))
 		return EBADMSG;
 
 	return 0;
 }
 
 static int
 qat_ocf_process(device_t dev, struct cryptop *crp, int hint)
 {
 	CpaStatus status = CPA_STATUS_SUCCESS;
 	int rc = 0;
 	struct qat_ocf_dsession *qat_dsession = NULL;
 	struct qat_ocf_session *qat_session = NULL;
 	struct qat_ocf_instance *qat_instance = NULL;
 	CpaCySymDpOpData *pOpData = NULL;
 	struct qat_ocf_cookie *qat_cookie = NULL;
 	CpaBoolean memLoaded = CPA_FALSE;
 
 	rc = qat_ocf_check_input(dev, crp);
 	if (rc)
 		goto fail;
 
 	qat_dsession = crypto_get_driver_session(crp->crp_session);
 
 	if (CRYPTO_OP_IS_ENCRYPT(crp->crp_op))
 		qat_session = &qat_dsession->encSession;
 	else
 		qat_session = &qat_dsession->decSession;
 	qat_instance = qat_dsession->qatInstance;
 
 	status = qat_ocf_cookie_alloc(qat_instance, &qat_cookie);
 	if (CPA_STATUS_SUCCESS != status) {
 		rc = EAGAIN;
 		goto fail;
 	}
 
 	qat_cookie->crp_op = crp;
 
 	/* Common request fields */
 	pOpData = &qat_cookie->pOpdata;
 	pOpData->instanceHandle = qat_instance->cyInstHandle;
 	pOpData->sessionCtx = NULL;
 
 	/* Cipher fields */
 	pOpData->cryptoStartSrcOffsetInBytes = crp->crp_payload_start;
 	pOpData->messageLenToCipherInBytes = crp->crp_payload_length;
 	/* Digest fields - any exceptions from this basic rules are covered
 	 * in qat_ocf_load */
 	pOpData->hashStartSrcOffsetInBytes = crp->crp_payload_start;
 	pOpData->messageLenToHashInBytes = crp->crp_payload_length;
 
 	status = qat_ocf_load(crp, qat_cookie);
 	if (CPA_STATUS_SUCCESS != status) {
 		device_printf(dev,
 			      "unable to load OCF buffers to QAT DMA "
 			      "transaction\n");
 		rc = EIO;
 		goto fail;
 	}
 	memLoaded = CPA_TRUE;
 
 	status = qat_ocf_cookie_dma_pre_sync(crp, pOpData);
 	if (CPA_STATUS_SUCCESS != status) {
 		device_printf(dev, "unable to sync DMA buffers\n");
 		rc = EIO;
 		goto fail;
 	}
 
 	mtx_lock(&qat_instance->cyInstMtx);
 	/* Session initialization at the first request. It's done
 	 * in such way to overcome missing QAT specific session data
 	 * such like AAD length and limited possibility to update
 	 * QAT session while handling traffic.
 	 */
 	if (NULL == qat_session->sessionCtx) {
 		status =
 		    qat_ocf_session_init(dev, crp, qat_instance, qat_session);
 		if (CPA_STATUS_SUCCESS != status) {
 			mtx_unlock(&qat_instance->cyInstMtx);
 			device_printf(dev, "unable to init session\n");
 			rc = EIO;
 			goto fail;
 		}
 	} else {
 		status = qat_ocf_handle_session_update(qat_dsession, crp);
 		if (CPA_STATUS_RESOURCE == status) {
 			mtx_unlock(&qat_instance->cyInstMtx);
 			rc = EAGAIN;
 			goto fail;
 		} else if (CPA_STATUS_SUCCESS != status) {
 			mtx_unlock(&qat_instance->cyInstMtx);
 			rc = EIO;
 			goto fail;
 		}
 	}
 	pOpData->sessionCtx = qat_session->sessionCtx;
 	status = cpaCySymDpEnqueueOp(pOpData, CPA_TRUE);
 	mtx_unlock(&qat_instance->cyInstMtx);
 	if (CPA_STATUS_SUCCESS != status) {
 		if (CPA_STATUS_RETRY == status) {
 			rc = EAGAIN;
 			goto fail;
 		}
 		device_printf(dev,
 			      "unable to send request. Status: %d\n",
 			      status);
 		rc = EIO;
 		goto fail;
 	}
 
 	return 0;
 fail:
 	if (qat_cookie) {
 		if (memLoaded)
 			qat_ocf_cookie_dma_unload(crp, pOpData);
 		qat_ocf_cookie_free(qat_instance, qat_cookie);
 	}
 	crp->crp_etype = rc;
 	crypto_done(crp);
 
 	return 0;
 }
 
 static void
 qat_ocf_identify(driver_t *drv, device_t parent)
 {
 	if (device_find_child(parent, "qat_ocf", -1) == NULL &&
 	    BUS_ADD_CHILD(parent, 200, "qat_ocf", -1) == 0)
 		device_printf(parent, "qat_ocf: could not attach!");
 }
 
 static int
 qat_ocf_probe(device_t dev)
 {
 	device_set_desc(dev, "QAT engine");
 	return (BUS_PROBE_NOWILDCARD);
 }
 
 static CpaStatus
 qat_ocf_get_irq_instances(CpaInstanceHandle *cyInstHandles,
 			  Cpa16U cyInstHandlesSize,
 			  Cpa16U *foundInstances)
 {
 	CpaStatus status = CPA_STATUS_SUCCESS;
 	icp_accel_dev_t **pAdfInsts = NULL;
 	icp_accel_dev_t *dev_addr = NULL;
 	sal_t *baseAddr = NULL;
 	sal_list_t *listTemp = NULL;
 	CpaInstanceHandle cyInstHandle;
 	CpaInstanceInfo2 info;
 	Cpa16U numDevices;
 	Cpa32U instCtr = 0;
 	Cpa32U i;
 
 	/* Get the number of devices */
 	status = icp_amgr_getNumInstances(&numDevices);
 	if (CPA_STATUS_SUCCESS != status)
 		return status;
 
 	/* Allocate memory to store addr of accel_devs */
 	pAdfInsts =
 	    malloc(numDevices * sizeof(icp_accel_dev_t *), M_QAT_OCF, M_WAITOK);
 
 	/* Get ADF to return all accel_devs that support either
 	 * symmetric or asymmetric crypto */
 	status = icp_amgr_getAllAccelDevByCapabilities(
 	    (ICP_ACCEL_CAPABILITIES_CRYPTO_SYMMETRIC), pAdfInsts, &numDevices);
 	if (CPA_STATUS_SUCCESS != status) {
 		free(pAdfInsts, M_QAT_OCF);
 		return status;
 	}
 
 	for (i = 0; i < numDevices; i++) {
 		dev_addr = (icp_accel_dev_t *)pAdfInsts[i];
 		baseAddr = dev_addr->pSalHandle;
 		if (NULL == baseAddr)
 			continue;
 		listTemp = baseAddr->sym_services;
 		if (NULL == listTemp) {
 			listTemp = baseAddr->crypto_services;
 		}
 
 		while (NULL != listTemp) {
 			cyInstHandle = SalList_getObject(listTemp);
 			status = cpaCyInstanceGetInfo2(cyInstHandle, &info);
 			if (CPA_STATUS_SUCCESS != status)
 				continue;
 			listTemp = SalList_next(listTemp);
 			if (CPA_TRUE == info.isPolled)
 				continue;
 			if (instCtr >= cyInstHandlesSize)
 				break;
 			cyInstHandles[instCtr++] = cyInstHandle;
 		}
 	}
 	free(pAdfInsts, M_QAT_OCF);
 	*foundInstances = instCtr;
 
 	return CPA_STATUS_SUCCESS;
 }
 
 static CpaStatus
 qat_ocf_start_instances(struct qat_ocf_softc *qat_softc, device_t dev)
 {
 	CpaStatus status = CPA_STATUS_SUCCESS;
 	Cpa16U numInstances = 0;
 	CpaInstanceHandle cyInstHandles[QAT_OCF_MAX_INSTANCES] = { 0 };
 	CpaInstanceHandle cyInstHandle = NULL;
 	Cpa32U startedInstances = 0;
 	Cpa32U i;
 
 	qat_softc->numCyInstances = 0;
 	status = qat_ocf_get_irq_instances(cyInstHandles,
 					   QAT_OCF_MAX_INSTANCES,
 					   &numInstances);
 	if (CPA_STATUS_SUCCESS != status)
 		return status;
 
 	for (i = 0; i < numInstances; i++) {
 		struct qat_ocf_instance *qat_ocf_instance;
 
 		cyInstHandle = cyInstHandles[i];
 		if (!cyInstHandle)
 			continue;
 
 		/* Starting instance */
 		status = cpaCyStartInstance(cyInstHandle);
 		if (CPA_STATUS_SUCCESS != status) {
 			device_printf(qat_softc->sc_dev,
 				      "unable to get start instance\n");
 			continue;
 		}
 
 		qat_ocf_instance = &qat_softc->cyInstHandles[startedInstances];
 		qat_ocf_instance->cyInstHandle = cyInstHandle;
 		mtx_init(&qat_ocf_instance->cyInstMtx,
 			 "Instance MTX",
 			 NULL,
 			 MTX_DEF);
 
 		status =
 		    cpaCySetAddressTranslation(cyInstHandle, qatVirtToPhys);
 		if (CPA_STATUS_SUCCESS != status) {
 			device_printf(qat_softc->sc_dev,
 				      "unable to add virt to phys callback\n");
 			goto fail;
 		}
 
 		status = cpaCySymDpRegCbFunc(cyInstHandle, symDpCallback);
 		if (CPA_STATUS_SUCCESS != status) {
 			device_printf(qat_softc->sc_dev,
 				      "unable to add user callback\n");
 			goto fail;
 		}
 
 		/* Initialize cookie pool */
 		status = qat_ocf_cookie_pool_init(qat_ocf_instance, dev);
 		if (CPA_STATUS_SUCCESS != status) {
 			device_printf(qat_softc->sc_dev,
 				      "unable to create cookie pool\n");
 			goto fail;
 		}
 
 		/* Disable forcing HW MAC validation for AEAD */
 		status = icp_sal_setForceAEADMACVerify(cyInstHandle, CPA_FALSE);
 		if (CPA_STATUS_SUCCESS != status) {
 			device_printf(
 			    qat_softc->sc_dev,
 			    "unable to disable AEAD HW MAC verification\n");
 			goto fail;
 		}
 
 		qat_ocf_instance->driver_id = qat_softc->cryptodev_id;
 
 		startedInstances++;
 		continue;
 	fail:
 		mtx_destroy(&qat_ocf_instance->cyInstMtx);
 
 		/* Stop instance */
 		status = cpaCyStopInstance(cyInstHandle);
 		if (CPA_STATUS_SUCCESS != status)
 			device_printf(qat_softc->sc_dev,
 				      "unable to stop the instance\n");
 	}
 	qat_softc->numCyInstances = startedInstances;
 
 	return CPA_STATUS_SUCCESS;
 }
 
 static CpaStatus
 qat_ocf_stop_instances(struct qat_ocf_softc *qat_softc)
 {
 	CpaStatus status = CPA_STATUS_SUCCESS;
 	int i;
 
 	for (i = 0; i < qat_softc->numCyInstances; i++) {
 		struct qat_ocf_instance *qat_instance;
 
 		qat_instance = &qat_softc->cyInstHandles[i];
 		status = cpaCyStopInstance(qat_instance->cyInstHandle);
 		if (CPA_STATUS_SUCCESS != status) {
 			pr_err("QAT: stopping instance id: %d failed\n", i);
 			continue;
 		}
 		qat_ocf_cookie_pool_deinit(qat_instance);
 		mtx_destroy(&qat_instance->cyInstMtx);
 	}
 
 	qat_softc->numCyInstances = 0;
 
 	return status;
 }
 
 static int
 qat_ocf_deinit(struct qat_ocf_softc *qat_softc)
 {
 	int status = 0;
 	CpaStatus cpaStatus;
 
 	if (qat_softc->cryptodev_id >= 0) {
 		crypto_unregister_all(qat_softc->cryptodev_id);
 		qat_softc->cryptodev_id = -1;
 	}
 
 	/* Stop QAT instances */
 	cpaStatus = qat_ocf_stop_instances(qat_softc);
 	if (CPA_STATUS_SUCCESS != cpaStatus) {
 		device_printf(qat_softc->sc_dev, "unable to stop instances\n");
 		status = EIO;
 	}
 
 	return status;
 }
 
 static int
 qat_ocf_init(struct qat_ocf_softc *qat_softc)
 {
 	int32_t cryptodev_id;
 
 	/* Starting instances for OCF */
 	if (qat_ocf_start_instances(qat_softc, qat_softc->sc_dev)) {
 		device_printf(qat_softc->sc_dev,
 			      "unable to get QAT IRQ instances\n");
 		goto fail;
 	}
 
 	/* Register only if instances available */
 	if (qat_softc->numCyInstances) {
 		cryptodev_id =
 		    crypto_get_driverid(qat_softc->sc_dev,
 					sizeof(struct qat_ocf_dsession),
 					CRYPTOCAP_F_HARDWARE);
 		if (cryptodev_id < 0) {
 			device_printf(qat_softc->sc_dev,
 				      "cannot initialize!\n");
 			goto fail;
 		}
 		qat_softc->cryptodev_id = cryptodev_id;
 	}
 
 	return 0;
 fail:
 	qat_ocf_deinit(qat_softc);
 
 	return ENXIO;
 }
 
 static int qat_ocf_sysctl_handle(SYSCTL_HANDLER_ARGS)
 {
 	struct qat_ocf_softc *qat_softc = NULL;
 	int ret = 0;
 	device_t dev = arg1;
 	u_int enabled;
 
 	qat_softc = device_get_softc(dev);
 	enabled = qat_softc->enabled;
 
 	ret = sysctl_handle_int(oidp, &enabled, 0, req);
 	if (ret || !req->newptr)
 		return (ret);
 
 	if (qat_softc->enabled != enabled) {
 		if (enabled) {
 			ret = qat_ocf_init(qat_softc);
 
 		} else {
 			ret = qat_ocf_deinit(qat_softc);
 		}
 
 		if (!ret)
 			qat_softc->enabled = enabled;
 	}
 
 	return ret;
 }
 
 static int
 qat_ocf_attach(device_t dev)
 {
 	int status;
 	struct qat_ocf_softc *qat_softc;
 
 	qat_softc = device_get_softc(dev);
 	qat_softc->sc_dev = dev;
 	qat_softc->cryptodev_id = -1;
 	qat_softc->enabled = 1;
 
 	qat_softc->rc =
 	    SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
 			    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
 			    OID_AUTO,
 			    "enable",
 			    CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE,
 			    dev,
 			    0,
 			    qat_ocf_sysctl_handle,
 			    "I",
 			    "QAT OCF support enablement");
 
 	if (!qat_softc->rc)
 		return ENOMEM;
 	if (qat_softc->enabled) {
 		status = qat_ocf_init(qat_softc);
 		if (status) {
 			device_printf(dev, "qat_ocf init failed\n");
 			goto fail;
 		}
 	}
 
 	return 0;
 fail:
 	qat_ocf_deinit(qat_softc);
 
 	return (ENXIO);
 }
 
 static int
 qat_ocf_detach(device_t dev)
 {
 	struct qat_ocf_softc *qat_softc = device_get_softc(dev);
 
 	return qat_ocf_deinit(qat_softc);
 }
 
 static device_method_t qat_ocf_methods[] =
     { DEVMETHOD(device_identify, qat_ocf_identify),
       DEVMETHOD(device_probe, qat_ocf_probe),
       DEVMETHOD(device_attach, qat_ocf_attach),
       DEVMETHOD(device_detach, qat_ocf_detach),
 
       /* Cryptodev interface */
       DEVMETHOD(cryptodev_probesession, qat_ocf_probesession),
       DEVMETHOD(cryptodev_newsession, qat_ocf_newsession),
       DEVMETHOD(cryptodev_freesession, qat_ocf_freesession),
       DEVMETHOD(cryptodev_process, qat_ocf_process),
 
       DEVMETHOD_END };
 
 static driver_t qat_ocf_driver = {
 	.name = "qat_ocf",
 	.methods = qat_ocf_methods,
 	.size = sizeof(struct qat_ocf_softc),
 };
 
 
 DRIVER_MODULE_ORDERED(qat,
 		      nexus,
 		      qat_ocf_driver,
 		      NULL,
 		      NULL,
 		      SI_ORDER_ANY);
 MODULE_VERSION(qat, 1);
 MODULE_DEPEND(qat, qat_c62x, 1, 1, 1);
 MODULE_DEPEND(qat, qat_200xx, 1, 1, 1);
 MODULE_DEPEND(qat, qat_c3xxx, 1, 1, 1);
 MODULE_DEPEND(qat, qat_c4xxx, 1, 1, 1);
 MODULE_DEPEND(qat, qat_dh895xcc, 1, 1, 1);
 MODULE_DEPEND(qat, qat_4xxx, 1, 1, 1);
 MODULE_DEPEND(qat, crypto, 1, 1, 1);
 MODULE_DEPEND(qat, qat_common, 1, 1, 1);
 MODULE_DEPEND(qat, qat_api, 1, 1, 1);
 MODULE_DEPEND(qat, linuxkpi, 1, 1, 1);
diff --git a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c
index 3134c2d375eb..bcd2d687acb2 100644
--- a/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c
+++ b/sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c
@@ -1,112 +1,112 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /* Copyright(c) 2007-2022 Intel Corporation */
 #include "qat_utils.h"
 
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/sched.h>
 #include <sys/time.h>
 #include <machine/stdarg.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 /**
  *
  * @brief Private data structure
  *
  *  Data struct to store the information on the
  *  memory allocated. This structure is stored at the beginning of
  *  the allocated chunck of memory
  *  size is the no of byte passed to the memory allocation functions
  *  mSize is the real size of the memory required to the OS
  *
  *  +----------------------------+--------------------------------+
  *  | QatUtilsMemAllocInfoStruct | memory returned to user (size) |
  *  +----------------------------+--------------------------------+
  *  ^                            ^
  *  mAllocMemPtr                 Ptr returned to the caller of MemAlloc*
  *
  */
 
 typedef struct _QatUtilsMemAllocInfoStruct {
 	void *mAllocMemPtr; /* memory addr returned by the kernel */
 	uint32_t mSize;     /* allocated size */
 } QatUtilsMemAllocInfoStruct;
 
 /**************************************
  * Memory functions
  *************************************/
 void *
 qatUtilsMemAllocContiguousNUMA(uint32_t size, uint32_t node, uint32_t alignment)
 {
 	void *ptr = NULL;
 	void *pRet = NULL;
 	uint32_t alignment_offset = 0;
 
 	QatUtilsMemAllocInfoStruct memInfo = { 0 };
 	if (size == 0 || alignment < 1) {
 		QAT_UTILS_LOG(
 		    "QatUtilsMemAllocNUMA: size or alignment are zero.\n");
 		return NULL;
 	}
 	if (alignment & (alignment - 1)) {
 		QAT_UTILS_LOG(
 		    "QatUtilsMemAllocNUMA: Expecting alignment of a power.\n");
 		return NULL;
 	}
 
 	memInfo.mSize = size + alignment + sizeof(QatUtilsMemAllocInfoStruct);
 	ptr = contigmalloc(memInfo.mSize, M_QAT, M_WAITOK, 0, ~1UL, 64, 0);
 
 	memInfo.mAllocMemPtr = ptr;
 	pRet =
 	    (char *)memInfo.mAllocMemPtr + sizeof(QatUtilsMemAllocInfoStruct);
 #ifdef __x86_64__
 	alignment_offset = (uint64_t)pRet % alignment;
 #else
 	alignment_offset = (uint32_t)pRet % alignment;
 #endif
 	pRet = (char *)pRet + (alignment - alignment_offset);
 	memcpy(((char *)pRet) - sizeof(QatUtilsMemAllocInfoStruct),
 	       &memInfo,
 	       sizeof(QatUtilsMemAllocInfoStruct));
 
 	return pRet;
 }
 
 void
 qatUtilsMemFreeNUMA(void *ptr)
 {
 	QatUtilsMemAllocInfoStruct *memInfo = NULL;
 
 	memInfo =
 	    (QatUtilsMemAllocInfoStruct *)((int8_t *)ptr -
 					   sizeof(QatUtilsMemAllocInfoStruct));
 	if (memInfo->mSize == 0 || memInfo->mAllocMemPtr == NULL) {
 		QAT_UTILS_LOG(
 		    "QatUtilsMemAlignedFree: Detected corrupted data: memory leak!\n");
 		return;
 	}
-	contigfree(memInfo->mAllocMemPtr, memInfo->mSize, M_QAT);
+	free(memInfo->mAllocMemPtr, M_QAT);
 }
 
 CpaStatus
 qatUtilsSleep(uint32_t milliseconds)
 {
 	if (milliseconds != 0) {
 		pause("qatUtils sleep", milliseconds * hz / (1000));
 	} else {
 		sched_relinquish(curthread);
 	}
 	return CPA_STATUS_SUCCESS;
 }
 
 void
 qatUtilsYield(void)
 {
 	sched_relinquish(curthread);
 }
diff --git a/sys/dev/virtio/gpu/virtio_gpu.c b/sys/dev/virtio/gpu/virtio_gpu.c
index eac5b5db21b9..6f786a450900 100644
--- a/sys/dev/virtio/gpu/virtio_gpu.c
+++ b/sys/dev/virtio/gpu/virtio_gpu.c
@@ -1,709 +1,709 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2013, Bryan Venteicher <bryanv@FreeBSD.org>
  * All rights reserved.
  * Copyright (c) 2023, Arm Ltd
  *
  * 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 unmodified, 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.
  */
 
 /* Driver for VirtIO GPU device. */
 
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/fbio.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/sglist.h>
 
 #include <machine/atomic.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #include <dev/virtio/virtio.h>
 #include <dev/virtio/virtqueue.h>
 #include <dev/virtio/gpu/virtio_gpu.h>
 
 #include <dev/vt/vt.h>
 #include <dev/vt/hw/fb/vt_fb.h>
 #include <dev/vt/colors/vt_termcolors.h>
 
 #include "fb_if.h"
 
 #define VTGPU_FEATURES	0
 
 /* The guest can allocate resource IDs, we only need one */
 #define	VTGPU_RESOURCE_ID	1
 
 struct vtgpu_softc {
 	/* Must be first so we can cast from info -> softc */
 	struct fb_info 		 vtgpu_fb_info;
 	struct virtio_gpu_config vtgpu_gpucfg;
 
 	device_t		 vtgpu_dev;
 	uint64_t		 vtgpu_features;
 
 	struct virtqueue	*vtgpu_ctrl_vq;
 
 	uint64_t		 vtgpu_next_fence;
 
 	bool			 vtgpu_have_fb_info;
 };
 
 static int	vtgpu_modevent(module_t, int, void *);
 
 static int	vtgpu_probe(device_t);
 static int	vtgpu_attach(device_t);
 static int	vtgpu_detach(device_t);
 
 static int	vtgpu_negotiate_features(struct vtgpu_softc *);
 static int	vtgpu_setup_features(struct vtgpu_softc *);
 static void	vtgpu_read_config(struct vtgpu_softc *,
 		    struct virtio_gpu_config *);
 static int	vtgpu_alloc_virtqueue(struct vtgpu_softc *);
 static int	vtgpu_get_display_info(struct vtgpu_softc *);
 static int	vtgpu_create_2d(struct vtgpu_softc *);
 static int	vtgpu_attach_backing(struct vtgpu_softc *);
 static int	vtgpu_set_scanout(struct vtgpu_softc *, uint32_t, uint32_t,
 		    uint32_t, uint32_t);
 static int	vtgpu_transfer_to_host_2d(struct vtgpu_softc *, uint32_t,
 		    uint32_t, uint32_t, uint32_t);
 static int	vtgpu_resource_flush(struct vtgpu_softc *, uint32_t, uint32_t,
 		    uint32_t, uint32_t);
 
 static vd_blank_t		vtgpu_fb_blank;
 static vd_bitblt_text_t		vtgpu_fb_bitblt_text;
 static vd_bitblt_bmp_t		vtgpu_fb_bitblt_bitmap;
 static vd_drawrect_t		vtgpu_fb_drawrect;
 static vd_setpixel_t		vtgpu_fb_setpixel;
 static vd_bitblt_argb_t		vtgpu_fb_bitblt_argb;
 
 static struct vt_driver vtgpu_fb_driver = {
 	.vd_name = "virtio_gpu",
 	.vd_init = vt_fb_init,
 	.vd_fini = vt_fb_fini,
 	.vd_blank = vtgpu_fb_blank,
 	.vd_bitblt_text = vtgpu_fb_bitblt_text,
 	.vd_invalidate_text = vt_fb_invalidate_text,
 	.vd_bitblt_bmp = vtgpu_fb_bitblt_bitmap,
 	.vd_bitblt_argb = vtgpu_fb_bitblt_argb,
 	.vd_drawrect = vtgpu_fb_drawrect,
 	.vd_setpixel = vtgpu_fb_setpixel,
 	.vd_postswitch = vt_fb_postswitch,
 	.vd_priority = VD_PRIORITY_GENERIC+10,
 	.vd_fb_ioctl = vt_fb_ioctl,
 	.vd_fb_mmap = NULL,	/* No mmap as we need to signal the host */
 	.vd_suspend = vt_fb_suspend,
 	.vd_resume = vt_fb_resume,
 };
 
 VT_DRIVER_DECLARE(vt_vtgpu, vtgpu_fb_driver);
 
 static void
 vtgpu_fb_blank(struct vt_device *vd, term_color_t color)
 {
 	struct vtgpu_softc *sc;
 	struct fb_info *info;
 
 	info = vd->vd_softc;
 	sc = (struct vtgpu_softc *)info;
 
 	vt_fb_blank(vd, color);
 
 	vtgpu_transfer_to_host_2d(sc, 0, 0, sc->vtgpu_fb_info.fb_width,
 	    sc->vtgpu_fb_info.fb_height);
 	vtgpu_resource_flush(sc, 0, 0, sc->vtgpu_fb_info.fb_width,
 	    sc->vtgpu_fb_info.fb_height);
 }
 
 static void
 vtgpu_fb_bitblt_text(struct vt_device *vd, const struct vt_window *vw,
     const term_rect_t *area)
 {
 	struct vtgpu_softc *sc;
 	struct fb_info *info;
 	int x, y, width, height;
 
 	info = vd->vd_softc;
 	sc = (struct vtgpu_softc *)info;
 
 	vt_fb_bitblt_text(vd, vw, area);
 
 	x = area->tr_begin.tp_col * vw->vw_font->vf_width + vw->vw_draw_area.tr_begin.tp_col;
 	y = area->tr_begin.tp_row * vw->vw_font->vf_height + vw->vw_draw_area.tr_begin.tp_row;
 	width = area->tr_end.tp_col * vw->vw_font->vf_width + vw->vw_draw_area.tr_begin.tp_col - x;
 	height = area->tr_end.tp_row * vw->vw_font->vf_height + vw->vw_draw_area.tr_begin.tp_row - y;
 
 	vtgpu_transfer_to_host_2d(sc, x, y, width, height);
 	vtgpu_resource_flush(sc, x, y, width, height);
 }
 
 static void
 vtgpu_fb_bitblt_bitmap(struct vt_device *vd, const struct vt_window *vw,
     const uint8_t *pattern, const uint8_t *mask,
     unsigned int width, unsigned int height,
     unsigned int x, unsigned int y, term_color_t fg, term_color_t bg)
 {
 	struct vtgpu_softc *sc;
 	struct fb_info *info;
 
 	info = vd->vd_softc;
 	sc = (struct vtgpu_softc *)info;
 
 	vt_fb_bitblt_bitmap(vd, vw, pattern, mask, width, height, x, y, fg, bg);
 
 	vtgpu_transfer_to_host_2d(sc, x, y, width, height);
 	vtgpu_resource_flush(sc, x, y, width, height);
 }
 
 static int
 vtgpu_fb_bitblt_argb(struct vt_device *vd, const struct vt_window *vw,
     const uint8_t *argb,
     unsigned int width, unsigned int height,
     unsigned int x, unsigned int y)
 {
 
 	return (EOPNOTSUPP);
 }
 
 static void
 vtgpu_fb_drawrect(struct vt_device *vd, int x1, int y1, int x2, int y2,
     int fill, term_color_t color)
 {
 	struct vtgpu_softc *sc;
 	struct fb_info *info;
 	int width, height;
 
 	info = vd->vd_softc;
 	sc = (struct vtgpu_softc *)info;
 
 	vt_fb_drawrect(vd, x1, y1, x2, y2, fill, color);
 
 	width = x2 - x1 + 1;
 	height = y2 - y1 + 1;
 	vtgpu_transfer_to_host_2d(sc, x1, y1, width, height);
 	vtgpu_resource_flush(sc, x1, y1, width, height);
 }
 
 static void
 vtgpu_fb_setpixel(struct vt_device *vd, int x, int y, term_color_t color)
 {
 	struct vtgpu_softc *sc;
 	struct fb_info *info;
 
 	info = vd->vd_softc;
 	sc = (struct vtgpu_softc *)info;
 
 	vt_fb_setpixel(vd, x, y, color);
 
 	vtgpu_transfer_to_host_2d(sc, x, y, 1, 1);
 	vtgpu_resource_flush(sc, x, y, 1, 1);
 }
 
 static struct virtio_feature_desc vtgpu_feature_desc[] = {
 	{ VIRTIO_GPU_F_VIRGL,		"VirGL"		},
 	{ VIRTIO_GPU_F_EDID,		"EDID"		},
 	{ VIRTIO_GPU_F_RESOURCE_UUID,	"ResUUID"	},
 	{ VIRTIO_GPU_F_RESOURCE_BLOB,	"ResBlob"	},
 	{ VIRTIO_GPU_F_CONTEXT_INIT,	"ContextInit"	},
 	{ 0, NULL }
 };
 
 static device_method_t vtgpu_methods[] = {
 	/* Device methods. */
 	DEVMETHOD(device_probe,		vtgpu_probe),
 	DEVMETHOD(device_attach,	vtgpu_attach),
 	DEVMETHOD(device_detach,	vtgpu_detach),
 
 	DEVMETHOD_END
 };
 
 static driver_t vtgpu_driver = {
 	"vtgpu",
 	vtgpu_methods,
 	sizeof(struct vtgpu_softc)
 };
 
 VIRTIO_DRIVER_MODULE(virtio_gpu, vtgpu_driver, vtgpu_modevent, NULL);
 MODULE_VERSION(virtio_gpu, 1);
 MODULE_DEPEND(virtio_gpu, virtio, 1, 1, 1);
 
 VIRTIO_SIMPLE_PNPINFO(virtio_gpu, VIRTIO_ID_GPU,
     "VirtIO GPU");
 
 static int
 vtgpu_modevent(module_t mod, int type, void *unused)
 {
 	int error;
 
 	switch (type) {
 	case MOD_LOAD:
 	case MOD_QUIESCE:
 	case MOD_UNLOAD:
 	case MOD_SHUTDOWN:
 		error = 0;
 		break;
 	default:
 		error = EOPNOTSUPP;
 		break;
 	}
 
 	return (error);
 }
 
 static int
 vtgpu_probe(device_t dev)
 {
 	return (VIRTIO_SIMPLE_PROBE(dev, virtio_gpu));
 }
 
 static int
 vtgpu_attach(device_t dev)
 {
 	struct vtgpu_softc *sc;
 	int error;
 
 	sc = device_get_softc(dev);
 	sc->vtgpu_have_fb_info = false;
 	sc->vtgpu_dev = dev;
 	sc->vtgpu_next_fence = 1;
 	virtio_set_feature_desc(dev, vtgpu_feature_desc);
 
 	error = vtgpu_setup_features(sc);
 	if (error != 0) {
 		device_printf(dev, "cannot setup features\n");
 		goto fail;
 	}
 
 	vtgpu_read_config(sc, &sc->vtgpu_gpucfg);
 
 	error = vtgpu_alloc_virtqueue(sc);
 	if (error != 0) {
 		device_printf(dev, "cannot allocate virtqueue\n");
 		goto fail;
 	}
 
 	virtio_setup_intr(dev, INTR_TYPE_TTY);
 
 	/* Read the device info to get the display size */
 	error = vtgpu_get_display_info(sc);
 	if (error != 0) {
 		goto fail;
 	}
 
 	/*
 	 * TODO: This doesn't need to be contigmalloc as we
 	 * can use scatter-gather lists.
 	 */
 	sc->vtgpu_fb_info.fb_vbase = (vm_offset_t)contigmalloc(
 	    sc->vtgpu_fb_info.fb_size, M_DEVBUF, M_WAITOK|M_ZERO, 0, ~0, 4, 0);
 	sc->vtgpu_fb_info.fb_pbase = pmap_kextract(sc->vtgpu_fb_info.fb_vbase);
 
 	/* Create the 2d resource */
 	error = vtgpu_create_2d(sc);
 	if (error != 0) {
 		goto fail;
 	}
 
 	/* Attach the backing memory */
 	error = vtgpu_attach_backing(sc);
 	if (error != 0) {
 		goto fail;
 	}
 
 	/* Set the scanout to link the framebuffer to the display scanout */
 	error = vtgpu_set_scanout(sc, 0, 0, sc->vtgpu_fb_info.fb_width,
 	    sc->vtgpu_fb_info.fb_height);
 	if (error != 0) {
 		goto fail;
 	}
 
 	vt_allocate(&vtgpu_fb_driver, &sc->vtgpu_fb_info);
 	sc->vtgpu_have_fb_info = true;
 
 	error = vtgpu_transfer_to_host_2d(sc, 0, 0, sc->vtgpu_fb_info.fb_width,
 	    sc->vtgpu_fb_info.fb_height);
 	if (error != 0)
 		goto fail;
 	error = vtgpu_resource_flush(sc, 0, 0, sc->vtgpu_fb_info.fb_width,
 	    sc->vtgpu_fb_info.fb_height);
 
 fail:
 	if (error != 0)
 		vtgpu_detach(dev);
 
 	return (error);
 }
 
 static int
 vtgpu_detach(device_t dev)
 {
 	struct vtgpu_softc *sc;
 
 	sc = device_get_softc(dev);
 	if (sc->vtgpu_have_fb_info)
 		vt_deallocate(&vtgpu_fb_driver, &sc->vtgpu_fb_info);
 	if (sc->vtgpu_fb_info.fb_vbase != 0) {
 		MPASS(sc->vtgpu_fb_info.fb_size != 0);
-		contigfree((void *)sc->vtgpu_fb_info.fb_vbase,
-		    sc->vtgpu_fb_info.fb_size, M_DEVBUF);
+		free((void *)sc->vtgpu_fb_info.fb_vbase,
+		    M_DEVBUF);
 	}
 
 	/* TODO: Tell the host we are detaching */
 
 	return (0);
 }
 
 static int
 vtgpu_negotiate_features(struct vtgpu_softc *sc)
 {
 	device_t dev;
 	uint64_t features;
 
 	dev = sc->vtgpu_dev;
 	features = VTGPU_FEATURES;
 
 	sc->vtgpu_features = virtio_negotiate_features(dev, features);
 	return (virtio_finalize_features(dev));
 }
 
 static int
 vtgpu_setup_features(struct vtgpu_softc *sc)
 {
 	int error;
 
 	error = vtgpu_negotiate_features(sc);
 	if (error != 0)
 		return (error);
 
 	return (0);
 }
 
 static void
 vtgpu_read_config(struct vtgpu_softc *sc,
     struct virtio_gpu_config *gpucfg)
 {
 	device_t dev;
 
 	dev = sc->vtgpu_dev;
 
 	bzero(gpucfg, sizeof(struct virtio_gpu_config));
 
 #define VTGPU_GET_CONFIG(_dev, _field, _cfg)			\
 	virtio_read_device_config(_dev,				\
 	    offsetof(struct virtio_gpu_config, _field),	\
 	    &(_cfg)->_field, sizeof((_cfg)->_field))		\
 
 	VTGPU_GET_CONFIG(dev, events_read, gpucfg);
 	VTGPU_GET_CONFIG(dev, events_clear, gpucfg);
 	VTGPU_GET_CONFIG(dev, num_scanouts, gpucfg);
 	VTGPU_GET_CONFIG(dev, num_capsets, gpucfg);
 
 #undef VTGPU_GET_CONFIG
 }
 
 static int
 vtgpu_alloc_virtqueue(struct vtgpu_softc *sc)
 {
 	device_t dev;
 	struct vq_alloc_info vq_info[2];
 	int nvqs;
 
 	dev = sc->vtgpu_dev;
 	nvqs = 1;
 
 	VQ_ALLOC_INFO_INIT(&vq_info[0], 0, NULL, sc, &sc->vtgpu_ctrl_vq,
 	    "%s control", device_get_nameunit(dev));
 
 	return (virtio_alloc_virtqueues(dev, nvqs, vq_info));
 }
 
 static int
 vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen,
     void *resp, size_t resplen)
 {
 	struct sglist sg;
 	struct sglist_seg segs[2];
 	int error;
 
 	sglist_init(&sg, 2, segs);
 
 	error = sglist_append(&sg, req, reqlen);
 	if (error != 0) {
 		device_printf(sc->vtgpu_dev,
 		    "Unable to append the request to the sglist: %d\n", error);
 		return (error);
 	}
 	error = sglist_append(&sg, resp, resplen);
 	if (error != 0) {
 		device_printf(sc->vtgpu_dev,
 		    "Unable to append the response buffer to the sglist: %d\n",
 		    error);
 		return (error);
 	}
 	error = virtqueue_enqueue(sc->vtgpu_ctrl_vq, resp, &sg, 1, 1);
 	if (error != 0) {
 		device_printf(sc->vtgpu_dev, "Enqueue failed: %d\n", error);
 		return (error);
 	}
 
 	virtqueue_notify(sc->vtgpu_ctrl_vq);
 	virtqueue_poll(sc->vtgpu_ctrl_vq, NULL);
 
 	return (0);
 }
 
 static int
 vtgpu_get_display_info(struct vtgpu_softc *sc)
 {
 	struct {
 		struct virtio_gpu_ctrl_hdr req;
 		char pad;
 		struct virtio_gpu_resp_display_info resp;
 	} s = { 0 };
 	int error;
 
 	s.req.type = htole32(VIRTIO_GPU_CMD_GET_DISPLAY_INFO);
 	s.req.flags = htole32(VIRTIO_GPU_FLAG_FENCE);
 	s.req.fence_id = htole64(atomic_fetchadd_64(&sc->vtgpu_next_fence, 1));
 
 	error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp,
 	    sizeof(s.resp));
 	if (error != 0)
 		return (error);
 
 	for (int i = 0; i < sc->vtgpu_gpucfg.num_scanouts; i++) {
 		if (s.resp.pmodes[i].enabled != 0)
 			MPASS(i == 0);
 			sc->vtgpu_fb_info.fb_name =
 			    device_get_nameunit(sc->vtgpu_dev);
 
 			sc->vtgpu_fb_info.fb_width =
 			    le32toh(s.resp.pmodes[i].r.width);
 			sc->vtgpu_fb_info.fb_height =
 			    le32toh(s.resp.pmodes[i].r.height);
 			/* 32 bits per pixel */
 			sc->vtgpu_fb_info.fb_bpp = 32;
 			sc->vtgpu_fb_info.fb_depth = 32;
 			sc->vtgpu_fb_info.fb_size = sc->vtgpu_fb_info.fb_width *
 			    sc->vtgpu_fb_info.fb_height * 4;
 			sc->vtgpu_fb_info.fb_stride =
 			    sc->vtgpu_fb_info.fb_width * 4;
 			return (0);
 	}
 
 	return (ENXIO);
 }
 
 static int
 vtgpu_create_2d(struct vtgpu_softc *sc)
 {
 	struct {
 		struct virtio_gpu_resource_create_2d req;
 		char pad;
 		struct virtio_gpu_ctrl_hdr resp;
 	} s = { 0 };
 	int error;
 
 	s.req.hdr.type = htole32(VIRTIO_GPU_CMD_RESOURCE_CREATE_2D);
 	s.req.hdr.flags = htole32(VIRTIO_GPU_FLAG_FENCE);
 	s.req.hdr.fence_id = htole64(
 	    atomic_fetchadd_64(&sc->vtgpu_next_fence, 1));
 
 	s.req.resource_id = htole32(VTGPU_RESOURCE_ID);
 	s.req.format = htole32(VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM);
 	s.req.width = htole32(sc->vtgpu_fb_info.fb_width);
 	s.req.height = htole32(sc->vtgpu_fb_info.fb_height);
 
 	error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp,
 	    sizeof(s.resp));
 	if (error != 0)
 		return (error);
 
 	if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) {
 		device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n",
 		    le32toh(s.resp.type));
 		return (EINVAL);
 	}
 
 	return (0);
 }
 
 static int
 vtgpu_attach_backing(struct vtgpu_softc *sc)
 {
 	struct {
 		struct {
 			struct virtio_gpu_resource_attach_backing backing;
 			struct virtio_gpu_mem_entry mem[1];
 		} req;
 		char pad;
 		struct virtio_gpu_ctrl_hdr resp;
 	} s = { 0 };
 	int error;
 
 	s.req.backing.hdr.type =
 	    htole32(VIRTIO_GPU_CMD_RESOURCE_ATTACH_BACKING);
 	s.req.backing.hdr.flags = htole32(VIRTIO_GPU_FLAG_FENCE);
 	s.req.backing.hdr.fence_id = htole64(
 	    atomic_fetchadd_64(&sc->vtgpu_next_fence, 1));
 
 	s.req.backing.resource_id = htole32(VTGPU_RESOURCE_ID);
 	s.req.backing.nr_entries = htole32(1);
 
 	s.req.mem[0].addr = htole64(sc->vtgpu_fb_info.fb_pbase);
 	s.req.mem[0].length = htole32(sc->vtgpu_fb_info.fb_size);
 
 	error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp,
 	    sizeof(s.resp));
 	if (error != 0)
 		return (error);
 
 	if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) {
 		device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n",
 		    le32toh(s.resp.type));
 		return (EINVAL);
 	}
 
 	return (0);
 }
 
 static int
 vtgpu_set_scanout(struct vtgpu_softc *sc, uint32_t x, uint32_t y,
     uint32_t width, uint32_t height)
 {
 	struct {
 		struct virtio_gpu_set_scanout req;
 		char pad;
 		struct virtio_gpu_ctrl_hdr resp;
 	} s = { 0 };
 	int error;
 
 	s.req.hdr.type = htole32(VIRTIO_GPU_CMD_SET_SCANOUT);
 	s.req.hdr.flags = htole32(VIRTIO_GPU_FLAG_FENCE);
 	s.req.hdr.fence_id = htole64(
 	    atomic_fetchadd_64(&sc->vtgpu_next_fence, 1));
 
 	s.req.r.x = htole32(x);
 	s.req.r.y = htole32(y);
 	s.req.r.width = htole32(width);
 	s.req.r.height = htole32(height);
 
 	s.req.scanout_id = 0;
 	s.req.resource_id = htole32(VTGPU_RESOURCE_ID);
 
 	error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp,
 	    sizeof(s.resp));
 	if (error != 0)
 		return (error);
 
 	if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) {
 		device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n",
 		    le32toh(s.resp.type));
 		return (EINVAL);
 	}
 
 	return (0);
 }
 
 static int
 vtgpu_transfer_to_host_2d(struct vtgpu_softc *sc, uint32_t x, uint32_t y,
     uint32_t width, uint32_t height)
 {
 	struct {
 		struct virtio_gpu_transfer_to_host_2d req;
 		char pad;
 		struct virtio_gpu_ctrl_hdr resp;
 	} s = { 0 };
 	int error;
 
 	s.req.hdr.type = htole32(VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D);
 	s.req.hdr.flags = htole32(VIRTIO_GPU_FLAG_FENCE);
 	s.req.hdr.fence_id = htole64(
 	    atomic_fetchadd_64(&sc->vtgpu_next_fence, 1));
 
 	s.req.r.x = htole32(x);
 	s.req.r.y = htole32(y);
 	s.req.r.width = htole32(width);
 	s.req.r.height = htole32(height);
 
 	s.req.offset = htole64((y * sc->vtgpu_fb_info.fb_width + x)
 	 * (sc->vtgpu_fb_info.fb_bpp / 8));
 	s.req.resource_id = htole32(VTGPU_RESOURCE_ID);
 
 	error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp,
 	    sizeof(s.resp));
 	if (error != 0)
 		return (error);
 
 	if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) {
 		device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n",
 		    le32toh(s.resp.type));
 		return (EINVAL);
 	}
 
 	return (0);
 }
 
 static int
 vtgpu_resource_flush(struct vtgpu_softc *sc, uint32_t x, uint32_t y,
     uint32_t width, uint32_t height)
 {
 	struct {
 		struct virtio_gpu_resource_flush req;
 		char pad;
 		struct virtio_gpu_ctrl_hdr resp;
 	} s = { 0 };
 	int error;
 
 	s.req.hdr.type = htole32(VIRTIO_GPU_CMD_RESOURCE_FLUSH);
 	s.req.hdr.flags = htole32(VIRTIO_GPU_FLAG_FENCE);
 	s.req.hdr.fence_id = htole64(
 	    atomic_fetchadd_64(&sc->vtgpu_next_fence, 1));
 
 	s.req.r.x = htole32(x);
 	s.req.r.y = htole32(y);
 	s.req.r.width = htole32(width);
 	s.req.r.height = htole32(height);
 
 	s.req.resource_id = htole32(VTGPU_RESOURCE_ID);
 
 	error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp,
 	    sizeof(s.resp));
 	if (error != 0)
 		return (error);
 
 	if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) {
 		device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n",
 		    le32toh(s.resp.type));
 		return (EINVAL);
 	}
 
 	return (0);
 }
diff --git a/sys/dev/virtio/virtqueue.c b/sys/dev/virtio/virtqueue.c
index c92f635832f2..8cc3326dc08e 100644
--- a/sys/dev/virtio/virtqueue.c
+++ b/sys/dev/virtio/virtqueue.c
@@ -1,880 +1,880 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2011, Bryan Venteicher <bryanv@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 unmodified, 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.
  */
 
 /*
  * Implements the virtqueue interface as basically described
  * in the original VirtIO paper.
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/sdt.h>
 #include <sys/sglist.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #include <machine/cpu.h>
 #include <machine/bus.h>
 #include <machine/atomic.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
 
 #include <dev/virtio/virtio.h>
 #include <dev/virtio/virtqueue.h>
 #include <dev/virtio/virtio_ring.h>
 
 #include "virtio_bus_if.h"
 
 struct virtqueue {
 	device_t		 vq_dev;
 	uint16_t		 vq_queue_index;
 	uint16_t		 vq_nentries;
 	uint32_t		 vq_flags;
 #define	VIRTQUEUE_FLAG_MODERN	 0x0001
 #define	VIRTQUEUE_FLAG_INDIRECT	 0x0002
 #define	VIRTQUEUE_FLAG_EVENT_IDX 0x0004
 
 	int			 vq_max_indirect_size;
 	bus_size_t		 vq_notify_offset;
 	virtqueue_intr_t	*vq_intrhand;
 	void			*vq_intrhand_arg;
 
 	struct vring		 vq_ring;
 	uint16_t		 vq_free_cnt;
 	uint16_t		 vq_queued_cnt;
 	/*
 	 * Head of the free chain in the descriptor table. If
 	 * there are no free descriptors, this will be set to
 	 * VQ_RING_DESC_CHAIN_END.
 	 */
 	uint16_t		 vq_desc_head_idx;
 	/*
 	 * Last consumed descriptor in the used table,
 	 * trails vq_ring.used->idx.
 	 */
 	uint16_t		 vq_used_cons_idx;
 
 	void			*vq_ring_mem;
 	int			 vq_indirect_mem_size;
 	int			 vq_alignment;
 	int			 vq_ring_size;
 	char			 vq_name[VIRTQUEUE_MAX_NAME_SZ];
 
 	struct vq_desc_extra {
 		void		  *cookie;
 		struct vring_desc *indirect;
 		vm_paddr_t	   indirect_paddr;
 		uint16_t	   ndescs;
 	} vq_descx[0];
 };
 
 /*
  * The maximum virtqueue size is 2^15. Use that value as the end of
  * descriptor chain terminator since it will never be a valid index
  * in the descriptor table. This is used to verify we are correctly
  * handling vq_free_cnt.
  */
 #define VQ_RING_DESC_CHAIN_END 32768
 
 #define VQASSERT(_vq, _exp, _msg, ...)				\
     KASSERT((_exp),("%s: %s - "_msg, __func__, (_vq)->vq_name,	\
 	##__VA_ARGS__))
 
 #define VQ_RING_ASSERT_VALID_IDX(_vq, _idx)			\
     VQASSERT((_vq), (_idx) < (_vq)->vq_nentries,		\
 	"invalid ring index: %d, max: %d", (_idx),		\
 	(_vq)->vq_nentries)
 
 #define VQ_RING_ASSERT_CHAIN_TERM(_vq)				\
     VQASSERT((_vq), (_vq)->vq_desc_head_idx ==			\
 	VQ_RING_DESC_CHAIN_END,	"full ring terminated "		\
 	"incorrectly: head idx: %d", (_vq)->vq_desc_head_idx)
 
 static int	virtqueue_init_indirect(struct virtqueue *vq, int);
 static void	virtqueue_free_indirect(struct virtqueue *vq);
 static void	virtqueue_init_indirect_list(struct virtqueue *,
 		    struct vring_desc *);
 
 static void	vq_ring_init(struct virtqueue *);
 static void	vq_ring_update_avail(struct virtqueue *, uint16_t);
 static uint16_t	vq_ring_enqueue_segments(struct virtqueue *,
 		    struct vring_desc *, uint16_t, struct sglist *, int, int);
 static bool	vq_ring_use_indirect(struct virtqueue *, int);
 static void	vq_ring_enqueue_indirect(struct virtqueue *, void *,
 		    struct sglist *, int, int);
 static int	vq_ring_enable_interrupt(struct virtqueue *, uint16_t);
 static int	vq_ring_must_notify_host(struct virtqueue *);
 static void	vq_ring_notify_host(struct virtqueue *);
 static void	vq_ring_free_chain(struct virtqueue *, uint16_t);
 
 SDT_PROVIDER_DEFINE(virtqueue);
 SDT_PROBE_DEFINE6(virtqueue, , enqueue_segments, entry, "struct virtqueue *",
     "struct vring_desc *", "uint16_t", "struct sglist *", "int", "int");
 SDT_PROBE_DEFINE1(virtqueue, , enqueue_segments, return, "uint16_t");
 
 #define vq_modern(_vq) 		(((_vq)->vq_flags & VIRTQUEUE_FLAG_MODERN) != 0)
 #define vq_htog16(_vq, _val) 	virtio_htog16(vq_modern(_vq), _val)
 #define vq_htog32(_vq, _val) 	virtio_htog32(vq_modern(_vq), _val)
 #define vq_htog64(_vq, _val) 	virtio_htog64(vq_modern(_vq), _val)
 #define vq_gtoh16(_vq, _val) 	virtio_gtoh16(vq_modern(_vq), _val)
 #define vq_gtoh32(_vq, _val) 	virtio_gtoh32(vq_modern(_vq), _val)
 #define vq_gtoh64(_vq, _val) 	virtio_gtoh64(vq_modern(_vq), _val)
 
 int
 virtqueue_alloc(device_t dev, uint16_t queue, uint16_t size,
     bus_size_t notify_offset, int align, vm_paddr_t highaddr,
     struct vq_alloc_info *info, struct virtqueue **vqp)
 {
 	struct virtqueue *vq;
 	int error;
 
 	*vqp = NULL;
 	error = 0;
 
 	if (size == 0) {
 		device_printf(dev,
 		    "virtqueue %d (%s) does not exist (size is zero)\n",
 		    queue, info->vqai_name);
 		return (ENODEV);
 	} else if (!powerof2(size)) {
 		device_printf(dev,
 		    "virtqueue %d (%s) size is not a power of 2: %d\n",
 		    queue, info->vqai_name, size);
 		return (ENXIO);
 	} else if (info->vqai_maxindirsz > VIRTIO_MAX_INDIRECT) {
 		device_printf(dev, "virtqueue %d (%s) requested too many "
 		    "indirect descriptors: %d, max %d\n",
 		    queue, info->vqai_name, info->vqai_maxindirsz,
 		    VIRTIO_MAX_INDIRECT);
 		return (EINVAL);
 	}
 
 	vq = malloc(sizeof(struct virtqueue) +
 	    size * sizeof(struct vq_desc_extra), M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (vq == NULL) {
 		device_printf(dev, "cannot allocate virtqueue\n");
 		return (ENOMEM);
 	}
 
 	vq->vq_dev = dev;
 	strlcpy(vq->vq_name, info->vqai_name, sizeof(vq->vq_name));
 	vq->vq_queue_index = queue;
 	vq->vq_notify_offset = notify_offset;
 	vq->vq_alignment = align;
 	vq->vq_nentries = size;
 	vq->vq_free_cnt = size;
 	vq->vq_intrhand = info->vqai_intr;
 	vq->vq_intrhand_arg = info->vqai_intr_arg;
 
 	if (VIRTIO_BUS_WITH_FEATURE(dev, VIRTIO_F_VERSION_1) != 0)
 		vq->vq_flags |= VIRTQUEUE_FLAG_MODERN;
 	if (VIRTIO_BUS_WITH_FEATURE(dev, VIRTIO_RING_F_EVENT_IDX) != 0)
 		vq->vq_flags |= VIRTQUEUE_FLAG_EVENT_IDX;
 
 	if (info->vqai_maxindirsz > 1) {
 		error = virtqueue_init_indirect(vq, info->vqai_maxindirsz);
 		if (error)
 			goto fail;
 	}
 
 	vq->vq_ring_size = round_page(vring_size(size, align));
 	vq->vq_ring_mem = contigmalloc(vq->vq_ring_size, M_DEVBUF,
 	    M_NOWAIT | M_ZERO, 0, highaddr, PAGE_SIZE, 0);
 	if (vq->vq_ring_mem == NULL) {
 		device_printf(dev,
 		    "cannot allocate memory for virtqueue ring\n");
 		error = ENOMEM;
 		goto fail;
 	}
 
 	vq_ring_init(vq);
 	virtqueue_disable_intr(vq);
 
 	*vqp = vq;
 
 fail:
 	if (error)
 		virtqueue_free(vq);
 
 	return (error);
 }
 
 static int
 virtqueue_init_indirect(struct virtqueue *vq, int indirect_size)
 {
 	device_t dev;
 	struct vq_desc_extra *dxp;
 	int i, size;
 
 	dev = vq->vq_dev;
 
 	if (VIRTIO_BUS_WITH_FEATURE(dev, VIRTIO_RING_F_INDIRECT_DESC) == 0) {
 		/*
 		 * Indirect descriptors requested by the driver but not
 		 * negotiated. Return zero to keep the initialization
 		 * going: we'll run fine without.
 		 */
 		if (bootverbose)
 			device_printf(dev, "virtqueue %d (%s) requested "
 			    "indirect descriptors but not negotiated\n",
 			    vq->vq_queue_index, vq->vq_name);
 		return (0);
 	}
 
 	size = indirect_size * sizeof(struct vring_desc);
 	vq->vq_max_indirect_size = indirect_size;
 	vq->vq_indirect_mem_size = size;
 	vq->vq_flags |= VIRTQUEUE_FLAG_INDIRECT;
 
 	for (i = 0; i < vq->vq_nentries; i++) {
 		dxp = &vq->vq_descx[i];
 
 		dxp->indirect = malloc(size, M_DEVBUF, M_NOWAIT);
 		if (dxp->indirect == NULL) {
 			device_printf(dev, "cannot allocate indirect list\n");
 			return (ENOMEM);
 		}
 
 		dxp->indirect_paddr = vtophys(dxp->indirect);
 		virtqueue_init_indirect_list(vq, dxp->indirect);
 	}
 
 	return (0);
 }
 
 static void
 virtqueue_free_indirect(struct virtqueue *vq)
 {
 	struct vq_desc_extra *dxp;
 	int i;
 
 	for (i = 0; i < vq->vq_nentries; i++) {
 		dxp = &vq->vq_descx[i];
 
 		if (dxp->indirect == NULL)
 			break;
 
 		free(dxp->indirect, M_DEVBUF);
 		dxp->indirect = NULL;
 		dxp->indirect_paddr = 0;
 	}
 
 	vq->vq_flags &= ~VIRTQUEUE_FLAG_INDIRECT;
 	vq->vq_indirect_mem_size = 0;
 }
 
 static void
 virtqueue_init_indirect_list(struct virtqueue *vq,
     struct vring_desc *indirect)
 {
 	int i;
 
 	bzero(indirect, vq->vq_indirect_mem_size);
 
 	for (i = 0; i < vq->vq_max_indirect_size - 1; i++)
 		indirect[i].next = vq_gtoh16(vq, i + 1);
 	indirect[i].next = vq_gtoh16(vq, VQ_RING_DESC_CHAIN_END);
 }
 
 int
 virtqueue_reinit(struct virtqueue *vq, uint16_t size)
 {
 	struct vq_desc_extra *dxp;
 	int i;
 
 	if (vq->vq_nentries != size) {
 		device_printf(vq->vq_dev,
 		    "%s: '%s' changed size; old=%hu, new=%hu\n",
 		    __func__, vq->vq_name, vq->vq_nentries, size);
 		return (EINVAL);
 	}
 
 	/* Warn if the virtqueue was not properly cleaned up. */
 	if (vq->vq_free_cnt != vq->vq_nentries) {
 		device_printf(vq->vq_dev,
 		    "%s: warning '%s' virtqueue not empty, "
 		    "leaking %d entries\n", __func__, vq->vq_name,
 		    vq->vq_nentries - vq->vq_free_cnt);
 	}
 
 	vq->vq_desc_head_idx = 0;
 	vq->vq_used_cons_idx = 0;
 	vq->vq_queued_cnt = 0;
 	vq->vq_free_cnt = vq->vq_nentries;
 
 	/* To be safe, reset all our allocated memory. */
 	bzero(vq->vq_ring_mem, vq->vq_ring_size);
 	for (i = 0; i < vq->vq_nentries; i++) {
 		dxp = &vq->vq_descx[i];
 		dxp->cookie = NULL;
 		dxp->ndescs = 0;
 		if (vq->vq_flags & VIRTQUEUE_FLAG_INDIRECT)
 			virtqueue_init_indirect_list(vq, dxp->indirect);
 	}
 
 	vq_ring_init(vq);
 	virtqueue_disable_intr(vq);
 
 	return (0);
 }
 
 void
 virtqueue_free(struct virtqueue *vq)
 {
 
 	if (vq->vq_free_cnt != vq->vq_nentries) {
 		device_printf(vq->vq_dev, "%s: freeing non-empty virtqueue, "
 		    "leaking %d entries\n", vq->vq_name,
 		    vq->vq_nentries - vq->vq_free_cnt);
 	}
 
 	if (vq->vq_flags & VIRTQUEUE_FLAG_INDIRECT)
 		virtqueue_free_indirect(vq);
 
 	if (vq->vq_ring_mem != NULL) {
-		contigfree(vq->vq_ring_mem, vq->vq_ring_size, M_DEVBUF);
+		free(vq->vq_ring_mem, M_DEVBUF);
 		vq->vq_ring_size = 0;
 		vq->vq_ring_mem = NULL;
 	}
 
 	free(vq, M_DEVBUF);
 }
 
 vm_paddr_t
 virtqueue_paddr(struct virtqueue *vq)
 {
 
 	return (vtophys(vq->vq_ring_mem));
 }
 
 vm_paddr_t
 virtqueue_desc_paddr(struct virtqueue *vq)
 {
 
 	return (vtophys(vq->vq_ring.desc));
 }
 
 vm_paddr_t
 virtqueue_avail_paddr(struct virtqueue *vq)
 {
 
 	return (vtophys(vq->vq_ring.avail));
 }
 
 vm_paddr_t
 virtqueue_used_paddr(struct virtqueue *vq)
 {
 
 	return (vtophys(vq->vq_ring.used));
 }
 
 uint16_t
 virtqueue_index(struct virtqueue *vq)
 {
 
 	return (vq->vq_queue_index);
 }
 
 int
 virtqueue_size(struct virtqueue *vq)
 {
 
 	return (vq->vq_nentries);
 }
 
 int
 virtqueue_nfree(struct virtqueue *vq)
 {
 
 	return (vq->vq_free_cnt);
 }
 
 bool
 virtqueue_empty(struct virtqueue *vq)
 {
 
 	return (vq->vq_nentries == vq->vq_free_cnt);
 }
 
 bool
 virtqueue_full(struct virtqueue *vq)
 {
 
 	return (vq->vq_free_cnt == 0);
 }
 
 void
 virtqueue_notify(struct virtqueue *vq)
 {
 
 	/* Ensure updated avail->idx is visible to host. */
 	mb();
 
 	if (vq_ring_must_notify_host(vq))
 		vq_ring_notify_host(vq);
 	vq->vq_queued_cnt = 0;
 }
 
 int
 virtqueue_nused(struct virtqueue *vq)
 {
 	uint16_t used_idx, nused;
 
 	used_idx = vq_htog16(vq, vq->vq_ring.used->idx);
 
 	nused = (uint16_t)(used_idx - vq->vq_used_cons_idx);
 	VQASSERT(vq, nused <= vq->vq_nentries, "used more than available");
 
 	return (nused);
 }
 
 int
 virtqueue_intr_filter(struct virtqueue *vq)
 {
 
 	if (vq->vq_used_cons_idx == vq_htog16(vq, vq->vq_ring.used->idx))
 		return (0);
 
 	virtqueue_disable_intr(vq);
 
 	return (1);
 }
 
 void
 virtqueue_intr(struct virtqueue *vq)
 {
 
 	vq->vq_intrhand(vq->vq_intrhand_arg);
 }
 
 int
 virtqueue_enable_intr(struct virtqueue *vq)
 {
 
 	return (vq_ring_enable_interrupt(vq, 0));
 }
 
 int
 virtqueue_postpone_intr(struct virtqueue *vq, vq_postpone_t hint)
 {
 	uint16_t ndesc, avail_idx;
 
 	avail_idx = vq_htog16(vq, vq->vq_ring.avail->idx);
 	ndesc = (uint16_t)(avail_idx - vq->vq_used_cons_idx);
 
 	switch (hint) {
 	case VQ_POSTPONE_SHORT:
 		ndesc = ndesc / 4;
 		break;
 	case VQ_POSTPONE_LONG:
 		ndesc = (ndesc * 3) / 4;
 		break;
 	case VQ_POSTPONE_EMPTIED:
 		break;
 	}
 
 	return (vq_ring_enable_interrupt(vq, ndesc));
 }
 
 /*
  * Note this is only considered a hint to the host.
  */
 void
 virtqueue_disable_intr(struct virtqueue *vq)
 {
 
 	if (vq->vq_flags & VIRTQUEUE_FLAG_EVENT_IDX) {
 		vring_used_event(&vq->vq_ring) = vq_gtoh16(vq,
 		    vq->vq_used_cons_idx - vq->vq_nentries - 1);
 		return;
 	}
 
 	vq->vq_ring.avail->flags |= vq_gtoh16(vq, VRING_AVAIL_F_NO_INTERRUPT);
 }
 
 int
 virtqueue_enqueue(struct virtqueue *vq, void *cookie, struct sglist *sg,
     int readable, int writable)
 {
 	struct vq_desc_extra *dxp;
 	int needed;
 	uint16_t head_idx, idx;
 
 	needed = readable + writable;
 
 	VQASSERT(vq, cookie != NULL, "enqueuing with no cookie");
 	VQASSERT(vq, needed == sg->sg_nseg,
 	    "segment count mismatch, %d, %d", needed, sg->sg_nseg);
 	VQASSERT(vq,
 	    needed <= vq->vq_nentries || needed <= vq->vq_max_indirect_size,
 	    "too many segments to enqueue: %d, %d/%d", needed,
 	    vq->vq_nentries, vq->vq_max_indirect_size);
 
 	if (needed < 1)
 		return (EINVAL);
 	if (vq->vq_free_cnt == 0)
 		return (ENOSPC);
 
 	if (vq_ring_use_indirect(vq, needed)) {
 		vq_ring_enqueue_indirect(vq, cookie, sg, readable, writable);
 		return (0);
 	} else if (vq->vq_free_cnt < needed)
 		return (EMSGSIZE);
 
 	head_idx = vq->vq_desc_head_idx;
 	VQ_RING_ASSERT_VALID_IDX(vq, head_idx);
 	dxp = &vq->vq_descx[head_idx];
 
 	VQASSERT(vq, dxp->cookie == NULL,
 	    "cookie already exists for index %d", head_idx);
 	dxp->cookie = cookie;
 	dxp->ndescs = needed;
 
 	idx = vq_ring_enqueue_segments(vq, vq->vq_ring.desc, head_idx,
 	    sg, readable, writable);
 
 	vq->vq_desc_head_idx = idx;
 	vq->vq_free_cnt -= needed;
 	if (vq->vq_free_cnt == 0)
 		VQ_RING_ASSERT_CHAIN_TERM(vq);
 	else
 		VQ_RING_ASSERT_VALID_IDX(vq, idx);
 
 	vq_ring_update_avail(vq, head_idx);
 
 	return (0);
 }
 
 void *
 virtqueue_dequeue(struct virtqueue *vq, uint32_t *len)
 {
 	struct vring_used_elem *uep;
 	void *cookie;
 	uint16_t used_idx, desc_idx;
 
 	if (vq->vq_used_cons_idx == vq_htog16(vq, vq->vq_ring.used->idx))
 		return (NULL);
 
 	used_idx = vq->vq_used_cons_idx++ & (vq->vq_nentries - 1);
 	uep = &vq->vq_ring.used->ring[used_idx];
 
 	rmb();
 	desc_idx = (uint16_t) vq_htog32(vq, uep->id);
 	if (len != NULL)
 		*len = vq_htog32(vq, uep->len);
 
 	vq_ring_free_chain(vq, desc_idx);
 
 	cookie = vq->vq_descx[desc_idx].cookie;
 	VQASSERT(vq, cookie != NULL, "no cookie for index %d", desc_idx);
 	vq->vq_descx[desc_idx].cookie = NULL;
 
 	return (cookie);
 }
 
 void *
 virtqueue_poll(struct virtqueue *vq, uint32_t *len)
 {
 	void *cookie;
 
 	VIRTIO_BUS_POLL(vq->vq_dev);
 	while ((cookie = virtqueue_dequeue(vq, len)) == NULL) {
 		cpu_spinwait();
 		VIRTIO_BUS_POLL(vq->vq_dev);
 	}
 
 	return (cookie);
 }
 
 void *
 virtqueue_drain(struct virtqueue *vq, int *last)
 {
 	void *cookie;
 	int idx;
 
 	cookie = NULL;
 	idx = *last;
 
 	while (idx < vq->vq_nentries && cookie == NULL) {
 		if ((cookie = vq->vq_descx[idx].cookie) != NULL) {
 			vq->vq_descx[idx].cookie = NULL;
 			/* Free chain to keep free count consistent. */
 			vq_ring_free_chain(vq, idx);
 		}
 		idx++;
 	}
 
 	*last = idx;
 
 	return (cookie);
 }
 
 void
 virtqueue_dump(struct virtqueue *vq)
 {
 
 	if (vq == NULL)
 		return;
 
 	printf("VQ: %s - size=%d; free=%d; used=%d; queued=%d; "
 	    "desc_head_idx=%d; avail.idx=%d; used_cons_idx=%d; "
 	    "used.idx=%d; used_event_idx=%d; avail.flags=0x%x; used.flags=0x%x\n",
 	    vq->vq_name, vq->vq_nentries, vq->vq_free_cnt, virtqueue_nused(vq),
 	    vq->vq_queued_cnt, vq->vq_desc_head_idx,
 	    vq_htog16(vq, vq->vq_ring.avail->idx), vq->vq_used_cons_idx,
 	    vq_htog16(vq, vq->vq_ring.used->idx),
 	    vq_htog16(vq, vring_used_event(&vq->vq_ring)),
 	    vq_htog16(vq, vq->vq_ring.avail->flags),
 	    vq_htog16(vq, vq->vq_ring.used->flags));
 }
 
 static void
 vq_ring_init(struct virtqueue *vq)
 {
 	struct vring *vr;
 	char *ring_mem;
 	int i, size;
 
 	ring_mem = vq->vq_ring_mem;
 	size = vq->vq_nentries;
 	vr = &vq->vq_ring;
 
 	vring_init(vr, size, ring_mem, vq->vq_alignment);
 
 	for (i = 0; i < size - 1; i++)
 		vr->desc[i].next = vq_gtoh16(vq, i + 1);
 	vr->desc[i].next = vq_gtoh16(vq, VQ_RING_DESC_CHAIN_END);
 }
 
 static void
 vq_ring_update_avail(struct virtqueue *vq, uint16_t desc_idx)
 {
 	uint16_t avail_idx, avail_ring_idx;
 
 	/*
 	 * Place the head of the descriptor chain into the next slot and make
 	 * it usable to the host. The chain is made available now rather than
 	 * deferring to virtqueue_notify() in the hopes that if the host is
 	 * currently running on another CPU, we can keep it processing the new
 	 * descriptor.
 	 */
 	avail_idx = vq_htog16(vq, vq->vq_ring.avail->idx);
 	avail_ring_idx = avail_idx & (vq->vq_nentries - 1);
 	vq->vq_ring.avail->ring[avail_ring_idx] = vq_gtoh16(vq, desc_idx);
 
 	wmb();
 	vq->vq_ring.avail->idx = vq_gtoh16(vq, avail_idx + 1);
 
 	/* Keep pending count until virtqueue_notify(). */
 	vq->vq_queued_cnt++;
 }
 
 static uint16_t
 vq_ring_enqueue_segments(struct virtqueue *vq, struct vring_desc *desc,
     uint16_t head_idx, struct sglist *sg, int readable, int writable)
 {
 	struct sglist_seg *seg;
 	struct vring_desc *dp;
 	int i, needed;
 	uint16_t idx;
 
 	SDT_PROBE6(virtqueue, , enqueue_segments, entry, vq, desc, head_idx,
 	    sg, readable, writable);
 
 	needed = readable + writable;
 
 	for (i = 0, idx = head_idx, seg = sg->sg_segs;
 	     i < needed;
 	     i++, idx = vq_htog16(vq, dp->next), seg++) {
 		VQASSERT(vq, idx != VQ_RING_DESC_CHAIN_END,
 		    "premature end of free desc chain");
 
 		dp = &desc[idx];
 		dp->addr = vq_gtoh64(vq, seg->ss_paddr);
 		dp->len = vq_gtoh32(vq, seg->ss_len);
 		dp->flags = 0;
 
 		if (i < needed - 1)
 			dp->flags |= vq_gtoh16(vq, VRING_DESC_F_NEXT);
 		if (i >= readable)
 			dp->flags |= vq_gtoh16(vq, VRING_DESC_F_WRITE);
 	}
 
 	SDT_PROBE1(virtqueue, , enqueue_segments, return, idx);
 	return (idx);
 }
 
 static bool
 vq_ring_use_indirect(struct virtqueue *vq, int needed)
 {
 
 	if ((vq->vq_flags & VIRTQUEUE_FLAG_INDIRECT) == 0)
 		return (false);
 
 	if (vq->vq_max_indirect_size < needed)
 		return (false);
 
 	if (needed < 2)
 		return (false);
 
 	return (true);
 }
 
 static void
 vq_ring_enqueue_indirect(struct virtqueue *vq, void *cookie,
     struct sglist *sg, int readable, int writable)
 {
 	struct vring_desc *dp;
 	struct vq_desc_extra *dxp;
 	int needed;
 	uint16_t head_idx;
 
 	needed = readable + writable;
 	VQASSERT(vq, needed <= vq->vq_max_indirect_size,
 	    "enqueuing too many indirect descriptors");
 
 	head_idx = vq->vq_desc_head_idx;
 	VQ_RING_ASSERT_VALID_IDX(vq, head_idx);
 	dp = &vq->vq_ring.desc[head_idx];
 	dxp = &vq->vq_descx[head_idx];
 
 	VQASSERT(vq, dxp->cookie == NULL,
 	    "cookie already exists for index %d", head_idx);
 	dxp->cookie = cookie;
 	dxp->ndescs = 1;
 
 	dp->addr = vq_gtoh64(vq, dxp->indirect_paddr);
 	dp->len = vq_gtoh32(vq, needed * sizeof(struct vring_desc));
 	dp->flags = vq_gtoh16(vq, VRING_DESC_F_INDIRECT);
 
 	vq_ring_enqueue_segments(vq, dxp->indirect, 0,
 	    sg, readable, writable);
 
 	vq->vq_desc_head_idx = vq_htog16(vq, dp->next);
 	vq->vq_free_cnt--;
 	if (vq->vq_free_cnt == 0)
 		VQ_RING_ASSERT_CHAIN_TERM(vq);
 	else
 		VQ_RING_ASSERT_VALID_IDX(vq, vq->vq_desc_head_idx);
 
 	vq_ring_update_avail(vq, head_idx);
 }
 
 static int
 vq_ring_enable_interrupt(struct virtqueue *vq, uint16_t ndesc)
 {
 
 	/*
 	 * Enable interrupts, making sure we get the latest index of
 	 * what's already been consumed.
 	 */
 	if (vq->vq_flags & VIRTQUEUE_FLAG_EVENT_IDX) {
 		vring_used_event(&vq->vq_ring) =
 		    vq_gtoh16(vq, vq->vq_used_cons_idx + ndesc);
 	} else {
 		vq->vq_ring.avail->flags &=
 		    vq_gtoh16(vq, ~VRING_AVAIL_F_NO_INTERRUPT);
 	}
 
 	mb();
 
 	/*
 	 * Enough items may have already been consumed to meet our threshold
 	 * since we last checked. Let our caller know so it processes the new
 	 * entries.
 	 */
 	if (virtqueue_nused(vq) > ndesc)
 		return (1);
 
 	return (0);
 }
 
 static int
 vq_ring_must_notify_host(struct virtqueue *vq)
 {
 	uint16_t new_idx, prev_idx, event_idx, flags;
 
 	if (vq->vq_flags & VIRTQUEUE_FLAG_EVENT_IDX) {
 		new_idx = vq_htog16(vq, vq->vq_ring.avail->idx);
 		prev_idx = new_idx - vq->vq_queued_cnt;
 		event_idx = vq_htog16(vq, vring_avail_event(&vq->vq_ring));
 
 		return (vring_need_event(event_idx, new_idx, prev_idx) != 0);
 	}
 
 	flags = vq->vq_ring.used->flags;
 	return ((flags & vq_gtoh16(vq, VRING_USED_F_NO_NOTIFY)) == 0);
 }
 
 static void
 vq_ring_notify_host(struct virtqueue *vq)
 {
 
 	VIRTIO_BUS_NOTIFY_VQ(vq->vq_dev, vq->vq_queue_index,
 	    vq->vq_notify_offset);
 }
 
 static void
 vq_ring_free_chain(struct virtqueue *vq, uint16_t desc_idx)
 {
 	struct vring_desc *dp;
 	struct vq_desc_extra *dxp;
 
 	VQ_RING_ASSERT_VALID_IDX(vq, desc_idx);
 	dp = &vq->vq_ring.desc[desc_idx];
 	dxp = &vq->vq_descx[desc_idx];
 
 	if (vq->vq_free_cnt == 0)
 		VQ_RING_ASSERT_CHAIN_TERM(vq);
 
 	vq->vq_free_cnt += dxp->ndescs;
 	dxp->ndescs--;
 
 	if ((dp->flags & vq_gtoh16(vq, VRING_DESC_F_INDIRECT)) == 0) {
 		while (dp->flags & vq_gtoh16(vq, VRING_DESC_F_NEXT)) {
 			uint16_t next_idx = vq_htog16(vq, dp->next);
 			VQ_RING_ASSERT_VALID_IDX(vq, next_idx);
 			dp = &vq->vq_ring.desc[next_idx];
 			dxp->ndescs--;
 		}
 	}
 
 	VQASSERT(vq, dxp->ndescs == 0,
 	    "failed to free entire desc chain, remaining: %d", dxp->ndescs);
 
 	/*
 	 * We must append the existing free chain, if any, to the end of
 	 * newly freed chain. If the virtqueue was completely used, then
 	 * head would be VQ_RING_DESC_CHAIN_END (ASSERTed above).
 	 */
 	dp->next = vq_gtoh16(vq, vq->vq_desc_head_idx);
 	vq->vq_desc_head_idx = desc_idx;
 }
diff --git a/sys/dev/vmware/vmci/vmci_kernel_if.c b/sys/dev/vmware/vmci/vmci_kernel_if.c
index c7cdf5e3e3d8..e5d5c5160803 100644
--- a/sys/dev/vmware/vmci/vmci_kernel_if.c
+++ b/sys/dev/vmware/vmci/vmci_kernel_if.c
@@ -1,1112 +1,1112 @@
 /*-
  * Copyright (c) 2018 VMware, Inc.
  *
  * SPDX-License-Identifier: (BSD-2-Clause OR GPL-2.0)
  */
 
 /* This file implements defines and helper functions. */
 
 #include <sys/cdefs.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
 
 #include <machine/bus.h>
 
 #include "vmci.h"
 #include "vmci_defs.h"
 #include "vmci_kernel_defs.h"
 #include "vmci_kernel_if.h"
 #include "vmci_queue.h"
 
 struct vmci_queue_kernel_if {
 	size_t			num_pages;	/* Num pages incl. header. */
 	struct vmci_dma_alloc	*dmas;		/* For dma alloc. */
 };
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_init_lock
  *
  *     Initializes the lock. Must be called before use.
  *
  * Results:
  *     Always VMCI_SUCCESS.
  *
  * Side effects:
  *     Thread can block.
  *
  *------------------------------------------------------------------------------
  */
 
 int
 vmci_init_lock(vmci_lock *lock, char *name)
 {
 
 	mtx_init(lock, name, NULL, MTX_DEF | MTX_NOWITNESS);
 	return (VMCI_SUCCESS);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_cleanup_lock
  *
  *     Cleanup the lock. Must be called before deallocating lock.
  *
  * Results:
  *     None
  *
  * Side effects:
  *     Deletes kernel lock state
  *
  *------------------------------------------------------------------------------
  */
 
 void
 vmci_cleanup_lock(vmci_lock *lock)
 {
 
 	if (mtx_initialized(lock))
 		mtx_destroy(lock);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_grab_lock
  *
  *     Grabs the given lock.
  *
  * Results:
  *      None
  *
  * Side effects:
  *      Thread can block.
  *
  *------------------------------------------------------------------------------
  */
 
 void
 vmci_grab_lock(vmci_lock *lock)
 {
 
 	mtx_lock(lock);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_release_lock
  *
  *     Releases the given lock.
  *
  * Results:
  *     None
  *
  * Side effects:
  *     A thread blocked on this lock may wake up.
  *
  *------------------------------------------------------------------------------
  */
 
 void
 vmci_release_lock(vmci_lock *lock)
 {
 
 	mtx_unlock(lock);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_grab_lock_bh
  *
  *     Grabs the given lock.
  *
  * Results:
  *     None
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 void
 vmci_grab_lock_bh(vmci_lock *lock)
 {
 
 	mtx_lock(lock);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_release_lock_bh
  *
  *     Releases the given lock.
  *
  * Results:
  *     None
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 void
 vmci_release_lock_bh(vmci_lock *lock)
 {
 
 	mtx_unlock(lock);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_initialized_lock
  *
  *     Returns whether a lock has been initialized.
  *
  * Results:
  *     Return 1 if initialized or 0 if unininitialized.
  *
  * Side effects:
  *     None
  *
  *------------------------------------------------------------------------------
  */
 
 int
 vmci_initialized_lock(vmci_lock *lock)
 {
 
 	return mtx_initialized(lock);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_alloc_kernel_mem
  *
  *     Allocate physically contiguous memory for the VMCI driver.
  *
  * Results:
  *     The address allocated or NULL on error.
  *
  *
  * Side effects:
  *     Memory may be allocated.
  *
  *------------------------------------------------------------------------------
  */
 
 void *
 vmci_alloc_kernel_mem(size_t size, int flags)
 {
 	void *ptr;
 
 	if ((flags & VMCI_MEMORY_ATOMIC) != 0)
 		ptr = contigmalloc(size, M_DEVBUF, M_NOWAIT, 0, 0xFFFFFFFF,
 		    8, 1024 * 1024);
 	else
 		ptr = contigmalloc(size, M_DEVBUF, M_WAITOK, 0, 0xFFFFFFFF,
 		    8, 1024 * 1024);
 
 	return (ptr);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_free_kernel_mem
  *
  *     Free kernel memory allocated for the VMCI driver.
  *
  * Results:
  *     None.
  *
  * Side effects:
  *     Memory is freed.
  *
  *------------------------------------------------------------------------------
  */
 
 void
-vmci_free_kernel_mem(void *ptr, size_t size)
+vmci_free_kernel_mem(void *ptr, size_t size __unused)
 {
 
-	contigfree(ptr, size, M_DEVBUF);
+	free(ptr, M_DEVBUF);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_can_schedule_delayed_work --
  *
  *     Checks to see if the given platform supports delayed work callbacks.
  *
  * Results:
  *     true if it does. false otherwise.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 bool
 vmci_can_schedule_delayed_work(void)
 {
 
 	return (true);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_schedule_delayed_work --
  *
  *     Schedule the specified callback.
  *
  * Results:
  *     Zero on success, error code otherwise.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 int
 vmci_schedule_delayed_work(vmci_work_fn *work_fn, void *data)
 {
 
 	return (vmci_schedule_delayed_work_fn(work_fn, data));
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_create_event --
  *
  * Results:
  *     None.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 void
 vmci_create_event(vmci_event *event)
 {
 
 	sema_init(event, 0, "vmci_event");
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_destroy_event --
  *
  * Results:
  *     None.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 void
 vmci_destroy_event(vmci_event *event)
 {
 
 	if (mtx_owned(&event->sema_mtx))
 		sema_destroy(event);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_signal_event --
  *
  * Results:
  *     None.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 void
 vmci_signal_event(vmci_event *event)
 {
 
 	sema_post(event);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_wait_on_event --
  *
  * Results:
  *     None.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 void
 vmci_wait_on_event(vmci_event *event, vmci_event_release_cb release_cb,
     void *client_data)
 {
 
 	release_cb(client_data);
 	sema_wait(event);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_mutex_init --
  *
  *     Initializes the mutex. Must be called before use.
  *
  * Results:
  *     Success.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 int
 vmci_mutex_init(vmci_mutex *mutex, char *name)
 {
 
 	mtx_init(mutex, name, NULL, MTX_DEF | MTX_NOWITNESS);
 	return (VMCI_SUCCESS);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_mutex_destroy --
  *
  *     Destroys the mutex.
  *
  * Results:
  *     None.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 void
 vmci_mutex_destroy(vmci_mutex *mutex)
 {
 
 	mtx_destroy(mutex);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_mutex_acquire --
  *
  *     Acquires the mutex.
  *
  * Results:
  *     None.
  *
  * Side effects:
  *     Thread may block.
  *
  *------------------------------------------------------------------------------
  */
 
 void
 vmci_mutex_acquire(vmci_mutex *mutex)
 {
 
 	mtx_lock(mutex);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_mutex_release --
  *
  *     Releases the mutex.
  *
  * Results:
  *     None.
  *
  * Side effects:
  *     May wake up the thread blocking on this mutex.
  *
  *------------------------------------------------------------------------------
  */
 
 void
 vmci_mutex_release(vmci_mutex *mutex)
 {
 
 	mtx_unlock(mutex);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_mutex_initialized
  *
  *     Returns whether a mutex has been initialized.
  *
  * Results:
  *     Return 1 if initialized or 0 if unininitialized.
  *
  * Side effects:
  *     None
  *
  *------------------------------------------------------------------------------
  */
 
 int
 vmci_mutex_initialized(vmci_mutex *mutex)
 {
 
 	return mtx_initialized(mutex);
 }
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_alloc_queue --
  *
  *     Allocates kernel queue pages of specified size with IOMMU mappings, plus
  *     space for the queue structure/kernel interface and the queue header.
  *
  * Results:
  *     Pointer to the queue on success, NULL otherwise.
  *
  * Side effects:
  *     Memory is allocated.
  *
  *------------------------------------------------------------------------------
  */
 
 void *
 vmci_alloc_queue(uint64_t size, uint32_t flags)
 {
 	struct vmci_queue *queue;
 	size_t i;
 	const size_t num_pages = CEILING(size, PAGE_SIZE) + 1;
 	const size_t dmas_size = num_pages * sizeof(struct vmci_dma_alloc);
 	const size_t queue_size =
 	    sizeof(*queue) + sizeof(*(queue->kernel_if)) + dmas_size;
 
 	/* Size should be enforced by vmci_qpair_alloc(), double-check here. */
 	if (size > VMCI_MAX_GUEST_QP_MEMORY) {
 		ASSERT(false);
 		return (NULL);
 	}
 
 	queue = malloc(queue_size, M_DEVBUF, M_NOWAIT);
 	if (!queue)
 		return (NULL);
 
 	queue->q_header = NULL;
 	queue->saved_header = NULL;
 	queue->kernel_if = (struct vmci_queue_kernel_if *)(queue + 1);
 	queue->kernel_if->num_pages = num_pages;
 	queue->kernel_if->dmas = (struct vmci_dma_alloc *)(queue->kernel_if +
 	    1);
 	for (i = 0; i < num_pages; i++) {
 		vmci_dma_malloc(PAGE_SIZE, 1, &queue->kernel_if->dmas[i]);
 		if (!queue->kernel_if->dmas[i].dma_vaddr) {
 			/* Size excl. the header. */
 			vmci_free_queue(queue, i * PAGE_SIZE);
 			return (NULL);
 		}
 	}
 
 	/* Queue header is the first page. */
 	queue->q_header = (void *)queue->kernel_if->dmas[0].dma_vaddr;
 
 	return ((void *)queue);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_free_queue --
  *
  *     Frees kernel VA space for a given queue and its queue header, and frees
  *     physical data pages.
  *
  * Results:
  *     None.
  *
  * Side effects:
  *     Memory is freed.
  *
  *------------------------------------------------------------------------------
  */
 
 void
 vmci_free_queue(void *q, uint64_t size)
 {
 	struct vmci_queue *queue = q;
 
 	if (queue) {
 		const size_t num_pages = CEILING(size, PAGE_SIZE) + 1;
 		uint64_t i;
 
 		/* Given size doesn't include header, so add in a page here. */
 		for (i = 0; i < num_pages; i++)
 			vmci_dma_free(&queue->kernel_if->dmas[i]);
 		free(queue, M_DEVBUF);
 	}
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_alloc_ppn_set --
  *
  *     Allocates two list of PPNs --- one for the pages in the produce queue,
  *     and the other for the pages in the consume queue. Intializes the list of
  *     PPNs with the page frame numbers of the KVA for the two queues (and the
  *     queue headers).
  *
  * Results:
  *     Success or failure.
  *
  * Side effects:
  *     Memory may be allocated.
  *
  *-----------------------------------------------------------------------------
  */
 
 int
 vmci_alloc_ppn_set(void *prod_q, uint64_t num_produce_pages, void *cons_q,
     uint64_t num_consume_pages, struct ppn_set *ppn_set)
 {
 	struct vmci_queue *consume_q = cons_q;
 	struct vmci_queue *produce_q = prod_q;
 	vmci_ppn_list consume_ppns;
 	vmci_ppn_list produce_ppns;
 	uint64_t i;
 
 	if (!produce_q || !num_produce_pages || !consume_q ||
 	    !num_consume_pages || !ppn_set)
 		return (VMCI_ERROR_INVALID_ARGS);
 
 	if (ppn_set->initialized)
 		return (VMCI_ERROR_ALREADY_EXISTS);
 
 	produce_ppns =
 	    vmci_alloc_kernel_mem(num_produce_pages * sizeof(*produce_ppns),
 	    VMCI_MEMORY_NORMAL);
 	if (!produce_ppns)
 		return (VMCI_ERROR_NO_MEM);
 
 	consume_ppns =
 	    vmci_alloc_kernel_mem(num_consume_pages * sizeof(*consume_ppns),
 	    VMCI_MEMORY_NORMAL);
 	if (!consume_ppns) {
 		vmci_free_kernel_mem(produce_ppns,
 		    num_produce_pages * sizeof(*produce_ppns));
 		return (VMCI_ERROR_NO_MEM);
 	}
 
 	for (i = 0; i < num_produce_pages; i++) {
 		unsigned long pfn;
 
 		produce_ppns[i] =
 		    pfn = produce_q->kernel_if->dmas[i].dma_paddr >> PAGE_SHIFT;
 
 		/*
 		 * Fail allocation if PFN isn't supported by hypervisor.
 		 */
 
 		if (sizeof(pfn) >
 		    sizeof(*produce_ppns) && pfn != produce_ppns[i])
 			goto ppn_error;
 	}
 	for (i = 0; i < num_consume_pages; i++) {
 		unsigned long pfn;
 
 		consume_ppns[i] =
 		    pfn = consume_q->kernel_if->dmas[i].dma_paddr >> PAGE_SHIFT;
 
 		/*
 		 * Fail allocation if PFN isn't supported by hypervisor.
 		 */
 
 		if (sizeof(pfn) >
 		    sizeof(*consume_ppns) && pfn != consume_ppns[i])
 			goto ppn_error;
 	}
 
 	ppn_set->num_produce_pages = num_produce_pages;
 	ppn_set->num_consume_pages = num_consume_pages;
 	ppn_set->produce_ppns = produce_ppns;
 	ppn_set->consume_ppns = consume_ppns;
 	ppn_set->initialized = true;
 	return (VMCI_SUCCESS);
 
 ppn_error:
 	vmci_free_kernel_mem(produce_ppns, num_produce_pages *
 	    sizeof(*produce_ppns));
 	vmci_free_kernel_mem(consume_ppns, num_consume_pages *
 	    sizeof(*consume_ppns));
 	return (VMCI_ERROR_INVALID_ARGS);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_free_ppn_set --
  *
  *     Frees the two list of PPNs for a queue pair.
  *
  * Results:
  *     None.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 void
 vmci_free_ppn_set(struct ppn_set *ppn_set)
 {
 
 	ASSERT(ppn_set);
 	if (ppn_set->initialized) {
 		/* Do not call these functions on NULL inputs. */
 		ASSERT(ppn_set->produce_ppns && ppn_set->consume_ppns);
 		vmci_free_kernel_mem(ppn_set->produce_ppns,
 		    ppn_set->num_produce_pages *
 		    sizeof(*ppn_set->produce_ppns));
 		vmci_free_kernel_mem(ppn_set->consume_ppns,
 		    ppn_set->num_consume_pages *
 		    sizeof(*ppn_set->consume_ppns));
 	}
 	memset(ppn_set, 0, sizeof(*ppn_set));
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_populate_ppn_list --
  *
  *     Populates the list of PPNs in the hypercall structure with the PPNS
  *     of the produce queue and the consume queue.
  *
  * Results:
  *     VMCI_SUCCESS.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 int
 vmci_populate_ppn_list(uint8_t *call_buf, const struct ppn_set *ppn_set)
 {
 
 	ASSERT(call_buf && ppn_set && ppn_set->initialized);
 	memcpy(call_buf, ppn_set->produce_ppns,
 	    ppn_set->num_produce_pages * sizeof(*ppn_set->produce_ppns));
 	memcpy(call_buf + ppn_set->num_produce_pages *
 	    sizeof(*ppn_set->produce_ppns), ppn_set->consume_ppns,
 	    ppn_set->num_consume_pages * sizeof(*ppn_set->consume_ppns));
 
 	return (VMCI_SUCCESS);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_memcpy_{to,from}iovec --
  *
  *     These helper routines will copy the specified bytes to/from memory that's
  *     specified as a struct iovec.  The routines can not verify the correctness
  *     of the struct iovec's contents.
  *
  * Results:
  *      None.
  *
  * Side effects:
  *      None.
  *
  *------------------------------------------------------------------------------
  */
 
 static inline void
 vmci_memcpy_toiovec(struct iovec *iov, uint8_t *src, size_t len)
 {
 
 	while (len > 0) {
 		if (iov->iov_len) {
 			size_t to_copy = MIN(iov->iov_len, len);
 			memcpy(iov->iov_base, src, to_copy);
 			src += to_copy;
 			len -= to_copy;
 			iov->iov_base = (void *)((uintptr_t) iov->iov_base +
 			    to_copy);
 			iov->iov_len -= to_copy;
 		}
 		iov++;
 	}
 }
 
 static inline void
 vmci_memcpy_fromiovec(uint8_t *dst, struct iovec *iov, size_t len)
 {
 
 	while (len > 0) {
 		if (iov->iov_len) {
 			size_t to_copy = MIN(iov->iov_len, len);
 			memcpy(dst, iov->iov_base, to_copy);
 			dst += to_copy;
 			len -= to_copy;
 			iov->iov_base = (void *)((uintptr_t) iov->iov_base +
 			    to_copy);
 			iov->iov_len -= to_copy;
 		}
 		iov++;
 	}
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * __vmci_memcpy_to_queue --
  *
  *     Copies from a given buffer or iovector to a VMCI Queue. Assumes that
  *     offset + size does not wrap around in the queue.
  *
  * Results:
  *     Zero on success, negative error code on failure.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 #pragma GCC diagnostic ignored "-Wcast-qual"
 static int
 __vmci_memcpy_to_queue(struct vmci_queue *queue, uint64_t queue_offset,
     const void *src, size_t size, bool is_iovec)
 {
 	struct vmci_queue_kernel_if *kernel_if = queue->kernel_if;
 	size_t bytes_copied = 0;
 
 	while (bytes_copied < size) {
 		const uint64_t page_index =
 		    (queue_offset + bytes_copied) / PAGE_SIZE;
 		const size_t page_offset =
 		    (queue_offset + bytes_copied) & (PAGE_SIZE - 1);
 		void *va;
 		size_t to_copy;
 
 		/* Skip header. */
 		va = (void *)kernel_if->dmas[page_index + 1].dma_vaddr;
 
 		ASSERT(va);
 		/*
 		 * Fill up the page if we have enough payload, or else
 		 * copy the remaining bytes.
 		 */
 		to_copy = MIN(PAGE_SIZE - page_offset, size - bytes_copied);
 
 		if (is_iovec) {
 			struct iovec *iov = (struct iovec *)src;
 
 			/* The iovec will track bytes_copied internally. */
 			vmci_memcpy_fromiovec((uint8_t *)va + page_offset,
 			    iov, to_copy);
 		} else
 			memcpy((uint8_t *)va + page_offset,
 			    (uint8_t *)src + bytes_copied, to_copy);
 		bytes_copied += to_copy;
 	}
 
 	return (VMCI_SUCCESS);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * __vmci_memcpy_from_queue --
  *
  *     Copies to a given buffer or iovector from a VMCI Queue. Assumes that
  *     offset + size does not wrap around in the queue.
  *
  * Results:
  *     Zero on success, negative error code on failure.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 static int
 __vmci_memcpy_from_queue(void *dest, const struct vmci_queue *queue,
     uint64_t queue_offset, size_t size, bool is_iovec)
 {
 	struct vmci_queue_kernel_if *kernel_if = queue->kernel_if;
 	size_t bytes_copied = 0;
 
 	while (bytes_copied < size) {
 		const uint64_t page_index =
 		    (queue_offset + bytes_copied) / PAGE_SIZE;
 		const size_t page_offset =
 		    (queue_offset + bytes_copied) & (PAGE_SIZE - 1);
 		void *va;
 		size_t to_copy;
 
 		/* Skip header. */
 		va = (void *)kernel_if->dmas[page_index + 1].dma_vaddr;
 
 		ASSERT(va);
 		/*
 		 * Fill up the page if we have enough payload, or else
 		 * copy the remaining bytes.
 		 */
 		to_copy = MIN(PAGE_SIZE - page_offset, size - bytes_copied);
 
 		if (is_iovec) {
 			struct iovec *iov = (struct iovec *)dest;
 
 			/* The iovec will track bytesCopied internally. */
 			vmci_memcpy_toiovec(iov, (uint8_t *)va +
 			    page_offset, to_copy);
 		} else
 			memcpy((uint8_t *)dest + bytes_copied,
 			    (uint8_t *)va + page_offset, to_copy);
 
 		bytes_copied += to_copy;
 	}
 
 	return (VMCI_SUCCESS);
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_memcpy_to_queue --
  *
  *     Copies from a given buffer to a VMCI Queue.
  *
  * Results:
  *     Zero on success, negative error code on failure.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 int
 vmci_memcpy_to_queue(struct vmci_queue *queue, uint64_t queue_offset,
     const void *src, size_t src_offset, size_t size, int buf_type,
     bool can_block)
 {
 
 	ASSERT(can_block);
 
 	return (__vmci_memcpy_to_queue(queue, queue_offset,
 	    (uint8_t *)src + src_offset, size, false));
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_memcpy_from_queue --
  *
  *      Copies to a given buffer from a VMCI Queue.
  *
  * Results:
  *      Zero on success, negative error code on failure.
  *
  * Side effects:
  *      None.
  *
  *------------------------------------------------------------------------------
  */
 
 int
 vmci_memcpy_from_queue(void *dest, size_t dest_offset,
     const struct vmci_queue *queue, uint64_t queue_offset, size_t size,
     int buf_type, bool can_block)
 {
 
 	ASSERT(can_block);
 
 	return (__vmci_memcpy_from_queue((uint8_t *)dest + dest_offset,
 	    queue, queue_offset, size, false));
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_memcpy_to_queue_local --
  *
  *     Copies from a given buffer to a local VMCI queue. This is the
  *     same as a regular copy.
  *
  * Results:
  *     Zero on success, negative error code on failure.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 int
 vmci_memcpy_to_queue_local(struct vmci_queue *queue, uint64_t queue_offset,
     const void *src, size_t src_offset, size_t size, int buf_type,
     bool can_block)
 {
 
 	ASSERT(can_block);
 
 	return (__vmci_memcpy_to_queue(queue, queue_offset,
 	    (uint8_t *)src + src_offset, size, false));
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_memcpy_from_queue_local --
  *
  *     Copies to a given buffer from a VMCI Queue.
  *
  * Results:
  *     Zero on success, negative error code on failure.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 int
 vmci_memcpy_from_queue_local(void *dest, size_t dest_offset,
     const struct vmci_queue *queue, uint64_t queue_offset, size_t size,
     int buf_type, bool can_block)
 {
 
 	ASSERT(can_block);
 
 	return (__vmci_memcpy_from_queue((uint8_t *)dest + dest_offset,
 	    queue, queue_offset, size, false));
 }
 
 /*------------------------------------------------------------------------------
  *
  * vmci_memcpy_to_queue_v --
  *
  *     Copies from a given iovec from a VMCI Queue.
  *
  * Results:
  *     Zero on success, negative error code on failure.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 int
 vmci_memcpy_to_queue_v(struct vmci_queue *queue, uint64_t queue_offset,
     const void *src, size_t src_offset, size_t size, int buf_type,
     bool can_block)
 {
 
 	ASSERT(can_block);
 
 	/*
 	 * We ignore src_offset because src is really a struct iovec * and will
 	 * maintain offset internally.
 	 */
 	return (__vmci_memcpy_to_queue(queue, queue_offset, src, size,
 	    true));
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_memcpy_from_queue_v --
  *
  *     Copies to a given iovec from a VMCI Queue.
  *
  * Results:
  *     Zero on success, negative error code on failure.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 int
 vmci_memcpy_from_queue_v(void *dest, size_t dest_offset,
     const struct vmci_queue *queue, uint64_t queue_offset, size_t size,
     int buf_type, bool can_block)
 {
 
 	ASSERT(can_block);
 
 	/*
 	 * We ignore dest_offset because dest is really a struct iovec * and
 	 * will maintain offset internally.
 	 */
 	return (__vmci_memcpy_from_queue(dest, queue, queue_offset, size,
 	    true));
 }
 
 /*
  *------------------------------------------------------------------------------
  *
  * vmci_read_port_bytes --
  *
  *     Copy memory from an I/O port to kernel memory.
  *
  * Results:
  *     No results.
  *
  * Side effects:
  *     None.
  *
  *------------------------------------------------------------------------------
  */
 
 void
 vmci_read_port_bytes(vmci_io_handle handle, vmci_io_port port, uint8_t *buffer,
     size_t buffer_length)
 {
 
 	insb(port, buffer, buffer_length);
 }
diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c
index 2c5862232b41..b11972295a4b 100644
--- a/sys/dev/xen/blkfront/blkfront.c
+++ b/sys/dev/xen/blkfront/blkfront.c
@@ -1,1645 +1,1641 @@
 /*
  * XenBSD block device driver
  *
  * Copyright (c) 2010-2013 Spectra Logic Corporation
  * Copyright (c) 2009 Scott Long, Yahoo!
  * Copyright (c) 2009 Frank Suchomel, Citrix
  * Copyright (c) 2009 Doug F. Rabson, Citrix
  * Copyright (c) 2005 Kip Macy
  * Copyright (c) 2003-2004, Keir Fraser & Steve Hand
  * Modifications by Mark A. Williamson are (c) Intel Research Cambridge
  *
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
  * deal in the Software without restriction, including without limitation the
  * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
  * sell copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #include <sys/bio.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/module.h>
 #include <sys/sysctl.h>
 
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <machine/resource.h>
 #include <machine/vmparam.h>
 
 #include <xen/xen-os.h>
 #include <xen/hypervisor.h>
 #include <xen/xen_intr.h>
 #include <xen/gnttab.h>
 #include <contrib/xen/grant_table.h>
 #include <contrib/xen/io/protocols.h>
 #include <xen/xenbus/xenbusvar.h>
 
 #include <machine/_inttypes.h>
 
 #include <geom/geom_disk.h>
 
 #include <dev/xen/blkfront/block.h>
 
 #include "xenbus_if.h"
 
 /*--------------------------- Forward Declarations ---------------------------*/
 static void xbd_closing(device_t);
 static void xbd_startio(struct xbd_softc *sc);
 
 /*---------------------------------- Macros ----------------------------------*/
 #if 0
 #define DPRINTK(fmt, args...) printf("[XEN] %s:%d: " fmt ".\n", __func__, __LINE__, ##args)
 #else
 #define DPRINTK(fmt, args...) 
 #endif
 
 #define XBD_SECTOR_SHFT		9
 
 /*---------------------------- Global Static Data ----------------------------*/
 static MALLOC_DEFINE(M_XENBLOCKFRONT, "xbd", "Xen Block Front driver data");
 
 static int xbd_enable_indirect = 1;
 SYSCTL_NODE(_hw, OID_AUTO, xbd, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
     "xbd driver parameters");
 SYSCTL_INT(_hw_xbd, OID_AUTO, xbd_enable_indirect, CTLFLAG_RDTUN,
     &xbd_enable_indirect, 0, "Enable xbd indirect segments");
 
 /*---------------------------- Command Processing ----------------------------*/
 static void
 xbd_freeze(struct xbd_softc *sc, xbd_flag_t xbd_flag)
 {
 	if (xbd_flag != XBDF_NONE && (sc->xbd_flags & xbd_flag) != 0)
 		return;
 
 	sc->xbd_flags |= xbd_flag;
 	sc->xbd_qfrozen_cnt++;
 }
 
 static void
 xbd_thaw(struct xbd_softc *sc, xbd_flag_t xbd_flag)
 {
 	if (xbd_flag != XBDF_NONE && (sc->xbd_flags & xbd_flag) == 0)
 		return;
 
 	if (sc->xbd_qfrozen_cnt == 0)
 		panic("%s: Thaw with flag 0x%x while not frozen.",
 		    __func__, xbd_flag);
 
 	sc->xbd_flags &= ~xbd_flag;
 	sc->xbd_qfrozen_cnt--;
 }
 
 static void
 xbd_cm_freeze(struct xbd_softc *sc, struct xbd_command *cm, xbdc_flag_t cm_flag)
 {
 	if ((cm->cm_flags & XBDCF_FROZEN) != 0)
 		return;
 
 	cm->cm_flags |= XBDCF_FROZEN|cm_flag;
 	xbd_freeze(sc, XBDF_NONE);
 }
 
 static void
 xbd_cm_thaw(struct xbd_softc *sc, struct xbd_command *cm)
 {
 	if ((cm->cm_flags & XBDCF_FROZEN) == 0)
 		return;
 
 	cm->cm_flags &= ~XBDCF_FROZEN;
 	xbd_thaw(sc, XBDF_NONE);
 }
 
 static inline void 
 xbd_flush_requests(struct xbd_softc *sc)
 {
 	int notify;
 
 	RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&sc->xbd_ring, notify);
 
 	if (notify)
 		xen_intr_signal(sc->xen_intr_handle);
 }
 
 static void
 xbd_free_command(struct xbd_command *cm)
 {
 
 	KASSERT((cm->cm_flags & XBDCF_Q_MASK) == XBD_Q_NONE,
 	    ("Freeing command that is still on queue %d.",
 	    cm->cm_flags & XBDCF_Q_MASK));
 
 	cm->cm_flags = XBDCF_INITIALIZER;
 	cm->cm_bp = NULL;
 	cm->cm_complete = NULL;
 	xbd_enqueue_cm(cm, XBD_Q_FREE);
 	xbd_thaw(cm->cm_sc, XBDF_CM_SHORTAGE);
 }
 
 static void
 xbd_mksegarray(bus_dma_segment_t *segs, int nsegs,
     grant_ref_t * gref_head, int otherend_id, int readonly,
     grant_ref_t * sg_ref, struct blkif_request_segment *sg)
 {
 	struct blkif_request_segment *last_block_sg = sg + nsegs;
 	vm_paddr_t buffer_ma;
 	uint64_t fsect, lsect;
 	int ref;
 
 	while (sg < last_block_sg) {
 		KASSERT(segs->ds_addr % (1 << XBD_SECTOR_SHFT) == 0,
 		    ("XEN disk driver I/O must be sector aligned"));
 		KASSERT(segs->ds_len % (1 << XBD_SECTOR_SHFT) == 0,
 		    ("XEN disk driver I/Os must be a multiple of "
 		    "the sector length"));
 		buffer_ma = segs->ds_addr;
 		fsect = (buffer_ma & PAGE_MASK) >> XBD_SECTOR_SHFT;
 		lsect = fsect + (segs->ds_len  >> XBD_SECTOR_SHFT) - 1;
 
 		KASSERT(lsect <= 7, ("XEN disk driver data cannot "
 		    "cross a page boundary"));
 
 		/* install a grant reference. */
 		ref = gnttab_claim_grant_reference(gref_head);
 
 		/*
 		 * GNTTAB_LIST_END == 0xffffffff, but it is private
 		 * to gnttab.c.
 		 */
 		KASSERT(ref != ~0, ("grant_reference failed"));
 
 		gnttab_grant_foreign_access_ref(
 		    ref,
 		    otherend_id,
 		    buffer_ma >> PAGE_SHIFT,
 		    readonly);
 
 		*sg_ref = ref;
 		*sg = (struct blkif_request_segment) {
 			.gref       = ref,
 			.first_sect = fsect, 
 			.last_sect  = lsect
 		};
 		sg++;
 		sg_ref++;
 		segs++;
 	}
 }
 
 static void
 xbd_queue_cb(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
 {
 	struct xbd_softc *sc;
 	struct xbd_command *cm;
 	int op;
 
 	cm = arg;
 	sc = cm->cm_sc;
 
 	if (error) {
 		cm->cm_bp->bio_error = EIO;
 		biodone(cm->cm_bp);
 		xbd_free_command(cm);
 		return;
 	}
 
 	KASSERT(nsegs <= sc->xbd_max_request_segments,
 	    ("Too many segments in a blkfront I/O"));
 
 	if (nsegs <= BLKIF_MAX_SEGMENTS_PER_REQUEST) {
 		blkif_request_t	*ring_req;
 
 		/* Fill out a blkif_request_t structure. */
 		ring_req = (blkif_request_t *)
 		    RING_GET_REQUEST(&sc->xbd_ring, sc->xbd_ring.req_prod_pvt);
 		sc->xbd_ring.req_prod_pvt++;
 		ring_req->id = cm->cm_id;
 		ring_req->operation = cm->cm_operation;
 		ring_req->sector_number = cm->cm_sector_number;
 		ring_req->handle = (blkif_vdev_t)(uintptr_t)sc->xbd_disk;
 		ring_req->nr_segments = nsegs;
 		cm->cm_nseg = nsegs;
 		xbd_mksegarray(segs, nsegs, &cm->cm_gref_head,
 		    xenbus_get_otherend_id(sc->xbd_dev),
 		    cm->cm_operation == BLKIF_OP_WRITE,
 		    cm->cm_sg_refs, ring_req->seg);
 	} else {
 		blkif_request_indirect_t *ring_req;
 
 		/* Fill out a blkif_request_indirect_t structure. */
 		ring_req = (blkif_request_indirect_t *)
 		    RING_GET_REQUEST(&sc->xbd_ring, sc->xbd_ring.req_prod_pvt);
 		sc->xbd_ring.req_prod_pvt++;
 		ring_req->id = cm->cm_id;
 		ring_req->operation = BLKIF_OP_INDIRECT;
 		ring_req->indirect_op = cm->cm_operation;
 		ring_req->sector_number = cm->cm_sector_number;
 		ring_req->handle = (blkif_vdev_t)(uintptr_t)sc->xbd_disk;
 		ring_req->nr_segments = nsegs;
 		cm->cm_nseg = nsegs;
 		xbd_mksegarray(segs, nsegs, &cm->cm_gref_head,
 		    xenbus_get_otherend_id(sc->xbd_dev),
 		    cm->cm_operation == BLKIF_OP_WRITE,
 		    cm->cm_sg_refs, cm->cm_indirectionpages);
 		memcpy(ring_req->indirect_grefs, &cm->cm_indirectionrefs,
 		    sizeof(grant_ref_t) * sc->xbd_max_request_indirectpages);
 	}
 
 	if (cm->cm_operation == BLKIF_OP_READ)
 		op = BUS_DMASYNC_PREREAD;
 	else if (cm->cm_operation == BLKIF_OP_WRITE)
 		op = BUS_DMASYNC_PREWRITE;
 	else
 		op = 0;
 	bus_dmamap_sync(sc->xbd_io_dmat, cm->cm_map, op);
 
 	gnttab_free_grant_references(cm->cm_gref_head);
 
 	xbd_enqueue_cm(cm, XBD_Q_BUSY);
 
 	/*
 	 * If bus dma had to asynchronously call us back to dispatch
 	 * this command, we are no longer executing in the context of 
 	 * xbd_startio().  Thus we cannot rely on xbd_startio()'s call to
 	 * xbd_flush_requests() to publish this command to the backend
 	 * along with any other commands that it could batch.
 	 */
 	if ((cm->cm_flags & XBDCF_ASYNC_MAPPING) != 0)
 		xbd_flush_requests(sc);
 
 	return;
 }
 
 static int
 xbd_queue_request(struct xbd_softc *sc, struct xbd_command *cm)
 {
 	int error;
 
 	if (cm->cm_bp != NULL)
 		error = bus_dmamap_load_bio(sc->xbd_io_dmat, cm->cm_map,
 		    cm->cm_bp, xbd_queue_cb, cm, 0);
 	else
 		error = bus_dmamap_load(sc->xbd_io_dmat, cm->cm_map,
 		    cm->cm_data, cm->cm_datalen, xbd_queue_cb, cm, 0);
 	if (error == EINPROGRESS) {
 		/*
 		 * Maintain queuing order by freezing the queue.  The next
 		 * command may not require as many resources as the command
 		 * we just attempted to map, so we can't rely on bus dma
 		 * blocking for it too.
 		 */
 		xbd_cm_freeze(sc, cm, XBDCF_ASYNC_MAPPING);
 		return (0);
 	}
 
 	return (error);
 }
 
 static void
 xbd_restart_queue_callback(void *arg)
 {
 	struct xbd_softc *sc = arg;
 
 	mtx_lock(&sc->xbd_io_lock);
 
 	xbd_thaw(sc, XBDF_GNT_SHORTAGE);
 
 	xbd_startio(sc);
 
 	mtx_unlock(&sc->xbd_io_lock);
 }
 
 static struct xbd_command *
 xbd_bio_command(struct xbd_softc *sc)
 {
 	struct xbd_command *cm;
 	struct bio *bp;
 
 	if (__predict_false(sc->xbd_state != XBD_STATE_CONNECTED))
 		return (NULL);
 
 	bp = xbd_dequeue_bio(sc);
 	if (bp == NULL)
 		return (NULL);
 
 	if ((cm = xbd_dequeue_cm(sc, XBD_Q_FREE)) == NULL) {
 		xbd_freeze(sc, XBDF_CM_SHORTAGE);
 		xbd_requeue_bio(sc, bp);
 		return (NULL);
 	}
 
 	if (gnttab_alloc_grant_references(sc->xbd_max_request_segments,
 	    &cm->cm_gref_head) != 0) {
 		gnttab_request_free_callback(&sc->xbd_callback,
 		    xbd_restart_queue_callback, sc,
 		    sc->xbd_max_request_segments);
 		xbd_freeze(sc, XBDF_GNT_SHORTAGE);
 		xbd_requeue_bio(sc, bp);
 		xbd_enqueue_cm(cm, XBD_Q_FREE);
 		return (NULL);
 	}
 
 	cm->cm_bp = bp;
 	cm->cm_sector_number = (blkif_sector_t)bp->bio_pblkno;
 
 	switch (bp->bio_cmd) {
 	case BIO_READ:
 		cm->cm_operation = BLKIF_OP_READ;
 		break;
 	case BIO_WRITE:
 		cm->cm_operation = BLKIF_OP_WRITE;
 		if ((bp->bio_flags & BIO_ORDERED) != 0) {
 			if ((sc->xbd_flags & XBDF_BARRIER) != 0) {
 				cm->cm_operation = BLKIF_OP_WRITE_BARRIER;
 			} else {
 				/*
 				 * Single step this command.
 				 */
 				cm->cm_flags |= XBDCF_Q_FREEZE;
 				if (xbd_queue_length(sc, XBD_Q_BUSY) != 0) {
 					/*
 					 * Wait for in-flight requests to
 					 * finish.
 					 */
 					xbd_freeze(sc, XBDF_WAIT_IDLE);
 					xbd_requeue_cm(cm, XBD_Q_READY);
 					return (NULL);
 				}
 			}
 		}
 		break;
 	case BIO_FLUSH:
 		if ((sc->xbd_flags & XBDF_FLUSH) != 0)
 			cm->cm_operation = BLKIF_OP_FLUSH_DISKCACHE;
 		else if ((sc->xbd_flags & XBDF_BARRIER) != 0)
 			cm->cm_operation = BLKIF_OP_WRITE_BARRIER;
 		else
 			panic("flush request, but no flush support available");
 		break;
 	default:
 		biofinish(bp, NULL, EOPNOTSUPP);
 		xbd_enqueue_cm(cm, XBD_Q_FREE);
 		return (NULL);
 	}
 
 	return (cm);
 }
 
 /*
  * Dequeue buffers and place them in the shared communication ring.
  * Return when no more requests can be accepted or all buffers have 
  * been queued.
  *
  * Signal XEN once the ring has been filled out.
  */
 static void
 xbd_startio(struct xbd_softc *sc)
 {
 	struct xbd_command *cm;
 	int error, queued = 0;
 
 	mtx_assert(&sc->xbd_io_lock, MA_OWNED);
 
 	if (sc->xbd_state != XBD_STATE_CONNECTED)
 		return;
 
 	while (!RING_FULL(&sc->xbd_ring)) {
 		if (sc->xbd_qfrozen_cnt != 0)
 			break;
 
 		cm = xbd_dequeue_cm(sc, XBD_Q_READY);
 
 		if (cm == NULL)
 		    cm = xbd_bio_command(sc);
 
 		if (cm == NULL)
 			break;
 
 		if ((cm->cm_flags & XBDCF_Q_FREEZE) != 0) {
 			/*
 			 * Single step command.  Future work is
 			 * held off until this command completes.
 			 */
 			xbd_cm_freeze(sc, cm, XBDCF_Q_FREEZE);
 		}
 
 		if ((error = xbd_queue_request(sc, cm)) != 0) {
 			printf("xbd_queue_request returned %d\n", error);
 			break;
 		}
 		queued++;
 	}
 
 	if (queued != 0) 
 		xbd_flush_requests(sc);
 }
 
 static void
 xbd_bio_complete(struct xbd_softc *sc, struct xbd_command *cm)
 {
 	struct bio *bp;
 
 	bp = cm->cm_bp;
 
 	if (__predict_false(cm->cm_status != BLKIF_RSP_OKAY)) {
 		disk_err(bp, "disk error" , -1, 0);
 		printf(" status: %x\n", cm->cm_status);
 		bp->bio_flags |= BIO_ERROR;
 	}
 
 	if (bp->bio_flags & BIO_ERROR)
 		bp->bio_error = EIO;
 	else
 		bp->bio_resid = 0;
 
 	xbd_free_command(cm);
 	biodone(bp);
 }
 
 static void
 xbd_int(void *xsc)
 {
 	struct xbd_softc *sc = xsc;
 	struct xbd_command *cm;
 	blkif_response_t *bret;
 	RING_IDX i, rp;
 	int op;
 
 	mtx_lock(&sc->xbd_io_lock);
 
 	if (__predict_false(sc->xbd_state == XBD_STATE_DISCONNECTED)) {
 		mtx_unlock(&sc->xbd_io_lock);
 		return;
 	}
 
  again:
 	rp = sc->xbd_ring.sring->rsp_prod;
 	rmb(); /* Ensure we see queued responses up to 'rp'. */
 
 	for (i = sc->xbd_ring.rsp_cons; i != rp;) {
 		bret = RING_GET_RESPONSE(&sc->xbd_ring, i);
 		cm   = &sc->xbd_shadow[bret->id];
 
 		xbd_remove_cm(cm, XBD_Q_BUSY);
 		gnttab_end_foreign_access_references(cm->cm_nseg,
 		    cm->cm_sg_refs);
 		i++;
 
 		if (cm->cm_operation == BLKIF_OP_READ)
 			op = BUS_DMASYNC_POSTREAD;
 		else if (cm->cm_operation == BLKIF_OP_WRITE ||
 		    cm->cm_operation == BLKIF_OP_WRITE_BARRIER)
 			op = BUS_DMASYNC_POSTWRITE;
 		else
 			op = 0;
 		bus_dmamap_sync(sc->xbd_io_dmat, cm->cm_map, op);
 		bus_dmamap_unload(sc->xbd_io_dmat, cm->cm_map);
 
 		/*
 		 * Release any hold this command has on future command
 		 * dispatch. 
 		 */
 		xbd_cm_thaw(sc, cm);
 
 		/*
 		 * Directly call the i/o complete routine to save an
 		 * an indirection in the common case.
 		 */
 		cm->cm_status = bret->status;
 		if (cm->cm_bp)
 			xbd_bio_complete(sc, cm);
 		else if (cm->cm_complete != NULL)
 			cm->cm_complete(cm);
 		else
 			xbd_free_command(cm);
 	}
 
 	sc->xbd_ring.rsp_cons = i;
 
 	if (i != sc->xbd_ring.req_prod_pvt) {
 		int more_to_do;
 		RING_FINAL_CHECK_FOR_RESPONSES(&sc->xbd_ring, more_to_do);
 		if (more_to_do)
 			goto again;
 	} else {
 		sc->xbd_ring.sring->rsp_event = i + 1;
 	}
 
 	if (xbd_queue_length(sc, XBD_Q_BUSY) == 0)
 		xbd_thaw(sc, XBDF_WAIT_IDLE);
 
 	xbd_startio(sc);
 
 	if (__predict_false(sc->xbd_state == XBD_STATE_SUSPENDED))
 		wakeup(&sc->xbd_cm_q[XBD_Q_BUSY]);
 
 	mtx_unlock(&sc->xbd_io_lock);
 }
 
 /*------------------------------- Dump Support -------------------------------*/
 /**
  * Quiesce the disk writes for a dump file before allowing the next buffer.
  */
 static void
 xbd_quiesce(struct xbd_softc *sc)
 {
 	int mtd;
 
 	// While there are outstanding requests
 	while (xbd_queue_length(sc, XBD_Q_BUSY) != 0) {
 		RING_FINAL_CHECK_FOR_RESPONSES(&sc->xbd_ring, mtd);
 		if (mtd) {
 			/* Received request completions, update queue. */
 			xbd_int(sc);
 		}
 		if (xbd_queue_length(sc, XBD_Q_BUSY) != 0) {
 			/*
 			 * Still pending requests, wait for the disk i/o
 			 * to complete.
 			 */
 			HYPERVISOR_yield();
 		}
 	}
 }
 
 /* Kernel dump function for a paravirtualized disk device */
 static void
 xbd_dump_complete(struct xbd_command *cm)
 {
 
 	xbd_enqueue_cm(cm, XBD_Q_COMPLETE);
 }
 
 static int
 xbd_dump(void *arg, void *virtual, off_t offset, size_t length)
 {
 	struct disk *dp = arg;
 	struct xbd_softc *sc = dp->d_drv1;
 	struct xbd_command *cm;
 	size_t chunk;
 	int rc = 0;
 
 	if (length == 0)
 		return (0);
 
 	xbd_quiesce(sc);	/* All quiet on the western front. */
 
 	/*
 	 * If this lock is held, then this module is failing, and a
 	 * successful kernel dump is highly unlikely anyway.
 	 */
 	mtx_lock(&sc->xbd_io_lock);
 
 	/* Split the 64KB block as needed */
 	while (length > 0) {
 		cm = xbd_dequeue_cm(sc, XBD_Q_FREE);
 		if (cm == NULL) {
 			mtx_unlock(&sc->xbd_io_lock);
 			device_printf(sc->xbd_dev, "dump: no more commands?\n");
 			return (EBUSY);
 		}
 
 		if (gnttab_alloc_grant_references(sc->xbd_max_request_segments,
 		    &cm->cm_gref_head) != 0) {
 			xbd_free_command(cm);
 			mtx_unlock(&sc->xbd_io_lock);
 			device_printf(sc->xbd_dev, "no more grant allocs?\n");
 			return (EBUSY);
 		}
 
 		chunk = length > sc->xbd_max_request_size ?
 		    sc->xbd_max_request_size : length;
 		cm->cm_data = virtual;
 		cm->cm_datalen = chunk;
 		cm->cm_operation = BLKIF_OP_WRITE;
 		cm->cm_sector_number = offset / dp->d_sectorsize;
 		cm->cm_complete = xbd_dump_complete;
 
 		xbd_enqueue_cm(cm, XBD_Q_READY);
 
 		length -= chunk;
 		offset += chunk;
 		virtual = (char *) virtual + chunk;
 	}
 
 	/* Tell DOM0 to do the I/O */
 	xbd_startio(sc);
 	mtx_unlock(&sc->xbd_io_lock);
 
 	/* Poll for the completion. */
 	xbd_quiesce(sc);	/* All quite on the eastern front */
 
 	/* If there were any errors, bail out... */
 	while ((cm = xbd_dequeue_cm(sc, XBD_Q_COMPLETE)) != NULL) {
 		if (cm->cm_status != BLKIF_RSP_OKAY) {
 			device_printf(sc->xbd_dev,
 			    "Dump I/O failed at sector %jd\n",
 			    cm->cm_sector_number);
 			rc = EIO;
 		}
 		xbd_free_command(cm);
 	}
 
 	return (rc);
 }
 
 /*----------------------------- Disk Entrypoints -----------------------------*/
 static int
 xbd_open(struct disk *dp)
 {
 	struct xbd_softc *sc = dp->d_drv1;
 
 	if (sc == NULL) {
 		printf("xbd%d: not found", dp->d_unit);
 		return (ENXIO);
 	}
 
 	sc->xbd_flags |= XBDF_OPEN;
 	sc->xbd_users++;
 	return (0);
 }
 
 static int
 xbd_close(struct disk *dp)
 {
 	struct xbd_softc *sc = dp->d_drv1;
 
 	if (sc == NULL)
 		return (ENXIO);
 	sc->xbd_flags &= ~XBDF_OPEN;
 	if (--(sc->xbd_users) == 0) {
 		/*
 		 * Check whether we have been instructed to close.  We will
 		 * have ignored this request initially, as the device was
 		 * still mounted.
 		 */
 		if (xenbus_get_otherend_state(sc->xbd_dev) ==
 		    XenbusStateClosing)
 			xbd_closing(sc->xbd_dev);
 	}
 	return (0);
 }
 
 static int
 xbd_ioctl(struct disk *dp, u_long cmd, void *addr, int flag, struct thread *td)
 {
 	struct xbd_softc *sc = dp->d_drv1;
 
 	if (sc == NULL)
 		return (ENXIO);
 
 	return (ENOTTY);
 }
 
 /*
  * Read/write routine for a buffer.  Finds the proper unit, place it on
  * the sortq and kick the controller.
  */
 static void
 xbd_strategy(struct bio *bp)
 {
 	struct xbd_softc *sc = bp->bio_disk->d_drv1;
 
 	/* bogus disk? */
 	if (sc == NULL) {
 		bp->bio_error = EINVAL;
 		bp->bio_flags |= BIO_ERROR;
 		bp->bio_resid = bp->bio_bcount;
 		biodone(bp);
 		return;
 	}
 
 	/*
 	 * Place it in the queue of disk activities for this disk
 	 */
 	mtx_lock(&sc->xbd_io_lock);
 
 	xbd_enqueue_bio(sc, bp);
 	xbd_startio(sc);
 
 	mtx_unlock(&sc->xbd_io_lock);
 	return;
 }
 
 /*------------------------------ Ring Management -----------------------------*/
 static int 
 xbd_alloc_ring(struct xbd_softc *sc)
 {
 	blkif_sring_t *sring;
 	uintptr_t sring_page_addr;
 	int error;
 	int i;
 
 	sring = malloc(sc->xbd_ring_pages * PAGE_SIZE, M_XENBLOCKFRONT,
 	    M_NOWAIT|M_ZERO);
 	if (sring == NULL) {
 		xenbus_dev_fatal(sc->xbd_dev, ENOMEM, "allocating shared ring");
 		return (ENOMEM);
 	}
 	SHARED_RING_INIT(sring);
 	FRONT_RING_INIT(&sc->xbd_ring, sring, sc->xbd_ring_pages * PAGE_SIZE);
 
 	for (i = 0, sring_page_addr = (uintptr_t)sring;
 	     i < sc->xbd_ring_pages;
 	     i++, sring_page_addr += PAGE_SIZE) {
 		error = xenbus_grant_ring(sc->xbd_dev,
 		    (vtophys(sring_page_addr) >> PAGE_SHIFT),
 		    &sc->xbd_ring_ref[i]);
 		if (error) {
 			xenbus_dev_fatal(sc->xbd_dev, error,
 			    "granting ring_ref(%d)", i);
 			return (error);
 		}
 	}
 	if (sc->xbd_ring_pages == 1) {
 		error = xs_printf(XST_NIL, xenbus_get_node(sc->xbd_dev),
 		    "ring-ref", "%u", sc->xbd_ring_ref[0]);
 		if (error) {
 			xenbus_dev_fatal(sc->xbd_dev, error,
 			    "writing %s/ring-ref",
 			    xenbus_get_node(sc->xbd_dev));
 			return (error);
 		}
 	} else {
 		for (i = 0; i < sc->xbd_ring_pages; i++) {
 			char ring_ref_name[]= "ring_refXX";
 
 			snprintf(ring_ref_name, sizeof(ring_ref_name),
 			    "ring-ref%u", i);
 			error = xs_printf(XST_NIL, xenbus_get_node(sc->xbd_dev),
 			     ring_ref_name, "%u", sc->xbd_ring_ref[i]);
 			if (error) {
 				xenbus_dev_fatal(sc->xbd_dev, error,
 				    "writing %s/%s",
 				    xenbus_get_node(sc->xbd_dev),
 				    ring_ref_name);
 				return (error);
 			}
 		}
 	}
 
 	error = xen_intr_alloc_and_bind_local_port(sc->xbd_dev,
 	    xenbus_get_otherend_id(sc->xbd_dev), NULL, xbd_int, sc,
 	    INTR_TYPE_BIO | INTR_MPSAFE, &sc->xen_intr_handle);
 	if (error) {
 		xenbus_dev_fatal(sc->xbd_dev, error,
 		    "xen_intr_alloc_and_bind_local_port failed");
 		return (error);
 	}
 
 	return (0);
 }
 
 static void
 xbd_free_ring(struct xbd_softc *sc)
 {
 	int i;
 
 	if (sc->xbd_ring.sring == NULL)
 		return;
 
 	for (i = 0; i < sc->xbd_ring_pages; i++) {
 		if (sc->xbd_ring_ref[i] != GRANT_REF_INVALID) {
 			gnttab_end_foreign_access_ref(sc->xbd_ring_ref[i]);
 			sc->xbd_ring_ref[i] = GRANT_REF_INVALID;
 		}
 	}
 	free(sc->xbd_ring.sring, M_XENBLOCKFRONT);
 	sc->xbd_ring.sring = NULL;
 }
 
 /*-------------------------- Initialization/Teardown -------------------------*/
 static int
 xbd_feature_string(struct xbd_softc *sc, char *features, size_t len)
 {
 	struct sbuf sb;
 	int feature_cnt;
 
 	sbuf_new(&sb, features, len, SBUF_FIXEDLEN);
 
 	feature_cnt = 0;
 	if ((sc->xbd_flags & XBDF_FLUSH) != 0) {
 		sbuf_printf(&sb, "flush");
 		feature_cnt++;
 	}
 
 	if ((sc->xbd_flags & XBDF_BARRIER) != 0) {
 		if (feature_cnt != 0)
 			sbuf_printf(&sb, ", ");
 		sbuf_printf(&sb, "write_barrier");
 		feature_cnt++;
 	}
 
 	if ((sc->xbd_flags & XBDF_DISCARD) != 0) {
 		if (feature_cnt != 0)
 			sbuf_printf(&sb, ", ");
 		sbuf_printf(&sb, "discard");
 		feature_cnt++;
 	}
 
 	if ((sc->xbd_flags & XBDF_PERSISTENT) != 0) {
 		if (feature_cnt != 0)
 			sbuf_printf(&sb, ", ");
 		sbuf_printf(&sb, "persistent_grants");
 		feature_cnt++;
 	}
 
 	(void) sbuf_finish(&sb);
 	return (sbuf_len(&sb));
 }
 
 static int
 xbd_sysctl_features(SYSCTL_HANDLER_ARGS)
 {
 	char features[80];
 	struct xbd_softc *sc = arg1;
 	int error;
 	int len;
 
 	error = sysctl_wire_old_buffer(req, 0);
 	if (error != 0)
 		return (error);
 
 	len = xbd_feature_string(sc, features, sizeof(features));
 
 	/* len is -1 on error, which will make the SYSCTL_OUT a no-op. */
 	return (SYSCTL_OUT(req, features, len + 1/*NUL*/));
 }
 
 static void
 xbd_setup_sysctl(struct xbd_softc *xbd)
 {
 	struct sysctl_ctx_list *sysctl_ctx = NULL;
 	struct sysctl_oid *sysctl_tree = NULL;
 	struct sysctl_oid_list *children;
 
 	sysctl_ctx = device_get_sysctl_ctx(xbd->xbd_dev);
 	if (sysctl_ctx == NULL)
 		return;
 
 	sysctl_tree = device_get_sysctl_tree(xbd->xbd_dev);
 	if (sysctl_tree == NULL)
 		return;
 
 	children = SYSCTL_CHILDREN(sysctl_tree);
 	SYSCTL_ADD_UINT(sysctl_ctx, children, OID_AUTO,
 	    "max_requests", CTLFLAG_RD, &xbd->xbd_max_requests, -1,
 	    "maximum outstanding requests (negotiated)");
 
 	SYSCTL_ADD_UINT(sysctl_ctx, children, OID_AUTO,
 	    "max_request_segments", CTLFLAG_RD,
 	    &xbd->xbd_max_request_segments, 0,
 	    "maximum number of pages per requests (negotiated)");
 
 	SYSCTL_ADD_UINT(sysctl_ctx, children, OID_AUTO,
 	    "max_request_size", CTLFLAG_RD, &xbd->xbd_max_request_size, 0,
 	    "maximum size in bytes of a request (negotiated)");
 
 	SYSCTL_ADD_UINT(sysctl_ctx, children, OID_AUTO,
 	    "ring_pages", CTLFLAG_RD, &xbd->xbd_ring_pages, 0,
 	    "communication channel pages (negotiated)");
 
 	SYSCTL_ADD_PROC(sysctl_ctx, children, OID_AUTO,
 	    "features", CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, xbd,
 	    0, xbd_sysctl_features, "A", "protocol features (negotiated)");
 }
 
 /*
  * Translate Linux major/minor to an appropriate name and unit
  * number. For HVM guests, this allows us to use the same drive names
  * with blkfront as the emulated drives, easing transition slightly.
  */
 static void
 xbd_vdevice_to_unit(uint32_t vdevice, int *unit, const char **name)
 {
 	static struct vdev_info {
 		int major;
 		int shift;
 		int base;
 		const char *name;
 	} info[] = {
 		{3,	6,	0,	"ada"},	/* ide0 */
 		{22,	6,	2,	"ada"},	/* ide1 */
 		{33,	6,	4,	"ada"},	/* ide2 */
 		{34,	6,	6,	"ada"},	/* ide3 */
 		{56,	6,	8,	"ada"},	/* ide4 */
 		{57,	6,	10,	"ada"},	/* ide5 */
 		{88,	6,	12,	"ada"},	/* ide6 */
 		{89,	6,	14,	"ada"},	/* ide7 */
 		{90,	6,	16,	"ada"},	/* ide8 */
 		{91,	6,	18,	"ada"},	/* ide9 */
 
 		{8,	4,	0,	"da"},	/* scsi disk0 */
 		{65,	4,	16,	"da"},	/* scsi disk1 */
 		{66,	4,	32,	"da"},	/* scsi disk2 */
 		{67,	4,	48,	"da"},	/* scsi disk3 */
 		{68,	4,	64,	"da"},	/* scsi disk4 */
 		{69,	4,	80,	"da"},	/* scsi disk5 */
 		{70,	4,	96,	"da"},	/* scsi disk6 */
 		{71,	4,	112,	"da"},	/* scsi disk7 */
 		{128,	4,	128,	"da"},	/* scsi disk8 */
 		{129,	4,	144,	"da"},	/* scsi disk9 */
 		{130,	4,	160,	"da"},	/* scsi disk10 */
 		{131,	4,	176,	"da"},	/* scsi disk11 */
 		{132,	4,	192,	"da"},	/* scsi disk12 */
 		{133,	4,	208,	"da"},	/* scsi disk13 */
 		{134,	4,	224,	"da"},	/* scsi disk14 */
 		{135,	4,	240,	"da"},	/* scsi disk15 */
 
 		{202,	4,	0,	"xbd"},	/* xbd */
 
 		{0,	0,	0,	NULL},
 	};
 	int major = vdevice >> 8;
 	int minor = vdevice & 0xff;
 	int i;
 
 	if (vdevice & (1 << 28)) {
 		*unit = (vdevice & ((1 << 28) - 1)) >> 8;
 		*name = "xbd";
 		return;
 	}
 
 	for (i = 0; info[i].major; i++) {
 		if (info[i].major == major) {
 			*unit = info[i].base + (minor >> info[i].shift);
 			*name = info[i].name;
 			return;
 		}
 	}
 
 	*unit = minor >> 4;
 	*name = "xbd";
 }
 
 int
 xbd_instance_create(struct xbd_softc *sc, blkif_sector_t sectors,
     int vdevice, uint16_t vdisk_info, unsigned long sector_size,
     unsigned long phys_sector_size)
 {
 	char features[80];
 	int unit, error = 0;
 	const char *name;
 
 	xbd_vdevice_to_unit(vdevice, &unit, &name);
 
 	sc->xbd_unit = unit;
 
 	if (strcmp(name, "xbd") != 0)
 		device_printf(sc->xbd_dev, "attaching as %s%d\n", name, unit);
 
 	if (xbd_feature_string(sc, features, sizeof(features)) > 0) {
 		device_printf(sc->xbd_dev, "features: %s\n",
 		    features);
 	}
 
 	sc->xbd_disk = disk_alloc();
 	sc->xbd_disk->d_unit = sc->xbd_unit;
 	sc->xbd_disk->d_open = xbd_open;
 	sc->xbd_disk->d_close = xbd_close;
 	sc->xbd_disk->d_ioctl = xbd_ioctl;
 	sc->xbd_disk->d_strategy = xbd_strategy;
 	sc->xbd_disk->d_dump = xbd_dump;
 	sc->xbd_disk->d_name = name;
 	sc->xbd_disk->d_drv1 = sc;
 	sc->xbd_disk->d_sectorsize = sector_size;
 	sc->xbd_disk->d_stripesize = phys_sector_size;
 	sc->xbd_disk->d_stripeoffset = 0;
 
 	sc->xbd_disk->d_mediasize = sectors * sector_size;
 	sc->xbd_disk->d_maxsize = sc->xbd_max_request_size;
 	sc->xbd_disk->d_flags = DISKFLAG_UNMAPPED_BIO;
 	if ((sc->xbd_flags & (XBDF_FLUSH|XBDF_BARRIER)) != 0) {
 		sc->xbd_disk->d_flags |= DISKFLAG_CANFLUSHCACHE;
 		device_printf(sc->xbd_dev,
 		    "synchronize cache commands enabled.\n");
 	}
 	disk_create(sc->xbd_disk, DISK_VERSION);
 
 	return error;
 }
 
 static void 
 xbd_free(struct xbd_softc *sc)
 {
 	int i;
 
 	/* Prevent new requests being issued until we fix things up. */
 	mtx_lock(&sc->xbd_io_lock);
 	sc->xbd_state = XBD_STATE_DISCONNECTED; 
 	mtx_unlock(&sc->xbd_io_lock);
 
 	/* Free resources associated with old device channel. */
 	xbd_free_ring(sc);
 	if (sc->xbd_shadow) {
 		for (i = 0; i < sc->xbd_max_requests; i++) {
 			struct xbd_command *cm;
 
 			cm = &sc->xbd_shadow[i];
 			if (cm->cm_sg_refs != NULL) {
 				free(cm->cm_sg_refs, M_XENBLOCKFRONT);
 				cm->cm_sg_refs = NULL;
 			}
 
 			if (cm->cm_indirectionpages != NULL) {
 				gnttab_end_foreign_access_references(
 				    sc->xbd_max_request_indirectpages,
 				    &cm->cm_indirectionrefs[0]);
-				contigfree(cm->cm_indirectionpages, PAGE_SIZE *
-				    sc->xbd_max_request_indirectpages,
-				    M_XENBLOCKFRONT);
+				free(cm->cm_indirectionpages, M_XENBLOCKFRONT);
 				cm->cm_indirectionpages = NULL;
 			}
 
 			bus_dmamap_destroy(sc->xbd_io_dmat, cm->cm_map);
 		}
 		free(sc->xbd_shadow, M_XENBLOCKFRONT);
 		sc->xbd_shadow = NULL;
 
 		bus_dma_tag_destroy(sc->xbd_io_dmat);
 		
 		xbd_initq_cm(sc, XBD_Q_FREE);
 		xbd_initq_cm(sc, XBD_Q_READY);
 		xbd_initq_cm(sc, XBD_Q_COMPLETE);
 	}
 		
 	xen_intr_unbind(&sc->xen_intr_handle);
 
 }
 
 /*--------------------------- State Change Handlers --------------------------*/
 static void
 xbd_initialize(struct xbd_softc *sc)
 {
 	const char *otherend_path;
 	const char *node_path;
 	uint32_t max_ring_page_order;
 	int error;
 
 	if (xenbus_get_state(sc->xbd_dev) != XenbusStateInitialising) {
 		/* Initialization has already been performed. */
 		return;
 	}
 
 	/*
 	 * Protocol defaults valid even if negotiation for a
 	 * setting fails.
 	 */
 	max_ring_page_order = 0;
 	sc->xbd_ring_pages = 1;
 
 	/*
 	 * Protocol negotiation.
 	 *
 	 * \note xs_gather() returns on the first encountered error, so
 	 *       we must use independent calls in order to guarantee
 	 *       we don't miss information in a sparsly populated back-end
 	 *       tree.
 	 *
 	 * \note xs_scanf() does not update variables for unmatched
 	 *	 fields.
 	 */
 	otherend_path = xenbus_get_otherend_path(sc->xbd_dev);
 	node_path = xenbus_get_node(sc->xbd_dev);
 
 	/* Support both backend schemes for relaying ring page limits. */
 	(void)xs_scanf(XST_NIL, otherend_path,
 	    "max-ring-page-order", NULL, "%" PRIu32,
 	    &max_ring_page_order);
 	sc->xbd_ring_pages = 1 << max_ring_page_order;
 	(void)xs_scanf(XST_NIL, otherend_path,
 	    "max-ring-pages", NULL, "%" PRIu32,
 	    &sc->xbd_ring_pages);
 	if (sc->xbd_ring_pages < 1)
 		sc->xbd_ring_pages = 1;
 
 	if (sc->xbd_ring_pages > XBD_MAX_RING_PAGES) {
 		device_printf(sc->xbd_dev,
 		    "Back-end specified ring-pages of %u "
 		    "limited to front-end limit of %u.\n",
 		    sc->xbd_ring_pages, XBD_MAX_RING_PAGES);
 		sc->xbd_ring_pages = XBD_MAX_RING_PAGES;
 	}
 
 	if (powerof2(sc->xbd_ring_pages) == 0) {
 		uint32_t new_page_limit;
 
 		new_page_limit = 0x01 << (fls(sc->xbd_ring_pages) - 1);
 		device_printf(sc->xbd_dev,
 		    "Back-end specified ring-pages of %u "
 		    "is not a power of 2. Limited to %u.\n",
 		    sc->xbd_ring_pages, new_page_limit);
 		sc->xbd_ring_pages = new_page_limit;
 	}
 
 	sc->xbd_max_requests =
 	    BLKIF_MAX_RING_REQUESTS(sc->xbd_ring_pages * PAGE_SIZE);
 	if (sc->xbd_max_requests > XBD_MAX_REQUESTS) {
 		device_printf(sc->xbd_dev,
 		    "Back-end specified max_requests of %u "
 		    "limited to front-end limit of %zu.\n",
 		    sc->xbd_max_requests, XBD_MAX_REQUESTS);
 		sc->xbd_max_requests = XBD_MAX_REQUESTS;
 	}
 
 	if (xbd_alloc_ring(sc) != 0)
 		return;
 
 	/* Support both backend schemes for relaying ring page limits. */
 	if (sc->xbd_ring_pages > 1) {
 		error = xs_printf(XST_NIL, node_path,
 		    "num-ring-pages","%u",
 		    sc->xbd_ring_pages);
 		if (error) {
 			xenbus_dev_fatal(sc->xbd_dev, error,
 			    "writing %s/num-ring-pages",
 			    node_path);
 			return;
 		}
 
 		error = xs_printf(XST_NIL, node_path,
 		    "ring-page-order", "%u",
 		    fls(sc->xbd_ring_pages) - 1);
 		if (error) {
 			xenbus_dev_fatal(sc->xbd_dev, error,
 			    "writing %s/ring-page-order",
 			    node_path);
 			return;
 		}
 	}
 
 	error = xs_printf(XST_NIL, node_path, "event-channel",
 	    "%u", xen_intr_port(sc->xen_intr_handle));
 	if (error) {
 		xenbus_dev_fatal(sc->xbd_dev, error,
 		    "writing %s/event-channel",
 		    node_path);
 		return;
 	}
 
 	error = xs_printf(XST_NIL, node_path, "protocol",
 	    "%s", XEN_IO_PROTO_ABI_NATIVE);
 	if (error) {
 		xenbus_dev_fatal(sc->xbd_dev, error,
 		    "writing %s/protocol",
 		    node_path);
 		return;
 	}
 
 	xenbus_set_state(sc->xbd_dev, XenbusStateInitialised);
 }
 
 /* 
  * Invoked when the backend is finally 'ready' (and has published
  * the details about the physical device - #sectors, size, etc). 
  */
 static void 
 xbd_connect(struct xbd_softc *sc)
 {
 	device_t dev = sc->xbd_dev;
 	blkif_sector_t sectors;
 	unsigned long sector_size, phys_sector_size;
 	unsigned int binfo;
 	int err, feature_barrier, feature_flush;
 	int i, j;
 
 	DPRINTK("blkfront.c:connect:%s.\n", xenbus_get_otherend_path(dev));
 
 	if (sc->xbd_state == XBD_STATE_SUSPENDED) {
 		return;
 	}
 
 	if (sc->xbd_state == XBD_STATE_CONNECTED) {
 		struct disk *disk;
 
 		disk = sc->xbd_disk;
 		if (disk == NULL) {
 			return;
 		}
 		err = xs_gather(XST_NIL, xenbus_get_otherend_path(dev),
 		    "sectors", "%"PRIu64, &sectors, NULL);
 		if (err != 0) {
 			xenbus_dev_error(dev, err,
 			    "reading sectors at %s",
 			    xenbus_get_otherend_path(dev));
 			return;
 		}
 		disk->d_mediasize = disk->d_sectorsize * sectors;
 		err = disk_resize(disk, M_NOWAIT);
 		if (err) {
 			xenbus_dev_error(dev, err,
 			    "unable to resize disk %s%u",
 			    disk->d_name, disk->d_unit);
 			return;
 		}
 		device_printf(sc->xbd_dev,
 		    "changed capacity to %jd\n",
 		    (intmax_t)disk->d_mediasize);
 		return;
 	}
 
 	err = xs_gather(XST_NIL, xenbus_get_otherend_path(dev),
 	    "sectors", "%"PRIu64, &sectors,
 	    "info", "%u", &binfo,
 	    "sector-size", "%lu", &sector_size,
 	    NULL);
 	if (err) {
 		xenbus_dev_fatal(dev, err,
 		    "reading backend fields at %s",
 		    xenbus_get_otherend_path(dev));
 		return;
 	}
 	if ((sectors == 0) || (sector_size == 0)) {
 		xenbus_dev_fatal(dev, 0,
 		    "invalid parameters from %s:"
 		    " sectors = %"PRIu64", sector_size = %lu",
 		    xenbus_get_otherend_path(dev),
 		    sectors, sector_size);
 		return;
 	}
 	err = xs_gather(XST_NIL, xenbus_get_otherend_path(dev),
 	     "physical-sector-size", "%lu", &phys_sector_size,
 	     NULL);
 	if (err || phys_sector_size <= sector_size)
 		phys_sector_size = 0;
 	err = xs_gather(XST_NIL, xenbus_get_otherend_path(dev),
 	     "feature-barrier", "%d", &feature_barrier,
 	     NULL);
 	if (err == 0 && feature_barrier != 0)
 		sc->xbd_flags |= XBDF_BARRIER;
 
 	err = xs_gather(XST_NIL, xenbus_get_otherend_path(dev),
 	     "feature-flush-cache", "%d", &feature_flush,
 	     NULL);
 	if (err == 0 && feature_flush != 0)
 		sc->xbd_flags |= XBDF_FLUSH;
 
 	err = xs_gather(XST_NIL, xenbus_get_otherend_path(dev),
 	    "feature-max-indirect-segments", "%" PRIu32,
 	    &sc->xbd_max_request_segments, NULL);
 	if ((err != 0) || (xbd_enable_indirect == 0))
 		sc->xbd_max_request_segments = 0;
 	if (sc->xbd_max_request_segments > XBD_MAX_INDIRECT_SEGMENTS)
 		sc->xbd_max_request_segments = XBD_MAX_INDIRECT_SEGMENTS;
 	if (sc->xbd_max_request_segments > XBD_SIZE_TO_SEGS(maxphys))
 		sc->xbd_max_request_segments = XBD_SIZE_TO_SEGS(maxphys);
 	sc->xbd_max_request_indirectpages =
 	    XBD_INDIRECT_SEGS_TO_PAGES(sc->xbd_max_request_segments);
 	if (sc->xbd_max_request_segments < BLKIF_MAX_SEGMENTS_PER_REQUEST)
 		sc->xbd_max_request_segments = BLKIF_MAX_SEGMENTS_PER_REQUEST;
 	sc->xbd_max_request_size =
 	    XBD_SEGS_TO_SIZE(sc->xbd_max_request_segments);
 
 	/* Allocate datastructures based on negotiated values. */
 	err = bus_dma_tag_create(
 	    bus_get_dma_tag(sc->xbd_dev),	/* parent */
 	    512, PAGE_SIZE,			/* algnmnt, boundary */
 	    BUS_SPACE_MAXADDR,			/* lowaddr */
 	    BUS_SPACE_MAXADDR,			/* highaddr */
 	    NULL, NULL,				/* filter, filterarg */
 	    sc->xbd_max_request_size,
 	    sc->xbd_max_request_segments,
 	    PAGE_SIZE,				/* maxsegsize */
 	    BUS_DMA_ALLOCNOW,			/* flags */
 	    busdma_lock_mutex,			/* lockfunc */
 	    &sc->xbd_io_lock,			/* lockarg */
 	    &sc->xbd_io_dmat);
 	if (err != 0) {
 		xenbus_dev_fatal(sc->xbd_dev, err,
 		    "Cannot allocate parent DMA tag\n");
 		return;
 	}
 
 	/* Per-transaction data allocation. */
 	sc->xbd_shadow = malloc(sizeof(*sc->xbd_shadow) * sc->xbd_max_requests,
 	    M_XENBLOCKFRONT, M_NOWAIT|M_ZERO);
 	if (sc->xbd_shadow == NULL) {
 		bus_dma_tag_destroy(sc->xbd_io_dmat);
 		xenbus_dev_fatal(sc->xbd_dev, ENOMEM,
 		    "Cannot allocate request structures\n");
 		return;
 	}
 
 	for (i = 0; i < sc->xbd_max_requests; i++) {
 		struct xbd_command *cm;
 		void * indirectpages;
 
 		cm = &sc->xbd_shadow[i];
 		cm->cm_sg_refs = malloc(
 		    sizeof(grant_ref_t) * sc->xbd_max_request_segments,
 		    M_XENBLOCKFRONT, M_NOWAIT);
 		if (cm->cm_sg_refs == NULL)
 			break;
 		cm->cm_id = i;
 		cm->cm_flags = XBDCF_INITIALIZER;
 		cm->cm_sc = sc;
 		if (bus_dmamap_create(sc->xbd_io_dmat, 0, &cm->cm_map) != 0)
 			break;
 		if (sc->xbd_max_request_indirectpages > 0) {
 			indirectpages = contigmalloc(
 			    PAGE_SIZE * sc->xbd_max_request_indirectpages,
 			    M_XENBLOCKFRONT, M_ZERO | M_NOWAIT, 0, ~0,
 			    PAGE_SIZE, 0);
 			if (indirectpages == NULL)
 				sc->xbd_max_request_indirectpages = 0;
 		} else {
 			indirectpages = NULL;
 		}
 		for (j = 0; j < sc->xbd_max_request_indirectpages; j++) {
 			if (gnttab_grant_foreign_access(
 			    xenbus_get_otherend_id(sc->xbd_dev),
 			    (vtophys(indirectpages) >> PAGE_SHIFT) + j,
 			    1 /* grant read-only access */,
 			    &cm->cm_indirectionrefs[j]))
 				break;
 		}
 		if (j < sc->xbd_max_request_indirectpages) {
-			contigfree(indirectpages,
-			    PAGE_SIZE * sc->xbd_max_request_indirectpages,
-			    M_XENBLOCKFRONT);
+			free(indirectpages, M_XENBLOCKFRONT);
 			break;
 		}
 		cm->cm_indirectionpages = indirectpages;
 		xbd_free_command(cm);
 	}
 
 	if (sc->xbd_disk == NULL) {
 		device_printf(dev, "%juMB <%s> at %s",
 		    (uintmax_t) sectors / (1048576 / sector_size),
 		    device_get_desc(dev),
 		    xenbus_get_node(dev));
 		bus_print_child_footer(device_get_parent(dev), dev);
 
 		xbd_instance_create(sc, sectors, sc->xbd_vdevice, binfo,
 		    sector_size, phys_sector_size);
 	}
 
 	(void)xenbus_set_state(dev, XenbusStateConnected); 
 
 	/* Kick pending requests. */
 	mtx_lock(&sc->xbd_io_lock);
 	sc->xbd_state = XBD_STATE_CONNECTED;
 	xbd_startio(sc);
 	sc->xbd_flags |= XBDF_READY;
 	mtx_unlock(&sc->xbd_io_lock);
 }
 
 /**
  * Handle the change of state of the backend to Closing.  We must delete our
  * device-layer structures now, to ensure that writes are flushed through to
  * the backend.  Once this is done, we can switch to Closed in
  * acknowledgement.
  */
 static void
 xbd_closing(device_t dev)
 {
 	struct xbd_softc *sc = device_get_softc(dev);
 
 	xenbus_set_state(dev, XenbusStateClosing);
 
 	DPRINTK("xbd_closing: %s removed\n", xenbus_get_node(dev));
 
 	if (sc->xbd_disk != NULL) {
 		disk_destroy(sc->xbd_disk);
 		sc->xbd_disk = NULL;
 	}
 
 	xenbus_set_state(dev, XenbusStateClosed); 
 }
 
 /*---------------------------- NewBus Entrypoints ----------------------------*/
 static int
 xbd_probe(device_t dev)
 {
 	if (strcmp(xenbus_get_type(dev), "vbd") != 0)
 		return (ENXIO);
 
 	if (xen_pv_disks_disabled())
 		return (ENXIO);
 
 	if (xen_hvm_domain()) {
 		int error;
 		char *type;
 
 		/*
 		 * When running in an HVM domain, IDE disk emulation is
 		 * disabled early in boot so that native drivers will
 		 * not see emulated hardware.  However, CDROM device
 		 * emulation cannot be disabled.
 		 *
 		 * Through use of FreeBSD's vm_guest and xen_hvm_domain()
 		 * APIs, we could modify the native CDROM driver to fail its
 		 * probe when running under Xen.  Unfortunatlely, the PV
 		 * CDROM support in XenServer (up through at least version
 		 * 6.2) isn't functional, so we instead rely on the emulated
 		 * CDROM instance, and fail to attach the PV one here in
 		 * the blkfront driver.
 		 */
 		error = xs_read(XST_NIL, xenbus_get_node(dev),
 		    "device-type", NULL, (void **) &type);
 		if (error)
 			return (ENXIO);
 
 		if (strncmp(type, "cdrom", 5) == 0) {
 			free(type, M_XENSTORE);
 			return (ENXIO);
 		}
 		free(type, M_XENSTORE);
 	}
 
 	device_set_desc(dev, "Virtual Block Device");
 	device_quiet(dev);
 	return (0);
 }
 
 /*
  * Setup supplies the backend dir, virtual device.  We place an event
  * channel and shared frame entries.  We watch backend to wait if it's
  * ok.
  */
 static int
 xbd_attach(device_t dev)
 {
 	struct xbd_softc *sc;
 	const char *name;
 	uint32_t vdevice;
 	int error;
 	int i;
 	int unit;
 
 	/* FIXME: Use dynamic device id if this is not set. */
 	error = xs_scanf(XST_NIL, xenbus_get_node(dev),
 	    "virtual-device", NULL, "%" PRIu32, &vdevice);
 	if (error)
 		error = xs_scanf(XST_NIL, xenbus_get_node(dev),
 		    "virtual-device-ext", NULL, "%" PRIu32, &vdevice);
 	if (error) {
 		xenbus_dev_fatal(dev, error, "reading virtual-device");
 		device_printf(dev, "Couldn't determine virtual device.\n");
 		return (error);
 	}
 
 	xbd_vdevice_to_unit(vdevice, &unit, &name);
 	if (!strcmp(name, "xbd"))
 		device_set_unit(dev, unit);
 
 	sc = device_get_softc(dev);
 	mtx_init(&sc->xbd_io_lock, "blkfront i/o lock", NULL, MTX_DEF);
 	xbd_initqs(sc);
 	for (i = 0; i < XBD_MAX_RING_PAGES; i++)
 		sc->xbd_ring_ref[i] = GRANT_REF_INVALID;
 
 	sc->xbd_dev = dev;
 	sc->xbd_vdevice = vdevice;
 	sc->xbd_state = XBD_STATE_DISCONNECTED;
 
 	xbd_setup_sysctl(sc);
 
 	/* Wait for backend device to publish its protocol capabilities. */
 	xenbus_set_state(dev, XenbusStateInitialising);
 
 	return (0);
 }
 
 static int
 xbd_detach(device_t dev)
 {
 	struct xbd_softc *sc = device_get_softc(dev);
 
 	DPRINTK("%s: %s removed\n", __func__, xenbus_get_node(dev));
 
 	xbd_free(sc);
 	mtx_destroy(&sc->xbd_io_lock);
 
 	return 0;
 }
 
 static int
 xbd_suspend(device_t dev)
 {
 	struct xbd_softc *sc = device_get_softc(dev);
 	int retval;
 	int saved_state;
 
 	/* Prevent new requests being issued until we fix things up. */
 	mtx_lock(&sc->xbd_io_lock);
 	saved_state = sc->xbd_state;
 	sc->xbd_state = XBD_STATE_SUSPENDED;
 
 	/* Wait for outstanding I/O to drain. */
 	retval = 0;
 	while (xbd_queue_length(sc, XBD_Q_BUSY) != 0) {
 		if (msleep(&sc->xbd_cm_q[XBD_Q_BUSY], &sc->xbd_io_lock,
 		    PRIBIO, "blkf_susp", 30 * hz) == EWOULDBLOCK) {
 			retval = EBUSY;
 			break;
 		}
 	}
 	mtx_unlock(&sc->xbd_io_lock);
 
 	if (retval != 0)
 		sc->xbd_state = saved_state;
 
 	return (retval);
 }
 
 static int
 xbd_resume(device_t dev)
 {
 	struct xbd_softc *sc = device_get_softc(dev);
 
 	if (xen_suspend_cancelled) {
 		sc->xbd_state = XBD_STATE_CONNECTED;
 		return (0);
 	}
 
 	DPRINTK("xbd_resume: %s\n", xenbus_get_node(dev));
 
 	xbd_free(sc);
 	xbd_initialize(sc);
 	return (0);
 }
 
 /**
  * Callback received when the backend's state changes.
  */
 static void
 xbd_backend_changed(device_t dev, XenbusState backend_state)
 {
 	struct xbd_softc *sc = device_get_softc(dev);
 
 	DPRINTK("backend_state=%d\n", backend_state);
 
 	switch (backend_state) {
 	case XenbusStateUnknown:
 	case XenbusStateInitialising:
 	case XenbusStateReconfigured:
 	case XenbusStateReconfiguring:
 	case XenbusStateClosed:
 		break;
 
 	case XenbusStateInitWait:
 	case XenbusStateInitialised:
 		xbd_initialize(sc);
 		break;
 
 	case XenbusStateConnected:
 		xbd_initialize(sc);
 		xbd_connect(sc);
 		break;
 
 	case XenbusStateClosing:
 		if (sc->xbd_users > 0) {
 			device_printf(dev, "detaching with pending users\n");
 			KASSERT(sc->xbd_disk != NULL,
 			    ("NULL disk with pending users\n"));
 			disk_gone(sc->xbd_disk);
 		} else {
 			xbd_closing(dev);
 		}
 		break;	
 	}
 }
 
 /*---------------------------- NewBus Registration ---------------------------*/
 static device_method_t xbd_methods[] = { 
 	/* Device interface */ 
 	DEVMETHOD(device_probe,         xbd_probe), 
 	DEVMETHOD(device_attach,        xbd_attach), 
 	DEVMETHOD(device_detach,        xbd_detach), 
 	DEVMETHOD(device_shutdown,      bus_generic_shutdown), 
 	DEVMETHOD(device_suspend,       xbd_suspend), 
 	DEVMETHOD(device_resume,        xbd_resume), 
 
 	/* Xenbus interface */
 	DEVMETHOD(xenbus_otherend_changed, xbd_backend_changed),
 
 	DEVMETHOD_END
 }; 
 
 static driver_t xbd_driver = { 
 	"xbd", 
 	xbd_methods, 
 	sizeof(struct xbd_softc),                      
 }; 
 
 DRIVER_MODULE(xbd, xenbusb_front, xbd_driver, 0, 0); 
diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c
index 472cc5c2fad3..2d60d5e037a0 100644
--- a/sys/i386/acpica/acpi_wakeup.c
+++ b/sys/i386/acpica/acpi_wakeup.c
@@ -1,388 +1,387 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2001 Takanori Watanabe <takawata@jp.freebsd.org>
  * Copyright (c) 2001-2012 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
  * Copyright (c) 2003 Peter Wemm
  * Copyright (c) 2008-2012 Jung-uk Kim <jkim@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 AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 #include "opt_apic.h"
 
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 #include <sys/smp.h>
 #include <sys/systm.h>
 #include <sys/cons.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
 #include <x86/mca.h>
 #include <machine/pcb.h>
 #include <machine/specialreg.h>
 #include <x86/ucode.h>
 
 #ifdef DEV_APIC
 #include <x86/apicreg.h>
 #include <x86/apicvar.h>
 #endif
 #ifdef SMP
 #include <machine/smp.h>
 #include <machine/vmparam.h>
 #endif
 
 #include <contrib/dev/acpica/include/acpi.h>
 
 #include <dev/acpica/acpivar.h>
 
 #include "acpi_wakecode.h"
 #include "acpi_wakedata.h"
 
 /* Make sure the code is less than a page and leave room for the stack. */
 CTASSERT(sizeof(wakecode) < PAGE_SIZE - 1024);
 
 extern int		acpi_resume_beep;
 extern int		acpi_reset_video;
 extern int		acpi_susp_bounce;
 
 #ifdef SMP
 extern struct susppcb	**susppcbs;
 static cpuset_t		suspcpus;
 #else
 static struct susppcb	**susppcbs;
 #endif
 
 static void		acpi_stop_beep(void *);
 
 #ifdef SMP
 static int		acpi_wakeup_ap(struct acpi_softc *, int);
 static void		acpi_wakeup_cpus(struct acpi_softc *);
 #endif
 
 #define	ACPI_WAKEPAGES	1
 
 #define	WAKECODE_FIXUP(offset, type, val)	do {	\
 	type	*addr;					\
 	addr = (type *)(sc->acpi_wakeaddr + (offset));	\
 	*addr = val;					\
 } while (0)
 
 static void
 acpi_stop_beep(void *arg)
 {
 
 	if (acpi_resume_beep != 0)
 		timer_spkr_release();
 }
 
 #ifdef SMP
 static int
 acpi_wakeup_ap(struct acpi_softc *sc, int cpu)
 {
 	struct pcb *pcb;
 	int		vector = (sc->acpi_wakephys >> 12) & 0xff;
 	int		apic_id = cpu_apic_ids[cpu];
 	int		ms;
 
 	pcb = &susppcbs[cpu]->sp_pcb;
 	WAKECODE_FIXUP(wakeup_pcb, struct pcb *, pcb);
 	WAKECODE_FIXUP(wakeup_gdt, uint16_t, pcb->pcb_gdt.rd_limit);
 	WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, pcb->pcb_gdt.rd_base);
 
 	ipi_startup(apic_id, vector);
 
 	/* Wait up to 5 seconds for it to resume. */
 	for (ms = 0; ms < 5000; ms++) {
 		if (!CPU_ISSET(cpu, &suspended_cpus))
 			return (1);	/* return SUCCESS */
 		DELAY(1000);
 	}
 	return (0);		/* return FAILURE */
 }
 
 #define	WARMBOOT_TARGET		0
 #define	WARMBOOT_OFF		(PMAP_MAP_LOW + 0x0467)
 #define	WARMBOOT_SEG		(PMAP_MAP_LOW + 0x0469)
 
 #define	CMOS_REG		(0x70)
 #define	CMOS_DATA		(0x71)
 #define	BIOS_RESET		(0x0f)
 #define	BIOS_WARM		(0x0a)
 
 static void
 acpi_wakeup_cpus(struct acpi_softc *sc)
 {
 	uint32_t	mpbioswarmvec;
 	int		cpu;
 	u_char		mpbiosreason;
 
 	/* save the current value of the warm-start vector */
 	mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF);
 	outb(CMOS_REG, BIOS_RESET);
 	mpbiosreason = inb(CMOS_DATA);
 
 	/* setup a vector to our boot code */
 	*((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET;
 	*((volatile u_short *)WARMBOOT_SEG) = sc->acpi_wakephys >> 4;
 	outb(CMOS_REG, BIOS_RESET);
 	outb(CMOS_DATA, BIOS_WARM);	/* 'warm-start' */
 
 	/* Wake up each AP. */
 	for (cpu = 1; cpu < mp_ncpus; cpu++) {
 		if (!CPU_ISSET(cpu, &suspcpus))
 			continue;
 		if (acpi_wakeup_ap(sc, cpu) == 0) {
 			/* restore the warmstart vector */
 			*(uint32_t *)WARMBOOT_OFF = mpbioswarmvec;
 			panic("acpi_wakeup: failed to resume AP #%d (PHY #%d)",
 			    cpu, cpu_apic_ids[cpu]);
 		}
 	}
 
 	/*
 	 * Remove the identity mapping of low memory for all CPUs and sync
 	 * the TLB for the BSP.  The APs are now spinning in
 	 * cpususpend_handler() and we will release them soon.  Then each
 	 * will invalidate its TLB.
 	 */
 	pmap_remap_lowptdi(false);
 
 	/* restore the warmstart vector */
 	*(uint32_t *)WARMBOOT_OFF = mpbioswarmvec;
 
 	outb(CMOS_REG, BIOS_RESET);
 	outb(CMOS_DATA, mpbiosreason);
 }
 #endif
 
 int
 acpi_sleep_machdep(struct acpi_softc *sc, int state)
 {
 	ACPI_STATUS	status;
 	struct pcb	*pcb;
 
 	if (sc->acpi_wakeaddr == 0ul)
 		return (-1);	/* couldn't alloc wake memory */
 
 #ifdef SMP
 	suspcpus = all_cpus;
 	CPU_CLR(PCPU_GET(cpuid), &suspcpus);
 #endif
 
 	if (acpi_resume_beep != 0)
 		timer_spkr_acquire();
 
 	AcpiSetFirmwareWakingVector(sc->acpi_wakephys, 0);
 
 	intr_suspend();
 
 	pcb = &susppcbs[0]->sp_pcb;
 	if (savectx(pcb)) {
 		npxsuspend(susppcbs[0]->sp_fpususpend);
 #ifdef SMP
 		if (!CPU_EMPTY(&suspcpus) && suspend_cpus(suspcpus) == 0) {
 			device_printf(sc->acpi_dev, "Failed to suspend APs\n");
 			return (0);	/* couldn't sleep */
 		}
 #endif
 
 		WAKECODE_FIXUP(resume_beep, uint8_t, (acpi_resume_beep != 0));
 		WAKECODE_FIXUP(reset_video, uint8_t, (acpi_reset_video != 0));
 
 		if ((amd_feature & AMDID_NX) != 0)
 			WAKECODE_FIXUP(wakeup_efer, uint64_t, rdmsr(MSR_EFER));
 		WAKECODE_FIXUP(wakeup_cr4, register_t, pcb->pcb_cr4);
 		WAKECODE_FIXUP(wakeup_pcb, struct pcb *, pcb);
 		WAKECODE_FIXUP(wakeup_gdt, uint16_t, pcb->pcb_gdt.rd_limit);
 		WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, pcb->pcb_gdt.rd_base);
 
 		/*
 		 * Map some low memory with virt == phys for ACPI wakecode
 		 * to use to jump to high memory after enabling paging. This
 		 * is the same as for similar jump in locore, except the
 		 * jump is a single instruction, and we know its address
 		 * more precisely so only need a single PTD, and we have to
 		 * be careful to use the kernel map (PTD[0] is for curthread
 		 * which may be a user thread in deprecated APIs).
 		 */
 		pmap_remap_lowptdi(true);
 
 		/* Call ACPICA to enter the desired sleep state */
 		if (state == ACPI_STATE_S4 && sc->acpi_s4bios)
 			status = AcpiEnterSleepStateS4bios();
 		else
 			status = AcpiEnterSleepState(state);
 		if (ACPI_FAILURE(status)) {
 			device_printf(sc->acpi_dev,
 			    "AcpiEnterSleepState failed - %s\n",
 			    AcpiFormatException(status));
 			return (0);	/* couldn't sleep */
 		}
 
 		if (acpi_susp_bounce)
 			resumectx(pcb);
 
 		for (;;)
 			ia32_pause();
 	} else {
 		/*
 		 * Re-initialize console hardware as soon as possibe.
 		 * No console output (e.g. printf) is allowed before
 		 * this point.
 		 */
 		cnresume();
 		npxresume(susppcbs[0]->sp_fpususpend);
 	}
 
 	return (1);	/* wakeup successfully */
 }
 
 int
 acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result,
     int intr_enabled)
 {
 
 	if (sleep_result == -1)
 		return (sleep_result);
 
 	if (!intr_enabled) {
 		/* Wakeup MD procedures in interrupt disabled context */
 		if (sleep_result == 1) {
 			ucode_reload();
 			pmap_init_pat();
 			initializecpu();
 			PCPU_SET(switchtime, 0);
 			PCPU_SET(switchticks, ticks);
 #ifdef DEV_APIC
 			lapic_xapic_mode();
 #endif
 #ifdef SMP
 			if (!CPU_EMPTY(&suspcpus))
 				acpi_wakeup_cpus(sc);
 #endif
 		}
 
 #ifdef SMP
 		if (!CPU_EMPTY(&suspcpus))
 			resume_cpus(suspcpus);
 #endif
 		mca_resume();
 		intr_resume(/*suspend_cancelled*/false);
 
 		AcpiSetFirmwareWakingVector(0, 0);
 	} else {
 		/* Wakeup MD procedures in interrupt enabled context */
 		if (sleep_result == 1 && mem_range_softc.mr_op != NULL &&
 		    mem_range_softc.mr_op->reinit != NULL)
 			mem_range_softc.mr_op->reinit(&mem_range_softc);
 	}
 
 	return (sleep_result);
 }
 
 static void *
 acpi_alloc_wakeup_handler(void *wakepages[ACPI_WAKEPAGES])
 {
 	int		i;
 
 	memset(wakepages, 0, ACPI_WAKEPAGES * sizeof(*wakepages));
 
 	/*
 	 * Specify the region for our wakeup code.  We want it in the low 1 MB
 	 * region, excluding real mode IVT (0-0x3ff), BDA (0x400-0x4ff), EBDA
 	 * (less than 128KB, below 0xa0000, must be excluded by SMAP and DSDT),
 	 * and ROM area (0xa0000 and above).  The temporary page tables must be
 	 * page-aligned.
 	 */
 	for (i = 0; i < ACPI_WAKEPAGES; i++) {
 		wakepages[i] = contigmalloc(PAGE_SIZE, M_DEVBUF,
 		    M_NOWAIT | M_EXEC, 0x500, 0xa0000, PAGE_SIZE, 0ul);
 		if (wakepages[i] == NULL) {
 			printf("%s: can't alloc wake memory\n", __func__);
 			goto freepages;
 		}
 	}
 	if (EVENTHANDLER_REGISTER(power_resume, acpi_stop_beep, NULL,
 	    EVENTHANDLER_PRI_LAST) == NULL) {
 		printf("%s: can't register event handler\n", __func__);
 		goto freepages;
 	}
 	susppcbs = malloc(mp_ncpus * sizeof(*susppcbs), M_DEVBUF, M_WAITOK);
 	for (i = 0; i < mp_ncpus; i++) {
 		susppcbs[i] = malloc(sizeof(**susppcbs), M_DEVBUF, M_WAITOK);
 		susppcbs[i]->sp_fpususpend = alloc_fpusave(M_WAITOK);
 	}
 
 	return (wakepages);
 
 freepages:
 	for (i = 0; i < ACPI_WAKEPAGES; i++)
-		if (wakepages[i] != NULL)
-			contigfree(wakepages[i], PAGE_SIZE, M_DEVBUF);
+		free(wakepages[i], M_DEVBUF);
 	return (NULL);
 }
 
 void
 acpi_install_wakeup_handler(struct acpi_softc *sc)
 {
 	static void *wakeaddr;
 	void *wakepages[ACPI_WAKEPAGES];
 
 	if (wakeaddr != NULL)
 		return;
 
 	if (acpi_alloc_wakeup_handler(wakepages) == NULL)
 		return;
 
 	wakeaddr = wakepages[0];
 	sc->acpi_wakeaddr = (vm_offset_t)wakeaddr;
 	sc->acpi_wakephys = vtophys(wakeaddr);
 
 	bcopy(wakecode, (void *)sc->acpi_wakeaddr, sizeof(wakecode));
 
 	/* Patch GDT base address, ljmp targets. */
 	WAKECODE_FIXUP((bootgdtdesc + 2), uint32_t,
 	    sc->acpi_wakephys + bootgdt);
 	WAKECODE_FIXUP((wakeup_sw32 + 2), uint32_t,
 	    sc->acpi_wakephys + wakeup_32);
 
 	/* Save pointers to some global data. */
 	WAKECODE_FIXUP(wakeup_ret, void *, resumectx);
 	WAKECODE_FIXUP(wakeup_cr3, register_t, pmap_get_kcr3());
 
 	if (bootverbose)
 		device_printf(sc->acpi_dev, "wakeup code va %#jx pa %#jx\n",
 		    (uintmax_t)sc->acpi_wakeaddr, (uintmax_t)sc->acpi_wakephys);
 }
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 4d07581e6a5b..37684e26b451 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -1,1646 +1,1640 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (c) 1987, 1991, 1993
  *	The Regents of the University of California.
  * Copyright (c) 2005-2009 Robert N. M. Watson
  * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> (mallocarray)
  * 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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 /*
  * Kernel malloc(9) implementation -- general purpose kernel memory allocator
  * based on memory types.  Back end is implemented using the UMA(9) zone
  * allocator.  A set of fixed-size buckets are used for smaller allocations,
  * and a special UMA allocation interface is used for larger allocations.
  * Callers declare memory types, and statistics are maintained independently
  * for each memory type.  Statistics are maintained per-CPU for performance
  * reasons.  See malloc(9) and comments in malloc.h for a detailed
  * description.
  */
 
 #include <sys/cdefs.h>
 #include "opt_ddb.h"
 #include "opt_vm.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/asan.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/msan.h>
 #include <sys/mutex.h>
 #include <sys/vmmeter.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/sbuf.h>
 #include <sys/smp.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/vmem.h>
 #ifdef EPOCH_TRACE
 #include <sys/epoch.h>
 #endif
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_domainset.h>
 #include <vm/vm_pageout.h>
 #include <vm/vm_param.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
 #include <vm/vm_phys.h>
 #include <vm/vm_pagequeue.h>
 #include <vm/uma.h>
 #include <vm/uma_int.h>
 #include <vm/uma_dbg.h>
 
 #ifdef DEBUG_MEMGUARD
 #include <vm/memguard.h>
 #endif
 #ifdef DEBUG_REDZONE
 #include <vm/redzone.h>
 #endif
 
 #if defined(INVARIANTS) && defined(__i386__)
 #include <machine/cpu.h>
 #endif
 
 #include <ddb/ddb.h>
 
 #ifdef KDTRACE_HOOKS
 #include <sys/dtrace_bsd.h>
 
 bool	__read_frequently			dtrace_malloc_enabled;
 dtrace_malloc_probe_func_t __read_mostly	dtrace_malloc_probe;
 #endif
 
 #if defined(INVARIANTS) || defined(MALLOC_MAKE_FAILURES) ||		\
     defined(DEBUG_MEMGUARD) || defined(DEBUG_REDZONE)
 #define	MALLOC_DEBUG	1
 #endif
 
 #if defined(KASAN) || defined(DEBUG_REDZONE)
 #define	DEBUG_REDZONE_ARG_DEF	, unsigned long osize
 #define	DEBUG_REDZONE_ARG	, osize
 #else
 #define	DEBUG_REDZONE_ARG_DEF
 #define	DEBUG_REDZONE_ARG
 #endif
 
 typedef	enum {
 	SLAB_COOKIE_SLAB_PTR		= 0x0,
 	SLAB_COOKIE_MALLOC_LARGE	= 0x1,
 	SLAB_COOKIE_CONTIG_MALLOC	= 0x2,
 } slab_cookie_t;
 #define	SLAB_COOKIE_MASK		0x3
 #define	SLAB_COOKIE_SHIFT		2
 #define	GET_SLAB_COOKIE(_slab)						\
     ((slab_cookie_t)(uintptr_t)(_slab) & SLAB_COOKIE_MASK)
 
 /*
  * When realloc() is called, if the new size is sufficiently smaller than
  * the old size, realloc() will allocate a new, smaller block to avoid
  * wasting memory. 'Sufficiently smaller' is defined as: newsize <=
  * oldsize / 2^n, where REALLOC_FRACTION defines the value of 'n'.
  */
 #ifndef REALLOC_FRACTION
 #define	REALLOC_FRACTION	1	/* new block if <= half the size */
 #endif
 
 /*
  * Centrally define some common malloc types.
  */
 MALLOC_DEFINE(M_CACHE, "cache", "Various Dynamically allocated caches");
 MALLOC_DEFINE(M_DEVBUF, "devbuf", "device driver memory");
 MALLOC_DEFINE(M_TEMP, "temp", "misc temporary data buffers");
 
 static struct malloc_type *kmemstatistics;
 static int kmemcount;
 
 #define KMEM_ZSHIFT	4
 #define KMEM_ZBASE	16
 #define KMEM_ZMASK	(KMEM_ZBASE - 1)
 
 #define KMEM_ZMAX	65536
 #define KMEM_ZSIZE	(KMEM_ZMAX >> KMEM_ZSHIFT)
 static uint8_t kmemsize[KMEM_ZSIZE + 1];
 
 #ifndef MALLOC_DEBUG_MAXZONES
 #define	MALLOC_DEBUG_MAXZONES	1
 #endif
 static int numzones = MALLOC_DEBUG_MAXZONES;
 
 /*
  * Small malloc(9) memory allocations are allocated from a set of UMA buckets
  * of various sizes.
  *
  * Warning: the layout of the struct is duplicated in libmemstat for KVM support.
  *
  * XXX: The comment here used to read "These won't be powers of two for
  * long."  It's possible that a significant amount of wasted memory could be
  * recovered by tuning the sizes of these buckets.
  */
 struct {
 	int kz_size;
 	const char *kz_name;
 	uma_zone_t kz_zone[MALLOC_DEBUG_MAXZONES];
 } kmemzones[] = {
 	{16, "malloc-16", },
 	{32, "malloc-32", },
 	{64, "malloc-64", },
 	{128, "malloc-128", },
 	{256, "malloc-256", },
 	{384, "malloc-384", },
 	{512, "malloc-512", },
 	{1024, "malloc-1024", },
 	{2048, "malloc-2048", },
 	{4096, "malloc-4096", },
 	{8192, "malloc-8192", },
 	{16384, "malloc-16384", },
 	{32768, "malloc-32768", },
 	{65536, "malloc-65536", },
 	{0, NULL},
 };
 
 u_long vm_kmem_size;
 SYSCTL_ULONG(_vm, OID_AUTO, kmem_size, CTLFLAG_RDTUN, &vm_kmem_size, 0,
     "Size of kernel memory");
 
 static u_long kmem_zmax = KMEM_ZMAX;
 SYSCTL_ULONG(_vm, OID_AUTO, kmem_zmax, CTLFLAG_RDTUN, &kmem_zmax, 0,
     "Maximum allocation size that malloc(9) would use UMA as backend");
 
 static u_long vm_kmem_size_min;
 SYSCTL_ULONG(_vm, OID_AUTO, kmem_size_min, CTLFLAG_RDTUN, &vm_kmem_size_min, 0,
     "Minimum size of kernel memory");
 
 static u_long vm_kmem_size_max;
 SYSCTL_ULONG(_vm, OID_AUTO, kmem_size_max, CTLFLAG_RDTUN, &vm_kmem_size_max, 0,
     "Maximum size of kernel memory");
 
 static u_int vm_kmem_size_scale;
 SYSCTL_UINT(_vm, OID_AUTO, kmem_size_scale, CTLFLAG_RDTUN, &vm_kmem_size_scale, 0,
     "Scale factor for kernel memory size");
 
 static int sysctl_kmem_map_size(SYSCTL_HANDLER_ARGS);
 SYSCTL_PROC(_vm, OID_AUTO, kmem_map_size,
     CTLFLAG_RD | CTLTYPE_ULONG | CTLFLAG_MPSAFE, NULL, 0,
     sysctl_kmem_map_size, "LU", "Current kmem allocation size");
 
 static int sysctl_kmem_map_free(SYSCTL_HANDLER_ARGS);
 SYSCTL_PROC(_vm, OID_AUTO, kmem_map_free,
     CTLFLAG_RD | CTLTYPE_ULONG | CTLFLAG_MPSAFE, NULL, 0,
     sysctl_kmem_map_free, "LU", "Free space in kmem");
 
 static SYSCTL_NODE(_vm, OID_AUTO, malloc, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
     "Malloc information");
 
 static u_int vm_malloc_zone_count = nitems(kmemzones);
 SYSCTL_UINT(_vm_malloc, OID_AUTO, zone_count,
     CTLFLAG_RD, &vm_malloc_zone_count, 0,
     "Number of malloc zones");
 
 static int sysctl_vm_malloc_zone_sizes(SYSCTL_HANDLER_ARGS);
 SYSCTL_PROC(_vm_malloc, OID_AUTO, zone_sizes,
     CTLFLAG_RD | CTLTYPE_OPAQUE | CTLFLAG_MPSAFE, NULL, 0,
     sysctl_vm_malloc_zone_sizes, "S", "Zone sizes used by malloc");
 
 /*
  * The malloc_mtx protects the kmemstatistics linked list.
  */
 struct mtx malloc_mtx;
 
 static int sysctl_kern_malloc_stats(SYSCTL_HANDLER_ARGS);
 
 #if defined(MALLOC_MAKE_FAILURES) || (MALLOC_DEBUG_MAXZONES > 1)
 static SYSCTL_NODE(_debug, OID_AUTO, malloc, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
     "Kernel malloc debugging options");
 #endif
 
 /*
  * malloc(9) fault injection -- cause malloc failures every (n) mallocs when
  * the caller specifies M_NOWAIT.  If set to 0, no failures are caused.
  */
 #ifdef MALLOC_MAKE_FAILURES
 static int malloc_failure_rate;
 static int malloc_nowait_count;
 static int malloc_failure_count;
 SYSCTL_INT(_debug_malloc, OID_AUTO, failure_rate, CTLFLAG_RWTUN,
     &malloc_failure_rate, 0, "Every (n) mallocs with M_NOWAIT will fail");
 SYSCTL_INT(_debug_malloc, OID_AUTO, failure_count, CTLFLAG_RD,
     &malloc_failure_count, 0, "Number of imposed M_NOWAIT malloc failures");
 #endif
 
 static int
 sysctl_kmem_map_size(SYSCTL_HANDLER_ARGS)
 {
 	u_long size;
 
 	size = uma_size();
 	return (sysctl_handle_long(oidp, &size, 0, req));
 }
 
 static int
 sysctl_kmem_map_free(SYSCTL_HANDLER_ARGS)
 {
 	u_long size, limit;
 
 	/* The sysctl is unsigned, implement as a saturation value. */
 	size = uma_size();
 	limit = uma_limit();
 	if (size > limit)
 		size = 0;
 	else
 		size = limit - size;
 	return (sysctl_handle_long(oidp, &size, 0, req));
 }
 
 static int
 sysctl_vm_malloc_zone_sizes(SYSCTL_HANDLER_ARGS)
 {
 	int sizes[nitems(kmemzones)];
 	int i;
 
 	for (i = 0; i < nitems(kmemzones); i++) {
 		sizes[i] = kmemzones[i].kz_size;
 	}
 
 	return (SYSCTL_OUT(req, &sizes, sizeof(sizes)));
 }
 
 /*
  * malloc(9) uma zone separation -- sub-page buffer overruns in one
  * malloc type will affect only a subset of other malloc types.
  */
 #if MALLOC_DEBUG_MAXZONES > 1
 static void
 tunable_set_numzones(void)
 {
 
 	TUNABLE_INT_FETCH("debug.malloc.numzones",
 	    &numzones);
 
 	/* Sanity check the number of malloc uma zones. */
 	if (numzones <= 0)
 		numzones = 1;
 	if (numzones > MALLOC_DEBUG_MAXZONES)
 		numzones = MALLOC_DEBUG_MAXZONES;
 }
 SYSINIT(numzones, SI_SUB_TUNABLES, SI_ORDER_ANY, tunable_set_numzones, NULL);
 SYSCTL_INT(_debug_malloc, OID_AUTO, numzones, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
     &numzones, 0, "Number of malloc uma subzones");
 
 /*
  * Any number that changes regularly is an okay choice for the
  * offset.  Build numbers are pretty good of you have them.
  */
 static u_int zone_offset = __FreeBSD_version;
 TUNABLE_INT("debug.malloc.zone_offset", &zone_offset);
 SYSCTL_UINT(_debug_malloc, OID_AUTO, zone_offset, CTLFLAG_RDTUN,
     &zone_offset, 0, "Separate malloc types by examining the "
     "Nth character in the malloc type short description.");
 
 static void
 mtp_set_subzone(struct malloc_type *mtp)
 {
 	struct malloc_type_internal *mtip;
 	const char *desc;
 	size_t len;
 	u_int val;
 
 	mtip = &mtp->ks_mti;
 	desc = mtp->ks_shortdesc;
 	if (desc == NULL || (len = strlen(desc)) == 0)
 		val = 0;
 	else
 		val = desc[zone_offset % len];
 	mtip->mti_zone = (val % numzones);
 }
 
 static inline u_int
 mtp_get_subzone(struct malloc_type *mtp)
 {
 	struct malloc_type_internal *mtip;
 
 	mtip = &mtp->ks_mti;
 
 	KASSERT(mtip->mti_zone < numzones,
 	    ("mti_zone %u out of range %d",
 	    mtip->mti_zone, numzones));
 	return (mtip->mti_zone);
 }
 #elif MALLOC_DEBUG_MAXZONES == 0
 #error "MALLOC_DEBUG_MAXZONES must be positive."
 #else
 static void
 mtp_set_subzone(struct malloc_type *mtp)
 {
 	struct malloc_type_internal *mtip;
 
 	mtip = &mtp->ks_mti;
 	mtip->mti_zone = 0;
 }
 
 static inline u_int
 mtp_get_subzone(struct malloc_type *mtp)
 {
 
 	return (0);
 }
 #endif /* MALLOC_DEBUG_MAXZONES > 1 */
 
 /*
  * An allocation has succeeded -- update malloc type statistics for the
  * amount of bucket size.  Occurs within a critical section so that the
  * thread isn't preempted and doesn't migrate while updating per-PCU
  * statistics.
  */
 static void
 malloc_type_zone_allocated(struct malloc_type *mtp, unsigned long size,
     int zindx)
 {
 	struct malloc_type_internal *mtip;
 	struct malloc_type_stats *mtsp;
 
 	critical_enter();
 	mtip = &mtp->ks_mti;
 	mtsp = zpcpu_get(mtip->mti_stats);
 	if (size > 0) {
 		mtsp->mts_memalloced += size;
 		mtsp->mts_numallocs++;
 	}
 	if (zindx != -1)
 		mtsp->mts_size |= 1 << zindx;
 
 #ifdef KDTRACE_HOOKS
 	if (__predict_false(dtrace_malloc_enabled)) {
 		uint32_t probe_id = mtip->mti_probes[DTMALLOC_PROBE_MALLOC];
 		if (probe_id != 0)
 			(dtrace_malloc_probe)(probe_id,
 			    (uintptr_t) mtp, (uintptr_t) mtip,
 			    (uintptr_t) mtsp, size, zindx);
 	}
 #endif
 
 	critical_exit();
 }
 
 void
 malloc_type_allocated(struct malloc_type *mtp, unsigned long size)
 {
 
 	if (size > 0)
 		malloc_type_zone_allocated(mtp, size, -1);
 }
 
 /*
  * A free operation has occurred -- update malloc type statistics for the
  * amount of the bucket size.  Occurs within a critical section so that the
  * thread isn't preempted and doesn't migrate while updating per-CPU
  * statistics.
  */
 void
 malloc_type_freed(struct malloc_type *mtp, unsigned long size)
 {
 	struct malloc_type_internal *mtip;
 	struct malloc_type_stats *mtsp;
 
 	critical_enter();
 	mtip = &mtp->ks_mti;
 	mtsp = zpcpu_get(mtip->mti_stats);
 	mtsp->mts_memfreed += size;
 	mtsp->mts_numfrees++;
 
 #ifdef KDTRACE_HOOKS
 	if (__predict_false(dtrace_malloc_enabled)) {
 		uint32_t probe_id = mtip->mti_probes[DTMALLOC_PROBE_FREE];
 		if (probe_id != 0)
 			(dtrace_malloc_probe)(probe_id,
 			    (uintptr_t) mtp, (uintptr_t) mtip,
 			    (uintptr_t) mtsp, size, 0);
 	}
 #endif
 
 	critical_exit();
 }
 
 /*
  *	contigmalloc:
  *
  *	Allocate a block of physically contiguous memory.
  *
  *	If M_NOWAIT is set, this routine will not block and return NULL if
  *	the allocation fails.
  */
 #define	IS_CONTIG_MALLOC(_slab)						\
     (GET_SLAB_COOKIE(_slab) == SLAB_COOKIE_CONTIG_MALLOC)
 #define	CONTIG_MALLOC_SLAB(_size)					\
     ((void *)(((_size) << SLAB_COOKIE_SHIFT) | SLAB_COOKIE_CONTIG_MALLOC))
 static inline size_t
 contigmalloc_size(uma_slab_t slab)
 {
 	uintptr_t va;
 
 	KASSERT(IS_CONTIG_MALLOC(slab),
 	    ("%s: called on non-contigmalloc allocation: %p", __func__, slab));
 	va = (uintptr_t)slab;
 	return (va >> SLAB_COOKIE_SHIFT);
 }
 
 void *
 contigmalloc(unsigned long size, struct malloc_type *type, int flags,
     vm_paddr_t low, vm_paddr_t high, unsigned long alignment,
     vm_paddr_t boundary)
 {
 	void *ret;
 
 	ret = (void *)kmem_alloc_contig(size, flags, low, high, alignment,
 	    boundary, VM_MEMATTR_DEFAULT);
 	if (ret != NULL) {
 		/* Use low bits unused for slab pointers. */
 		vsetzoneslab((uintptr_t)ret, NULL, CONTIG_MALLOC_SLAB(size));
 		malloc_type_allocated(type, round_page(size));
 	}
 	return (ret);
 }
 
 void *
 contigmalloc_domainset(unsigned long size, struct malloc_type *type,
     struct domainset *ds, int flags, vm_paddr_t low, vm_paddr_t high,
     unsigned long alignment, vm_paddr_t boundary)
 {
 	void *ret;
 
 	ret = (void *)kmem_alloc_contig_domainset(ds, size, flags, low, high,
 	    alignment, boundary, VM_MEMATTR_DEFAULT);
 	if (ret != NULL) {
 		/* Use low bits unused for slab pointers. */
 		vsetzoneslab((uintptr_t)ret, NULL, CONTIG_MALLOC_SLAB(size));
 		malloc_type_allocated(type, round_page(size));
 	}
 	return (ret);
 }
+#undef	IS_CONTIG_MALLOC
+#undef	CONTIG_MALLOC_SLAB
 
-/*
- *	contigfree (deprecated).
- *
- *	Free a block of memory allocated by contigmalloc.
- *
- *	This routine may not block.
- */
+/* contigfree(9) is deprecated. */
 void
 contigfree(void *addr, unsigned long size __unused, struct malloc_type *type)
 {
 	free(addr, type);
 }
-#undef	IS_CONTIG_MALLOC
-#undef	CONTIG_MALLOC_SLAB
 
 #ifdef MALLOC_DEBUG
 static int
 malloc_dbg(caddr_t *vap, size_t *sizep, struct malloc_type *mtp,
     int flags)
 {
 #ifdef INVARIANTS
 	int indx;
 
 	KASSERT(mtp->ks_version == M_VERSION, ("malloc: bad malloc type version"));
 	/*
 	 * Check that exactly one of M_WAITOK or M_NOWAIT is specified.
 	 */
 	indx = flags & (M_WAITOK | M_NOWAIT);
 	if (indx != M_NOWAIT && indx != M_WAITOK) {
 		static	struct timeval lasterr;
 		static	int curerr, once;
 		if (once == 0 && ppsratecheck(&lasterr, &curerr, 1)) {
 			printf("Bad malloc flags: %x\n", indx);
 			kdb_backtrace();
 			flags |= M_WAITOK;
 			once++;
 		}
 	}
 #endif
 #ifdef MALLOC_MAKE_FAILURES
 	if ((flags & M_NOWAIT) && (malloc_failure_rate != 0)) {
 		atomic_add_int(&malloc_nowait_count, 1);
 		if ((malloc_nowait_count % malloc_failure_rate) == 0) {
 			atomic_add_int(&malloc_failure_count, 1);
 			*vap = NULL;
 			return (EJUSTRETURN);
 		}
 	}
 #endif
 	if (flags & M_WAITOK) {
 		KASSERT(curthread->td_intr_nesting_level == 0,
 		   ("malloc(M_WAITOK) in interrupt context"));
 		if (__predict_false(!THREAD_CAN_SLEEP())) {
 #ifdef EPOCH_TRACE
 			epoch_trace_list(curthread);
 #endif
 			KASSERT(0,
 			    ("malloc(M_WAITOK) with sleeping prohibited"));
 		}
 	}
 	KASSERT(curthread->td_critnest == 0 || SCHEDULER_STOPPED(),
 	    ("malloc: called with spinlock or critical section held"));
 
 #ifdef DEBUG_MEMGUARD
 	if (memguard_cmp_mtp(mtp, *sizep)) {
 		*vap = memguard_alloc(*sizep, flags);
 		if (*vap != NULL)
 			return (EJUSTRETURN);
 		/* This is unfortunate but should not be fatal. */
 	}
 #endif
 
 #ifdef DEBUG_REDZONE
 	*sizep = redzone_size_ntor(*sizep);
 #endif
 
 	return (0);
 }
 #endif
 
 /*
  * Handle large allocations and frees by using kmem_malloc directly.
  */
 #define	IS_MALLOC_LARGE(_slab)						\
     (GET_SLAB_COOKIE(_slab) == SLAB_COOKIE_MALLOC_LARGE)
 #define	MALLOC_LARGE_SLAB(_size)					\
     ((void *)(((_size) << SLAB_COOKIE_SHIFT) | SLAB_COOKIE_MALLOC_LARGE))
 static inline size_t
 malloc_large_size(uma_slab_t slab)
 {
 	uintptr_t va;
 
 	va = (uintptr_t)slab;
 	KASSERT(IS_MALLOC_LARGE(slab),
 	    ("%s: called on non-malloc_large allocation: %p", __func__, slab));
 	return (va >> SLAB_COOKIE_SHIFT);
 }
 
 static caddr_t __noinline
 malloc_large(size_t size, struct malloc_type *mtp, struct domainset *policy,
     int flags DEBUG_REDZONE_ARG_DEF)
 {
 	void *va;
 
 	size = roundup(size, PAGE_SIZE);
 	va = kmem_malloc_domainset(policy, size, flags);
 	if (va != NULL) {
 		/* Use low bits unused for slab pointers. */
 		vsetzoneslab((uintptr_t)va, NULL, MALLOC_LARGE_SLAB(size));
 		uma_total_inc(size);
 	}
 	malloc_type_allocated(mtp, va == NULL ? 0 : size);
 	if (__predict_false(va == NULL)) {
 		KASSERT((flags & M_WAITOK) == 0,
 		    ("malloc(M_WAITOK) returned NULL"));
 	} else {
 #ifdef DEBUG_REDZONE
 		va = redzone_setup(va, osize);
 #endif
 		kasan_mark(va, osize, size, KASAN_MALLOC_REDZONE);
 	}
 	return (va);
 }
 
 static void
 free_large(void *addr, size_t size)
 {
 
 	kmem_free(addr, size);
 	uma_total_dec(size);
 }
 #undef	IS_MALLOC_LARGE
 #undef	MALLOC_LARGE_SLAB
 
 /*
  *	malloc:
  *
  *	Allocate a block of memory.
  *
  *	If M_NOWAIT is set, this routine will not block and return NULL if
  *	the allocation fails.
  */
 void *
 (malloc)(size_t size, struct malloc_type *mtp, int flags)
 {
 	int indx;
 	caddr_t va;
 	uma_zone_t zone;
 #if defined(DEBUG_REDZONE) || defined(KASAN)
 	unsigned long osize = size;
 #endif
 
 	MPASS((flags & M_EXEC) == 0);
 
 #ifdef MALLOC_DEBUG
 	va = NULL;
 	if (malloc_dbg(&va, &size, mtp, flags) != 0)
 		return (va);
 #endif
 
 	if (__predict_false(size > kmem_zmax))
 		return (malloc_large(size, mtp, DOMAINSET_RR(), flags
 		    DEBUG_REDZONE_ARG));
 
 	if (size & KMEM_ZMASK)
 		size = (size & ~KMEM_ZMASK) + KMEM_ZBASE;
 	indx = kmemsize[size >> KMEM_ZSHIFT];
 	zone = kmemzones[indx].kz_zone[mtp_get_subzone(mtp)];
 	va = uma_zalloc_arg(zone, zone, flags);
 	if (va != NULL) {
 		size = zone->uz_size;
 		if ((flags & M_ZERO) == 0) {
 			kmsan_mark(va, size, KMSAN_STATE_UNINIT);
 			kmsan_orig(va, size, KMSAN_TYPE_MALLOC, KMSAN_RET_ADDR);
 		}
 	}
 	malloc_type_zone_allocated(mtp, va == NULL ? 0 : size, indx);
 	if (__predict_false(va == NULL)) {
 		KASSERT((flags & M_WAITOK) == 0,
 		    ("malloc(M_WAITOK) returned NULL"));
 	}
 #ifdef DEBUG_REDZONE
 	if (va != NULL)
 		va = redzone_setup(va, osize);
 #endif
 #ifdef KASAN
 	if (va != NULL)
 		kasan_mark((void *)va, osize, size, KASAN_MALLOC_REDZONE);
 #endif
 	return ((void *) va);
 }
 
 static void *
 malloc_domain(size_t *sizep, int *indxp, struct malloc_type *mtp, int domain,
     int flags)
 {
 	uma_zone_t zone;
 	caddr_t va;
 	size_t size;
 	int indx;
 
 	size = *sizep;
 	KASSERT(size <= kmem_zmax && (flags & M_EXEC) == 0,
 	    ("malloc_domain: Called with bad flag / size combination"));
 	if (size & KMEM_ZMASK)
 		size = (size & ~KMEM_ZMASK) + KMEM_ZBASE;
 	indx = kmemsize[size >> KMEM_ZSHIFT];
 	zone = kmemzones[indx].kz_zone[mtp_get_subzone(mtp)];
 	va = uma_zalloc_domain(zone, zone, domain, flags);
 	if (va != NULL)
 		*sizep = zone->uz_size;
 	*indxp = indx;
 	return ((void *)va);
 }
 
 void *
 malloc_domainset(size_t size, struct malloc_type *mtp, struct domainset *ds,
     int flags)
 {
 	struct vm_domainset_iter di;
 	caddr_t va;
 	int domain;
 	int indx;
 #if defined(KASAN) || defined(DEBUG_REDZONE)
 	unsigned long osize = size;
 #endif
 
 	MPASS((flags & M_EXEC) == 0);
 
 #ifdef MALLOC_DEBUG
 	va = NULL;
 	if (malloc_dbg(&va, &size, mtp, flags) != 0)
 		return (va);
 #endif
 
 	if (__predict_false(size > kmem_zmax))
 		return (malloc_large(size, mtp, DOMAINSET_RR(), flags
 		    DEBUG_REDZONE_ARG));
 
 	vm_domainset_iter_policy_init(&di, ds, &domain, &flags);
 	do {
 		va = malloc_domain(&size, &indx, mtp, domain, flags);
 	} while (va == NULL && vm_domainset_iter_policy(&di, &domain) == 0);
 	malloc_type_zone_allocated(mtp, va == NULL ? 0 : size, indx);
 	if (__predict_false(va == NULL)) {
 		KASSERT((flags & M_WAITOK) == 0,
 		    ("malloc(M_WAITOK) returned NULL"));
 	}
 #ifdef DEBUG_REDZONE
 	if (va != NULL)
 		va = redzone_setup(va, osize);
 #endif
 #ifdef KASAN
 	if (va != NULL)
 		kasan_mark((void *)va, osize, size, KASAN_MALLOC_REDZONE);
 #endif
 #ifdef KMSAN
 	if ((flags & M_ZERO) == 0) {
 		kmsan_mark(va, size, KMSAN_STATE_UNINIT);
 		kmsan_orig(va, size, KMSAN_TYPE_MALLOC, KMSAN_RET_ADDR);
 	}
 #endif
 	return (va);
 }
 
 /*
  * Allocate an executable area.
  */
 void *
 malloc_exec(size_t size, struct malloc_type *mtp, int flags)
 {
 
 	return (malloc_domainset_exec(size, mtp, DOMAINSET_RR(), flags));
 }
 
 void *
 malloc_domainset_exec(size_t size, struct malloc_type *mtp, struct domainset *ds,
     int flags)
 {
 #if defined(DEBUG_REDZONE) || defined(KASAN)
 	unsigned long osize = size;
 #endif
 #ifdef MALLOC_DEBUG
 	caddr_t va;
 #endif
 
 	flags |= M_EXEC;
 
 #ifdef MALLOC_DEBUG
 	va = NULL;
 	if (malloc_dbg(&va, &size, mtp, flags) != 0)
 		return (va);
 #endif
 
 	return (malloc_large(size, mtp, ds, flags DEBUG_REDZONE_ARG));
 }
 
 void *
 malloc_aligned(size_t size, size_t align, struct malloc_type *type, int flags)
 {
 	return (malloc_domainset_aligned(size, align, type, DOMAINSET_RR(),
 	    flags));
 }
 
 void *
 malloc_domainset_aligned(size_t size, size_t align,
     struct malloc_type *mtp, struct domainset *ds, int flags)
 {
 	void *res;
 	size_t asize;
 
 	KASSERT(powerof2(align),
 	    ("malloc_domainset_aligned: wrong align %#zx size %#zx",
 	    align, size));
 	KASSERT(align <= PAGE_SIZE,
 	    ("malloc_domainset_aligned: align %#zx (size %#zx) too large",
 	    align, size));
 
 	/*
 	 * Round the allocation size up to the next power of 2,
 	 * because we can only guarantee alignment for
 	 * power-of-2-sized allocations.  Further increase the
 	 * allocation size to align if the rounded size is less than
 	 * align, since malloc zones provide alignment equal to their
 	 * size.
 	 */
 	if (size == 0)
 		size = 1;
 	asize = size <= align ? align : 1UL << flsl(size - 1);
 
 	res = malloc_domainset(asize, mtp, ds, flags);
 	KASSERT(res == NULL || ((uintptr_t)res & (align - 1)) == 0,
 	    ("malloc_domainset_aligned: result not aligned %p size %#zx "
 	    "allocsize %#zx align %#zx", res, size, asize, align));
 	return (res);
 }
 
 void *
 mallocarray(size_t nmemb, size_t size, struct malloc_type *type, int flags)
 {
 
 	if (WOULD_OVERFLOW(nmemb, size))
 		panic("mallocarray: %zu * %zu overflowed", nmemb, size);
 
 	return (malloc(size * nmemb, type, flags));
 }
 
 void *
 mallocarray_domainset(size_t nmemb, size_t size, struct malloc_type *type,
     struct domainset *ds, int flags)
 {
 
 	if (WOULD_OVERFLOW(nmemb, size))
 		panic("mallocarray_domainset: %zu * %zu overflowed", nmemb, size);
 
 	return (malloc_domainset(size * nmemb, type, ds, flags));
 }
 
 #if defined(INVARIANTS) && !defined(KASAN)
 static void
 free_save_type(void *addr, struct malloc_type *mtp, u_long size)
 {
 	struct malloc_type **mtpp = addr;
 
 	/*
 	 * Cache a pointer to the malloc_type that most recently freed
 	 * this memory here.  This way we know who is most likely to
 	 * have stepped on it later.
 	 *
 	 * This code assumes that size is a multiple of 8 bytes for
 	 * 64 bit machines
 	 */
 	mtpp = (struct malloc_type **) ((unsigned long)mtpp & ~UMA_ALIGN_PTR);
 	mtpp += (size - sizeof(struct malloc_type *)) /
 	    sizeof(struct malloc_type *);
 	*mtpp = mtp;
 }
 #endif
 
 #ifdef MALLOC_DEBUG
 static int
 free_dbg(void **addrp, struct malloc_type *mtp)
 {
 	void *addr;
 
 	addr = *addrp;
 	KASSERT(mtp->ks_version == M_VERSION, ("free: bad malloc type version"));
 	KASSERT(curthread->td_critnest == 0 || SCHEDULER_STOPPED(),
 	    ("free: called with spinlock or critical section held"));
 
 	/* free(NULL, ...) does nothing */
 	if (addr == NULL)
 		return (EJUSTRETURN);
 
 #ifdef DEBUG_MEMGUARD
 	if (is_memguard_addr(addr)) {
 		memguard_free(addr);
 		return (EJUSTRETURN);
 	}
 #endif
 
 #ifdef DEBUG_REDZONE
 	redzone_check(addr);
 	*addrp = redzone_addr_ntor(addr);
 #endif
 
 	return (0);
 }
 #endif
 
 /*
  *	free:
  *
  *	Free a block of memory allocated by malloc.
  *
  *	This routine may not block.
  */
 void
 free(void *addr, struct malloc_type *mtp)
 {
 	uma_zone_t zone;
 	uma_slab_t slab;
 	u_long size;
 
 #ifdef MALLOC_DEBUG
 	if (free_dbg(&addr, mtp) != 0)
 		return;
 #endif
 	/* free(NULL, ...) does nothing */
 	if (addr == NULL)
 		return;
 
 	vtozoneslab((vm_offset_t)addr & (~UMA_SLAB_MASK), &zone, &slab);
 	if (slab == NULL)
 		panic("free: address %p(%p) has not been allocated",
 		    addr, (void *)((u_long)addr & (~UMA_SLAB_MASK)));
 
 	switch (GET_SLAB_COOKIE(slab)) {
 	case __predict_true(SLAB_COOKIE_SLAB_PTR):
 		size = zone->uz_size;
 #if defined(INVARIANTS) && !defined(KASAN)
 		free_save_type(addr, mtp, size);
 #endif
 		uma_zfree_arg(zone, addr, slab);
 		break;
 	case SLAB_COOKIE_MALLOC_LARGE:
 		size = malloc_large_size(slab);
 		free_large(addr, size);
 		break;
 	case SLAB_COOKIE_CONTIG_MALLOC:
 		size = contigmalloc_size(slab);
 		kmem_free(addr, size);
 		size = round_page(size);
 		break;
 	default:
 		panic("%s: addr %p slab %p with unknown cookie %d", __func__,
 		    addr, slab, GET_SLAB_COOKIE(slab));
 		/* NOTREACHED */
 	}
 	malloc_type_freed(mtp, size);
 }
 
 /*
  *	zfree:
  *
  *	Zero then free a block of memory allocated by malloc.
  *
  *	This routine may not block.
  */
 void
 zfree(void *addr, struct malloc_type *mtp)
 {
 	uma_zone_t zone;
 	uma_slab_t slab;
 	u_long size;
 
 #ifdef MALLOC_DEBUG
 	if (free_dbg(&addr, mtp) != 0)
 		return;
 #endif
 	/* free(NULL, ...) does nothing */
 	if (addr == NULL)
 		return;
 
 	vtozoneslab((vm_offset_t)addr & (~UMA_SLAB_MASK), &zone, &slab);
 	if (slab == NULL)
 		panic("free: address %p(%p) has not been allocated",
 		    addr, (void *)((u_long)addr & (~UMA_SLAB_MASK)));
 
 	switch (GET_SLAB_COOKIE(slab)) {
 	case __predict_true(SLAB_COOKIE_SLAB_PTR):
 		size = zone->uz_size;
 #if defined(INVARIANTS) && !defined(KASAN)
 		free_save_type(addr, mtp, size);
 #endif
 		kasan_mark(addr, size, size, 0);
 		explicit_bzero(addr, size);
 		uma_zfree_arg(zone, addr, slab);
 		break;
 	case SLAB_COOKIE_MALLOC_LARGE:
 		size = malloc_large_size(slab);
 		kasan_mark(addr, size, size, 0);
 		explicit_bzero(addr, size);
 		free_large(addr, size);
 		break;
 	case SLAB_COOKIE_CONTIG_MALLOC:
 		size = round_page(contigmalloc_size(slab));
 		explicit_bzero(addr, size);
 		kmem_free(addr, size);
 		break;
 	default:
 		panic("%s: addr %p slab %p with unknown cookie %d", __func__,
 		    addr, slab, GET_SLAB_COOKIE(slab));
 		/* NOTREACHED */
 	}
 	malloc_type_freed(mtp, size);
 }
 
 /*
  *	realloc: change the size of a memory block
  */
 void *
 realloc(void *addr, size_t size, struct malloc_type *mtp, int flags)
 {
 #ifndef DEBUG_REDZONE
 	uma_zone_t zone;
 	uma_slab_t slab;
 #endif
 	unsigned long alloc;
 	void *newaddr;
 
 	KASSERT(mtp->ks_version == M_VERSION,
 	    ("realloc: bad malloc type version"));
 	KASSERT(curthread->td_critnest == 0 || SCHEDULER_STOPPED(),
 	    ("realloc: called with spinlock or critical section held"));
 
 	/* realloc(NULL, ...) is equivalent to malloc(...) */
 	if (addr == NULL)
 		return (malloc(size, mtp, flags));
 
 	/*
 	 * XXX: Should report free of old memory and alloc of new memory to
 	 * per-CPU stats.
 	 */
 
 #ifdef DEBUG_MEMGUARD
 	if (is_memguard_addr(addr))
 		return (memguard_realloc(addr, size, mtp, flags));
 #endif
 
 #ifdef DEBUG_REDZONE
 	alloc = redzone_get_size(addr);
 #else
 	vtozoneslab((vm_offset_t)addr & (~UMA_SLAB_MASK), &zone, &slab);
 
 	/* Sanity check */
 	KASSERT(slab != NULL,
 	    ("realloc: address %p out of range", (void *)addr));
 
 	/* Get the size of the original block */
 	switch (GET_SLAB_COOKIE(slab)) {
 	case __predict_true(SLAB_COOKIE_SLAB_PTR):
 		alloc = zone->uz_size;
 		break;
 	case SLAB_COOKIE_MALLOC_LARGE:
 		alloc = malloc_large_size(slab);
 		break;
 	default:
 #ifdef INVARIANTS
 		panic("%s: called for addr %p of unsupported allocation type; "
 		    "slab %p cookie %d", __func__, addr, slab, GET_SLAB_COOKIE(slab));
 #endif
 		return (NULL);
 	}
 
 	/* Reuse the original block if appropriate */
 	if (size <= alloc &&
 	    (size > (alloc >> REALLOC_FRACTION) || alloc == MINALLOCSIZE)) {
 		kasan_mark((void *)addr, size, alloc, KASAN_MALLOC_REDZONE);
 		return (addr);
 	}
 #endif /* !DEBUG_REDZONE */
 
 	/* Allocate a new, bigger (or smaller) block */
 	if ((newaddr = malloc(size, mtp, flags)) == NULL)
 		return (NULL);
 
 	/*
 	 * Copy over original contents.  For KASAN, the redzone must be marked
 	 * valid before performing the copy.
 	 */
 	kasan_mark(addr, alloc, alloc, 0);
 	bcopy(addr, newaddr, min(size, alloc));
 	free(addr, mtp);
 	return (newaddr);
 }
 
 /*
  *	reallocf: same as realloc() but free memory on failure.
  */
 void *
 reallocf(void *addr, size_t size, struct malloc_type *mtp, int flags)
 {
 	void *mem;
 
 	if ((mem = realloc(addr, size, mtp, flags)) == NULL)
 		free(addr, mtp);
 	return (mem);
 }
 
 /*
  * 	malloc_size: returns the number of bytes allocated for a request of the
  * 		     specified size
  */
 size_t
 malloc_size(size_t size)
 {
 	int indx;
 
 	if (size > kmem_zmax)
 		return (round_page(size));
 	if (size & KMEM_ZMASK)
 		size = (size & ~KMEM_ZMASK) + KMEM_ZBASE;
 	indx = kmemsize[size >> KMEM_ZSHIFT];
 	return (kmemzones[indx].kz_size);
 }
 
 /*
  *	malloc_usable_size: returns the usable size of the allocation.
  */
 size_t
 malloc_usable_size(const void *addr)
 {
 #ifndef DEBUG_REDZONE
 	uma_zone_t zone;
 	uma_slab_t slab;
 #endif
 	u_long size;
 
 	if (addr == NULL)
 		return (0);
 
 #ifdef DEBUG_MEMGUARD
 	if (is_memguard_addr(__DECONST(void *, addr)))
 		return (memguard_get_req_size(addr));
 #endif
 
 #ifdef DEBUG_REDZONE
 	size = redzone_get_size(__DECONST(void *, addr));
 #else
 	vtozoneslab((vm_offset_t)addr & (~UMA_SLAB_MASK), &zone, &slab);
 	if (slab == NULL)
 		panic("malloc_usable_size: address %p(%p) is not allocated",
 		    addr, (void *)((u_long)addr & (~UMA_SLAB_MASK)));
 
 	switch (GET_SLAB_COOKIE(slab)) {
 	case __predict_true(SLAB_COOKIE_SLAB_PTR):
 		size = zone->uz_size;
 		break;
 	case SLAB_COOKIE_MALLOC_LARGE:
 		size = malloc_large_size(slab);
 		break;
 	default:
 		__assert_unreachable();
 		size = 0;
 		break;
 	}
 #endif
 
 	/*
 	 * Unmark the redzone to avoid reports from consumers who are
 	 * (presumably) about to use the full allocation size.
 	 */
 	kasan_mark(addr, size, size, 0);
 
 	return (size);
 }
 
 CTASSERT(VM_KMEM_SIZE_SCALE >= 1);
 
 /*
  * Initialize the kernel memory (kmem) arena.
  */
 void
 kmeminit(void)
 {
 	u_long mem_size;
 	u_long tmp;
 
 #ifdef VM_KMEM_SIZE
 	if (vm_kmem_size == 0)
 		vm_kmem_size = VM_KMEM_SIZE;
 #endif
 #ifdef VM_KMEM_SIZE_MIN
 	if (vm_kmem_size_min == 0)
 		vm_kmem_size_min = VM_KMEM_SIZE_MIN;
 #endif
 #ifdef VM_KMEM_SIZE_MAX
 	if (vm_kmem_size_max == 0)
 		vm_kmem_size_max = VM_KMEM_SIZE_MAX;
 #endif
 	/*
 	 * Calculate the amount of kernel virtual address (KVA) space that is
 	 * preallocated to the kmem arena.  In order to support a wide range
 	 * of machines, it is a function of the physical memory size,
 	 * specifically,
 	 *
 	 *	min(max(physical memory size / VM_KMEM_SIZE_SCALE,
 	 *	    VM_KMEM_SIZE_MIN), VM_KMEM_SIZE_MAX)
 	 *
 	 * Every architecture must define an integral value for
 	 * VM_KMEM_SIZE_SCALE.  However, the definitions of VM_KMEM_SIZE_MIN
 	 * and VM_KMEM_SIZE_MAX, which represent respectively the floor and
 	 * ceiling on this preallocation, are optional.  Typically,
 	 * VM_KMEM_SIZE_MAX is itself a function of the available KVA space on
 	 * a given architecture.
 	 */
 	mem_size = vm_cnt.v_page_count;
 	if (mem_size <= 32768) /* delphij XXX 128MB */
 		kmem_zmax = PAGE_SIZE;
 
 	if (vm_kmem_size_scale < 1)
 		vm_kmem_size_scale = VM_KMEM_SIZE_SCALE;
 
 	/*
 	 * Check if we should use defaults for the "vm_kmem_size"
 	 * variable:
 	 */
 	if (vm_kmem_size == 0) {
 		vm_kmem_size = mem_size / vm_kmem_size_scale;
 		vm_kmem_size = vm_kmem_size * PAGE_SIZE < vm_kmem_size ?
 		    vm_kmem_size_max : vm_kmem_size * PAGE_SIZE;
 		if (vm_kmem_size_min > 0 && vm_kmem_size < vm_kmem_size_min)
 			vm_kmem_size = vm_kmem_size_min;
 		if (vm_kmem_size_max > 0 && vm_kmem_size >= vm_kmem_size_max)
 			vm_kmem_size = vm_kmem_size_max;
 	}
 	if (vm_kmem_size == 0)
 		panic("Tune VM_KMEM_SIZE_* for the platform");
 
 	/*
 	 * The amount of KVA space that is preallocated to the
 	 * kmem arena can be set statically at compile-time or manually
 	 * through the kernel environment.  However, it is still limited to
 	 * twice the physical memory size, which has been sufficient to handle
 	 * the most severe cases of external fragmentation in the kmem arena. 
 	 */
 	if (vm_kmem_size / 2 / PAGE_SIZE > mem_size)
 		vm_kmem_size = 2 * mem_size * PAGE_SIZE;
 
 	vm_kmem_size = round_page(vm_kmem_size);
 
 	/*
 	 * With KASAN or KMSAN enabled, dynamically allocated kernel memory is
 	 * shadowed.  Account for this when setting the UMA limit.
 	 */
 #if defined(KASAN)
 	vm_kmem_size = (vm_kmem_size * KASAN_SHADOW_SCALE) /
 	    (KASAN_SHADOW_SCALE + 1);
 #elif defined(KMSAN)
 	vm_kmem_size /= 3;
 #endif
 
 #ifdef DEBUG_MEMGUARD
 	tmp = memguard_fudge(vm_kmem_size, kernel_map);
 #else
 	tmp = vm_kmem_size;
 #endif
 	uma_set_limit(tmp);
 
 #ifdef DEBUG_MEMGUARD
 	/*
 	 * Initialize MemGuard if support compiled in.  MemGuard is a
 	 * replacement allocator used for detecting tamper-after-free
 	 * scenarios as they occur.  It is only used for debugging.
 	 */
 	memguard_init(kernel_arena);
 #endif
 }
 
 /*
  * Initialize the kernel memory allocator
  */
 /* ARGSUSED*/
 static void
 mallocinit(void *dummy)
 {
 	int i;
 	uint8_t indx;
 
 	mtx_init(&malloc_mtx, "malloc", NULL, MTX_DEF);
 
 	kmeminit();
 
 	if (kmem_zmax < PAGE_SIZE || kmem_zmax > KMEM_ZMAX)
 		kmem_zmax = KMEM_ZMAX;
 
 	for (i = 0, indx = 0; kmemzones[indx].kz_size != 0; indx++) {
 		int size = kmemzones[indx].kz_size;
 		const char *name = kmemzones[indx].kz_name;
 		size_t align;
 		int subzone;
 
 		align = UMA_ALIGN_PTR;
 		if (powerof2(size) && size > sizeof(void *))
 			align = MIN(size, PAGE_SIZE) - 1;
 		for (subzone = 0; subzone < numzones; subzone++) {
 			kmemzones[indx].kz_zone[subzone] =
 			    uma_zcreate(name, size,
 #if defined(INVARIANTS) && !defined(KASAN) && !defined(KMSAN)
 			    mtrash_ctor, mtrash_dtor, mtrash_init, mtrash_fini,
 #else
 			    NULL, NULL, NULL, NULL,
 #endif
 			    align, UMA_ZONE_MALLOC);
 		}
 		for (;i <= size; i+= KMEM_ZBASE)
 			kmemsize[i >> KMEM_ZSHIFT] = indx;
 	}
 }
 SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_SECOND, mallocinit, NULL);
 
 void
 malloc_init(void *data)
 {
 	struct malloc_type_internal *mtip;
 	struct malloc_type *mtp;
 
 	KASSERT(vm_cnt.v_page_count != 0,
 	    ("malloc_init() called before vm_mem_init()"));
 
 	mtp = data;
 	if (mtp->ks_version != M_VERSION)
 		panic("malloc_init: type %s with unsupported version %lu",
 		    mtp->ks_shortdesc, mtp->ks_version);
 
 	mtip = &mtp->ks_mti;
 	mtip->mti_stats = uma_zalloc_pcpu(pcpu_zone_64, M_WAITOK | M_ZERO);
 	mtp_set_subzone(mtp);
 
 	mtx_lock(&malloc_mtx);
 	mtp->ks_next = kmemstatistics;
 	kmemstatistics = mtp;
 	kmemcount++;
 	mtx_unlock(&malloc_mtx);
 }
 
 void
 malloc_uninit(void *data)
 {
 	struct malloc_type_internal *mtip;
 	struct malloc_type_stats *mtsp;
 	struct malloc_type *mtp, *temp;
 	long temp_allocs, temp_bytes;
 	int i;
 
 	mtp = data;
 	KASSERT(mtp->ks_version == M_VERSION,
 	    ("malloc_uninit: bad malloc type version"));
 
 	mtx_lock(&malloc_mtx);
 	mtip = &mtp->ks_mti;
 	if (mtp != kmemstatistics) {
 		for (temp = kmemstatistics; temp != NULL;
 		    temp = temp->ks_next) {
 			if (temp->ks_next == mtp) {
 				temp->ks_next = mtp->ks_next;
 				break;
 			}
 		}
 		KASSERT(temp,
 		    ("malloc_uninit: type '%s' not found", mtp->ks_shortdesc));
 	} else
 		kmemstatistics = mtp->ks_next;
 	kmemcount--;
 	mtx_unlock(&malloc_mtx);
 
 	/*
 	 * Look for memory leaks.
 	 */
 	temp_allocs = temp_bytes = 0;
 	for (i = 0; i <= mp_maxid; i++) {
 		mtsp = zpcpu_get_cpu(mtip->mti_stats, i);
 		temp_allocs += mtsp->mts_numallocs;
 		temp_allocs -= mtsp->mts_numfrees;
 		temp_bytes += mtsp->mts_memalloced;
 		temp_bytes -= mtsp->mts_memfreed;
 	}
 	if (temp_allocs > 0 || temp_bytes > 0) {
 		printf("Warning: memory type %s leaked memory on destroy "
 		    "(%ld allocations, %ld bytes leaked).\n", mtp->ks_shortdesc,
 		    temp_allocs, temp_bytes);
 	}
 
 	uma_zfree_pcpu(pcpu_zone_64, mtip->mti_stats);
 }
 
 struct malloc_type *
 malloc_desc2type(const char *desc)
 {
 	struct malloc_type *mtp;
 
 	mtx_assert(&malloc_mtx, MA_OWNED);
 	for (mtp = kmemstatistics; mtp != NULL; mtp = mtp->ks_next) {
 		if (strcmp(mtp->ks_shortdesc, desc) == 0)
 			return (mtp);
 	}
 	return (NULL);
 }
 
 static int
 sysctl_kern_malloc_stats(SYSCTL_HANDLER_ARGS)
 {
 	struct malloc_type_stream_header mtsh;
 	struct malloc_type_internal *mtip;
 	struct malloc_type_stats *mtsp, zeromts;
 	struct malloc_type_header mth;
 	struct malloc_type *mtp;
 	int error, i;
 	struct sbuf sbuf;
 
 	error = sysctl_wire_old_buffer(req, 0);
 	if (error != 0)
 		return (error);
 	sbuf_new_for_sysctl(&sbuf, NULL, 128, req);
 	sbuf_clear_flags(&sbuf, SBUF_INCLUDENUL);
 	mtx_lock(&malloc_mtx);
 
 	bzero(&zeromts, sizeof(zeromts));
 
 	/*
 	 * Insert stream header.
 	 */
 	bzero(&mtsh, sizeof(mtsh));
 	mtsh.mtsh_version = MALLOC_TYPE_STREAM_VERSION;
 	mtsh.mtsh_maxcpus = MAXCPU;
 	mtsh.mtsh_count = kmemcount;
 	(void)sbuf_bcat(&sbuf, &mtsh, sizeof(mtsh));
 
 	/*
 	 * Insert alternating sequence of type headers and type statistics.
 	 */
 	for (mtp = kmemstatistics; mtp != NULL; mtp = mtp->ks_next) {
 		mtip = &mtp->ks_mti;
 
 		/*
 		 * Insert type header.
 		 */
 		bzero(&mth, sizeof(mth));
 		strlcpy(mth.mth_name, mtp->ks_shortdesc, MALLOC_MAX_NAME);
 		(void)sbuf_bcat(&sbuf, &mth, sizeof(mth));
 
 		/*
 		 * Insert type statistics for each CPU.
 		 */
 		for (i = 0; i <= mp_maxid; i++) {
 			mtsp = zpcpu_get_cpu(mtip->mti_stats, i);
 			(void)sbuf_bcat(&sbuf, mtsp, sizeof(*mtsp));
 		}
 		/*
 		 * Fill in the missing CPUs.
 		 */
 		for (; i < MAXCPU; i++) {
 			(void)sbuf_bcat(&sbuf, &zeromts, sizeof(zeromts));
 		}
 	}
 	mtx_unlock(&malloc_mtx);
 	error = sbuf_finish(&sbuf);
 	sbuf_delete(&sbuf);
 	return (error);
 }
 
 SYSCTL_PROC(_kern, OID_AUTO, malloc_stats,
     CTLFLAG_RD | CTLTYPE_STRUCT | CTLFLAG_MPSAFE, 0, 0,
     sysctl_kern_malloc_stats, "s,malloc_type_ustats",
     "Return malloc types");
 
 SYSCTL_INT(_kern, OID_AUTO, malloc_count, CTLFLAG_RD, &kmemcount, 0,
     "Count of kernel malloc types");
 
 void
 malloc_type_list(malloc_type_list_func_t *func, void *arg)
 {
 	struct malloc_type *mtp, **bufmtp;
 	int count, i;
 	size_t buflen;
 
 	mtx_lock(&malloc_mtx);
 restart:
 	mtx_assert(&malloc_mtx, MA_OWNED);
 	count = kmemcount;
 	mtx_unlock(&malloc_mtx);
 
 	buflen = sizeof(struct malloc_type *) * count;
 	bufmtp = malloc(buflen, M_TEMP, M_WAITOK);
 
 	mtx_lock(&malloc_mtx);
 
 	if (count < kmemcount) {
 		free(bufmtp, M_TEMP);
 		goto restart;
 	}
 
 	for (mtp = kmemstatistics, i = 0; mtp != NULL; mtp = mtp->ks_next, i++)
 		bufmtp[i] = mtp;
 
 	mtx_unlock(&malloc_mtx);
 
 	for (i = 0; i < count; i++)
 		(func)(bufmtp[i], arg);
 
 	free(bufmtp, M_TEMP);
 }
 
 #ifdef DDB
 static int64_t
 get_malloc_stats(const struct malloc_type_internal *mtip, uint64_t *allocs,
     uint64_t *inuse)
 {
 	const struct malloc_type_stats *mtsp;
 	uint64_t frees, alloced, freed;
 	int i;
 
 	*allocs = 0;
 	frees = 0;
 	alloced = 0;
 	freed = 0;
 	for (i = 0; i <= mp_maxid; i++) {
 		mtsp = zpcpu_get_cpu(mtip->mti_stats, i);
 
 		*allocs += mtsp->mts_numallocs;
 		frees += mtsp->mts_numfrees;
 		alloced += mtsp->mts_memalloced;
 		freed += mtsp->mts_memfreed;
 	}
 	*inuse = *allocs - frees;
 	return (alloced - freed);
 }
 
 DB_SHOW_COMMAND_FLAGS(malloc, db_show_malloc, DB_CMD_MEMSAFE)
 {
 	const char *fmt_hdr, *fmt_entry;
 	struct malloc_type *mtp;
 	uint64_t allocs, inuse;
 	int64_t size;
 	/* variables for sorting */
 	struct malloc_type *last_mtype, *cur_mtype;
 	int64_t cur_size, last_size;
 	int ties;
 
 	if (modif[0] == 'i') {
 		fmt_hdr = "%s,%s,%s,%s\n";
 		fmt_entry = "\"%s\",%ju,%jdK,%ju\n";
 	} else {
 		fmt_hdr = "%18s %12s  %12s %12s\n";
 		fmt_entry = "%18s %12ju %12jdK %12ju\n";
 	}
 
 	db_printf(fmt_hdr, "Type", "InUse", "MemUse", "Requests");
 
 	/* Select sort, largest size first. */
 	last_mtype = NULL;
 	last_size = INT64_MAX;
 	for (;;) {
 		cur_mtype = NULL;
 		cur_size = -1;
 		ties = 0;
 
 		for (mtp = kmemstatistics; mtp != NULL; mtp = mtp->ks_next) {
 			/*
 			 * In the case of size ties, print out mtypes
 			 * in the order they are encountered.  That is,
 			 * when we encounter the most recently output
 			 * mtype, we have already printed all preceding
 			 * ties, and we must print all following ties.
 			 */
 			if (mtp == last_mtype) {
 				ties = 1;
 				continue;
 			}
 			size = get_malloc_stats(&mtp->ks_mti, &allocs,
 			    &inuse);
 			if (size > cur_size && size < last_size + ties) {
 				cur_size = size;
 				cur_mtype = mtp;
 			}
 		}
 		if (cur_mtype == NULL)
 			break;
 
 		size = get_malloc_stats(&cur_mtype->ks_mti, &allocs, &inuse);
 		db_printf(fmt_entry, cur_mtype->ks_shortdesc, inuse,
 		    howmany(size, 1024), allocs);
 
 		if (db_pager_quit)
 			break;
 
 		last_mtype = cur_mtype;
 		last_size = cur_size;
 	}
 }
 
 #if MALLOC_DEBUG_MAXZONES > 1
 DB_SHOW_COMMAND(multizone_matches, db_show_multizone_matches)
 {
 	struct malloc_type_internal *mtip;
 	struct malloc_type *mtp;
 	u_int subzone;
 
 	if (!have_addr) {
 		db_printf("Usage: show multizone_matches <malloc type/addr>\n");
 		return;
 	}
 	mtp = (void *)addr;
 	if (mtp->ks_version != M_VERSION) {
 		db_printf("Version %lx does not match expected %x\n",
 		    mtp->ks_version, M_VERSION);
 		return;
 	}
 
 	mtip = &mtp->ks_mti;
 	subzone = mtip->mti_zone;
 
 	for (mtp = kmemstatistics; mtp != NULL; mtp = mtp->ks_next) {
 		mtip = &mtp->ks_mti;
 		if (mtip->mti_zone != subzone)
 			continue;
 		db_printf("%s\n", mtp->ks_shortdesc);
 		if (db_pager_quit)
 			break;
 	}
 }
 #endif /* MALLOC_DEBUG_MAXZONES > 1 */
 #endif /* DDB */
diff --git a/sys/powerpc/powernv/opal_nvram.c b/sys/powerpc/powernv/opal_nvram.c
index be1542897f14..571dc82fbc91 100644
--- a/sys/powerpc/powernv/opal_nvram.c
+++ b/sys/powerpc/powernv/opal_nvram.c
@@ -1,298 +1,297 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2019 Justin Hibbits
  *
  * 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.
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/disk.h>
 #include <sys/kernel.h>
 #include <sys/mutex.h>
 #include <sys/uio.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
 #include <machine/bus.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>
 #include <machine/resource.h>
 
 #include "opal.h"
 
 #include <sys/rman.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #define	NVRAM_BUFSIZE	(65536)	/* 64k blocks */
 
 struct opal_nvram_softc {
 	device_t	 sc_dev;
 	struct mtx	 sc_mtx;
 	uint32_t	 sc_size;
 	uint8_t		*sc_buf;
 	vm_paddr_t	 sc_buf_phys;
 
 	struct cdev 	*sc_cdev;
 	int		 sc_isopen;
 };
 
 #define	NVRAM_LOCK(sc)		mtx_lock(&sc->sc_mtx)
 #define	NVRAM_UNLOCK(sc)	mtx_unlock(&sc->sc_mtx)
 
 /*
  * Device interface.
  */
 static int		opal_nvram_probe(device_t);
 static int		opal_nvram_attach(device_t);
 static int		opal_nvram_detach(device_t);
 
 /*
  * Driver methods.
  */
 static device_method_t	opal_nvram_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		opal_nvram_probe),
 	DEVMETHOD(device_attach,	opal_nvram_attach),
 	DEVMETHOD(device_detach,	opal_nvram_detach),
 	{ 0, 0 }
 };
 
 static driver_t	opal_nvram_driver = {
 	"opal_nvram",
 	opal_nvram_methods,
 	sizeof(struct opal_nvram_softc)
 };
 
 DRIVER_MODULE(opal_nvram, opal, opal_nvram_driver, 0, 0);
 
 /*
  * Cdev methods.
  */
 
 static	d_open_t	opal_nvram_open;
 static	d_close_t	opal_nvram_close;
 static	d_read_t	opal_nvram_read;
 static	d_write_t	opal_nvram_write;
 static	d_ioctl_t	opal_nvram_ioctl;
 
 static struct cdevsw opal_nvram_cdevsw = {
 	.d_version =	D_VERSION,
 	.d_open =	opal_nvram_open,
 	.d_close =	opal_nvram_close,
 	.d_read =	opal_nvram_read,
 	.d_write =	opal_nvram_write,
 	.d_ioctl =	opal_nvram_ioctl,
 	.d_name =	"nvram",
 };
 
 static int
 opal_nvram_probe(device_t dev)
 {
 
 	if (!ofw_bus_is_compatible(dev, "ibm,opal-nvram"))
 		return (ENXIO);
 
 	device_set_desc(dev, "OPAL NVRAM");
 	return (BUS_PROBE_DEFAULT);
 }
 
 static int
 opal_nvram_attach(device_t dev)
 {
 	struct opal_nvram_softc *sc;
 	phandle_t node;
 	int err;
 
 	node = ofw_bus_get_node(dev);
 	sc = device_get_softc(dev);
 
 	sc->sc_dev = dev;
 
 	err = OF_getencprop(node, "#bytes", &sc->sc_size,
 	    sizeof(sc->sc_size));
 
 	if (err < 0)
 		return (ENXIO);
 
 	sc->sc_buf = contigmalloc(NVRAM_BUFSIZE, M_DEVBUF, M_WAITOK,
 	    0, BUS_SPACE_MAXADDR, PAGE_SIZE, 0);
 	if (sc->sc_buf == NULL) {
 		device_printf(dev, "No memory for buffer.\n");
 		return (ENXIO);
 	}
 	sc->sc_buf_phys = pmap_kextract((vm_offset_t)sc->sc_buf);
 	sc->sc_cdev = make_dev(&opal_nvram_cdevsw, 0, 0, 0, 0600,
 	    "nvram");
 	sc->sc_cdev->si_drv1 = sc;
 
 	mtx_init(&sc->sc_mtx, "opal_nvram", 0, MTX_DEF);
 
 	return (0);
 }
 
 static int
 opal_nvram_detach(device_t dev)
 {
 	struct opal_nvram_softc *sc;
 
 	sc = device_get_softc(dev);
 
 	if (sc->sc_cdev != NULL)
 		destroy_dev(sc->sc_cdev);
-	if (sc->sc_buf != NULL)
-		contigfree(sc->sc_buf, NVRAM_BUFSIZE, M_DEVBUF);
+	free(sc->sc_buf, M_DEVBUF);
 
 	mtx_destroy(&sc->sc_mtx);
 
 	return (0);
 }
 
 static int
 opal_nvram_open(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
 	struct opal_nvram_softc *sc = dev->si_drv1;
 	int err;
 
 	err = 0;
 
 	NVRAM_LOCK(sc);
 	if (sc->sc_isopen)
 		err = EBUSY;
 	else
 		sc->sc_isopen = 1;
 	NVRAM_UNLOCK(sc);
 
 	return (err);
 }
 
 static int
 opal_nvram_close(struct cdev *dev, int fflag, int devtype, struct thread *td)
 {
 	struct opal_nvram_softc *sc = dev->si_drv1;
 
 	NVRAM_LOCK(sc);
 	sc->sc_isopen = 0;
 	NVRAM_UNLOCK(sc);
 
 	return (0);
 }
 
 static int
 opal_nvram_read(struct cdev *dev, struct uio *uio, int ioflag)
 {
 	struct opal_nvram_softc *sc = dev->si_drv1;
 	int rv, amnt;
 
 	rv = 0;
 
 	NVRAM_LOCK(sc);
 	while (uio->uio_resid > 0) {
 		amnt = MIN(uio->uio_resid, sc->sc_size - uio->uio_offset);
 		amnt = MIN(amnt, NVRAM_BUFSIZE);
 		if (amnt == 0)
 			break;
 
 		rv = opal_call(OPAL_READ_NVRAM, sc->sc_buf_phys,
 		    amnt, uio->uio_offset);
 		if (rv != OPAL_SUCCESS) {
 			switch (rv) {
 			case OPAL_HARDWARE:
 				rv = EIO;
 				break;
 			case OPAL_PARAMETER:
 				rv = EINVAL;
 				break;
 			}
 			break;
 		}
 		rv = uiomove(sc->sc_buf, amnt, uio);
 		if (rv != 0)
 			break;
 	}
 	NVRAM_UNLOCK(sc);
 
 	return (rv);
 }
 
 static int
 opal_nvram_write(struct cdev *dev, struct uio *uio, int ioflag)
 {
 	off_t offset;
 	int rv, amnt;
 	struct opal_nvram_softc *sc = dev->si_drv1;
 
 	rv = 0;
 
 	NVRAM_LOCK(sc);
 	while (uio->uio_resid > 0) {
 		amnt = MIN(uio->uio_resid, sc->sc_size - uio->uio_offset);
 		amnt = MIN(amnt, NVRAM_BUFSIZE);
 		if (amnt == 0) {
 			rv = ENOSPC;
 			break;
 		}
 		offset = uio->uio_offset;
 		rv = uiomove(sc->sc_buf, amnt, uio);
 		if (rv != 0)
 			break;
 		rv = opal_call(OPAL_WRITE_NVRAM, sc->sc_buf_phys, amnt,
 		    offset);
 		if (rv != OPAL_SUCCESS) {
 			switch (rv) {
 			case OPAL_HARDWARE:
 				rv = EIO;
 				break;
 			case OPAL_PARAMETER:
 				rv = EINVAL;
 				break;
 			}
 			break;
 		}
 	}
 
 	NVRAM_UNLOCK(sc);
 
 	return (rv);
 }
 
 static int
 opal_nvram_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag,
     struct thread *td)
 {
 	struct opal_nvram_softc *sc = dev->si_drv1;
 
 	switch (cmd) {
 	case DIOCGMEDIASIZE:
 		*(off_t *)data = sc->sc_size;
 		return (0);
 	}
 	return (EINVAL);
 }
diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c
index 5f7f88041a67..34dcea8de9ee 100644
--- a/sys/powerpc/powerpc/busdma_machdep.c
+++ b/sys/powerpc/powerpc/busdma_machdep.c
@@ -1,785 +1,785 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997, 1998 Justin T. Gibbs.
  * 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,
  *    without modification, immediately at the beginning of the file.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
  * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 /*
  * From amd64/busdma_machdep.c, r204214
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/proc.h>
 #include <sys/memdesc.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 #include <sys/uio.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 
 #include <machine/atomic.h>
 #include <machine/bus.h>
 #include <machine/cpufunc.h>
 #include <machine/md_var.h>
 
 #include "iommu_if.h"
 
 #define MAX_BPAGES MIN(8192, physmem/40)
 
 struct bounce_page;
 struct bounce_zone;
 
 struct bus_dma_tag {
 	bus_size_t	  alignment;
 	bus_addr_t	  boundary;
 	bus_addr_t	  lowaddr;
 	bus_addr_t	  highaddr;
 	bus_size_t	  maxsize;
 	bus_size_t	  maxsegsz;
 	u_int		  nsegments;
 	int		  flags;
 	int		  map_count;
 	bus_dma_lock_t	 *lockfunc;
 	void		 *lockfuncarg;
 	struct bounce_zone *bounce_zone;
 	device_t	  iommu;
 	void		 *iommu_cookie;
 };
 
 static SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
     "Busdma parameters");
 
 struct bus_dmamap {
 	STAILQ_HEAD(, bounce_page) bpages;
 	int		       pagesneeded;
 	int		       pagesreserved;
 	bus_dma_tag_t	       dmat;
 	struct memdesc	       mem;
 	bus_dma_segment_t     *segments;
 	int		       nsegs;
 	bus_dmamap_callback_t *callback;
 	void		      *callback_arg;
 	__sbintime_t	       queued_time;
 	STAILQ_ENTRY(bus_dmamap) links;
 	int		       contigalloc;
 };
 
 static MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata");
 
 #define	dmat_alignment(dmat)	((dmat)->alignment)
 #define	dmat_bounce_flags(dmat)	(0)
 #define	dmat_boundary(dmat)	((dmat)->boundary)
 #define	dmat_flags(dmat)	((dmat)->flags)
 #define	dmat_highaddr(dmat)	((dmat)->highaddr)
 #define	dmat_lowaddr(dmat)	((dmat)->lowaddr)
 #define	dmat_lockfunc(dmat)	((dmat)->lockfunc)
 #define	dmat_lockfuncarg(dmat)	((dmat)->lockfuncarg)
 #define	dmat_maxsegsz(dmat)	((dmat)->maxsegsz)
 #define	dmat_nsegments(dmat)	((dmat)->nsegments)
 
 #include "../../kern/subr_busdma_bounce.c"
 
 /*
  * Returns true if the address falls within the tag's exclusion window, or
  * fails to meet its alignment requirements.
  */
 static __inline bool
 must_bounce(bus_dma_tag_t dmat, bus_addr_t paddr)
 {
 
 	if (dmat->iommu == NULL && paddr > dmat->lowaddr &&
 	    paddr <= dmat->highaddr)
 		return (true);
 	if (!vm_addr_align_ok(paddr, dmat->alignment))
 		return (true);
 
 	return (false);
 }
 
 #define BUS_DMA_COULD_BOUNCE	BUS_DMA_BUS3
 #define BUS_DMA_MIN_ALLOC_COMP	BUS_DMA_BUS4
 /*
  * Allocate a device specific dma_tag.
  */
 int
 bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
 		   bus_addr_t boundary, bus_addr_t lowaddr,
 		   bus_addr_t highaddr, bus_dma_filter_t *filter,
 		   void *filterarg, bus_size_t maxsize, int nsegments,
 		   bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
 		   void *lockfuncarg, bus_dma_tag_t *dmat)
 {
 	bus_dma_tag_t newtag;
 	int error = 0;
 
 	/* Basic sanity checking */
 	if (boundary != 0 && boundary < maxsegsz)
 		maxsegsz = boundary;
 
 	if (maxsegsz == 0) {
 		return (EINVAL);
 	}
 
 	/* Filters are no longer supported. */
 	if (filter != NULL || filterarg != NULL)
 		return (EINVAL);
 
 	/* Return a NULL tag on failure */
 	*dmat = NULL;
 
 	newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF,
 	    M_ZERO | M_NOWAIT);
 	if (newtag == NULL) {
 		CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
 		    __func__, newtag, 0, error);
 		return (ENOMEM);
 	}
 
 	newtag->alignment = alignment;
 	newtag->boundary = boundary;
 	newtag->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1);
 	newtag->highaddr = trunc_page((vm_paddr_t)highaddr) + (PAGE_SIZE - 1);
 	newtag->maxsize = maxsize;
 	newtag->nsegments = nsegments;
 	newtag->maxsegsz = maxsegsz;
 	newtag->flags = flags;
 	newtag->map_count = 0;
 	if (lockfunc != NULL) {
 		newtag->lockfunc = lockfunc;
 		newtag->lockfuncarg = lockfuncarg;
 	} else {
 		newtag->lockfunc = _busdma_dflt_lock;
 		newtag->lockfuncarg = NULL;
 	}
 
 	/* Take into account any restrictions imposed by our parent tag */
 	if (parent != NULL) {
 		newtag->lowaddr = MIN(parent->lowaddr, newtag->lowaddr);
 		newtag->highaddr = MAX(parent->highaddr, newtag->highaddr);
 		if (newtag->boundary == 0)
 			newtag->boundary = parent->boundary;
 		else if (parent->boundary != 0)
 			newtag->boundary = MIN(parent->boundary,
 					       newtag->boundary);
 
 		newtag->iommu = parent->iommu;
 		newtag->iommu_cookie = parent->iommu_cookie;
 	}
 
 	if (newtag->lowaddr < ptoa((vm_paddr_t)Maxmem) && newtag->iommu == NULL)
 		newtag->flags |= BUS_DMA_COULD_BOUNCE;
 
 	if (newtag->alignment > 1)
 		newtag->flags |= BUS_DMA_COULD_BOUNCE;
 
 	if (((newtag->flags & BUS_DMA_COULD_BOUNCE) != 0) &&
 	    (flags & BUS_DMA_ALLOCNOW) != 0) {
 		struct bounce_zone *bz;
 
 		/* Must bounce */
 
 		if ((error = alloc_bounce_zone(newtag)) != 0) {
 			free(newtag, M_DEVBUF);
 			return (error);
 		}
 		bz = newtag->bounce_zone;
 
 		if (ptoa(bz->total_bpages) < maxsize) {
 			int pages;
 
 			pages = atop(maxsize) - bz->total_bpages;
 
 			/* Add pages to our bounce pool */
 			if (alloc_bounce_pages(newtag, pages) < pages)
 				error = ENOMEM;
 		}
 		/* Performed initial allocation */
 		newtag->flags |= BUS_DMA_MIN_ALLOC_COMP;
 	}
 
 	if (error != 0) {
 		free(newtag, M_DEVBUF);
 	} else {
 		*dmat = newtag;
 	}
 	CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
 	    __func__, newtag, (newtag != NULL ? newtag->flags : 0), error);
 	return (error);
 }
 
 void
 bus_dma_template_clone(bus_dma_template_t *t, bus_dma_tag_t dmat)
 {
 
 	if (t == NULL || dmat == NULL)
 		return;
 
 	t->alignment = dmat->alignment;
 	t->boundary = dmat->boundary;
 	t->lowaddr = dmat->lowaddr;
 	t->highaddr = dmat->highaddr;
 	t->maxsize = dmat->maxsize;
 	t->nsegments = dmat->nsegments;
 	t->maxsegsize = dmat->maxsegsz;
 	t->flags = dmat->flags;
 	t->lockfunc = dmat->lockfunc;
 	t->lockfuncarg = dmat->lockfuncarg;
 }
 
 int
 bus_dma_tag_set_domain(bus_dma_tag_t dmat, int domain)
 {
 
 	return (0);
 }
 
 int
 bus_dma_tag_destroy(bus_dma_tag_t dmat)
 {
 	int error = 0;
 
 	if (dmat != NULL) {
 		if (dmat->map_count != 0) {
 			error = EBUSY;
 			goto out;
 		}
 
 		free(dmat, M_DEVBUF);
 	}
 out:
 	CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat, error);
 	return (error);
 }
 
 /*
  * Allocate a handle for mapping from kva/uva/physical
  * address space into bus device space.
  */
 int
 bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
 {
 	int error;
 
 	error = 0;
 
 	*mapp = (bus_dmamap_t)malloc(sizeof(**mapp), M_DEVBUF,
 				     M_NOWAIT | M_ZERO);
 	if (*mapp == NULL) {
 		CTR3(KTR_BUSDMA, "%s: tag %p error %d",
 		    __func__, dmat, ENOMEM);
 		return (ENOMEM);
 	}
 
 	/*
 	 * Bouncing might be required if the driver asks for an active
 	 * exclusion region, a data alignment that is stricter than 1, and/or
 	 * an active address boundary.
 	 */
 	if (dmat->flags & BUS_DMA_COULD_BOUNCE) {
 		/* Must bounce */
 		struct bounce_zone *bz;
 		int maxpages;
 
 		if (dmat->bounce_zone == NULL) {
 			if ((error = alloc_bounce_zone(dmat)) != 0)
 				return (error);
 		}
 		bz = dmat->bounce_zone;
 
 		/* Initialize the new map */
 		STAILQ_INIT(&((*mapp)->bpages));
 
 		/*
 		 * Attempt to add pages to our pool on a per-instance
 		 * basis up to a sane limit.
 		 */
 		if (dmat->alignment > 1)
 			maxpages = MAX_BPAGES;
 		else
 			maxpages = MIN(MAX_BPAGES, Maxmem -atop(dmat->lowaddr));
 		if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0
 		 || (bz->map_count > 0 && bz->total_bpages < maxpages)) {
 			int pages;
 
 			pages = MAX(atop(dmat->maxsize), 1);
 			pages = MIN(maxpages - bz->total_bpages, pages);
 			pages = MAX(pages, 1);
 			if (alloc_bounce_pages(dmat, pages) < pages)
 				error = ENOMEM;
 
 			if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0) {
 				if (error == 0)
 					dmat->flags |= BUS_DMA_MIN_ALLOC_COMP;
 			} else {
 				error = 0;
 			}
 		}
 		bz->map_count++;
 	}
 
 	(*mapp)->nsegs = 0;
 	(*mapp)->segments = (bus_dma_segment_t *)malloc(
 	    sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF,
 	    M_NOWAIT);
 	if ((*mapp)->segments == NULL) {
 		CTR3(KTR_BUSDMA, "%s: tag %p error %d",
 		    __func__, dmat, ENOMEM);
 		return (ENOMEM);
 	}
 
 	if (error == 0)
 		dmat->map_count++;
 	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 	    __func__, dmat, dmat->flags, error);
 	return (error);
 }
 
 /*
  * Destroy a handle for mapping from kva/uva/physical
  * address space into bus device space.
  */
 int
 bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
 	if (dmat->flags & BUS_DMA_COULD_BOUNCE) {
 		if (STAILQ_FIRST(&map->bpages) != NULL) {
 			CTR3(KTR_BUSDMA, "%s: tag %p error %d",
 			    __func__, dmat, EBUSY);
 			return (EBUSY);
 		}
 		if (dmat->bounce_zone)
 			dmat->bounce_zone->map_count--;
 	}
 	free(map->segments, M_DEVBUF);
 	free(map, M_DEVBUF);
 	dmat->map_count--;
 	CTR2(KTR_BUSDMA, "%s: tag %p error 0", __func__, dmat);
 	return (0);
 }
 
 /*
  * Allocate a piece of memory that can be efficiently mapped into
  * bus device space based on the constraints lited in the dma tag.
  * A dmamap to for use with dmamap_load is also allocated.
  */
 int
 bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 		 bus_dmamap_t *mapp)
 {
 	vm_memattr_t attr;
 	int mflags;
 
 	if (flags & BUS_DMA_NOWAIT)
 		mflags = M_NOWAIT;
 	else
 		mflags = M_WAITOK;
 
 	bus_dmamap_create(dmat, flags, mapp);
 
 	if (flags & BUS_DMA_ZERO)
 		mflags |= M_ZERO;
 	if (flags & BUS_DMA_NOCACHE)
 		attr = VM_MEMATTR_UNCACHEABLE;
 	else
 		attr = VM_MEMATTR_DEFAULT;
 
 	/* 
 	 * XXX:
 	 * (dmat->alignment <= dmat->maxsize) is just a quick hack; the exact
 	 * alignment guarantees of malloc need to be nailed down, and the
 	 * code below should be rewritten to take that into account.
 	 *
 	 * In the meantime, we'll warn the user if malloc gets it wrong.
 	 */
 	if ((dmat->maxsize <= PAGE_SIZE) &&
 	   (dmat->alignment <= dmat->maxsize) &&
 	    dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem) &&
 	    attr == VM_MEMATTR_DEFAULT) {
 		*vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags);
 	} else {
 		/*
 		 * XXX Use Contigmalloc until it is merged into this facility
 		 *     and handles multi-seg allocations.  Nobody is doing
 		 *     multi-seg allocations yet though.
 		 * XXX Certain AGP hardware does.
 		 */
 		*vaddr = kmem_alloc_contig(dmat->maxsize, mflags, 0ul,
 		    dmat->lowaddr, dmat->alignment ? dmat->alignment : 1ul,
 		    dmat->boundary, attr);
 		(*mapp)->contigalloc = 1;
 	}
 	if (*vaddr == NULL) {
 		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 		    __func__, dmat, dmat->flags, ENOMEM);
 		return (ENOMEM);
 	} else if (!vm_addr_align_ok(vtophys(*vaddr), dmat->alignment)) {
 		printf("bus_dmamem_alloc failed to align memory properly.\n");
 	}
 	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 	    __func__, dmat, dmat->flags, 0);
 	return (0);
 }
 
 /*
  * Free a piece of memory and it's allociated dmamap, that was allocated
- * via bus_dmamem_alloc.  Make the same choice for free/contigfree.
+ * via bus_dmamem_alloc.
  */
 void
 bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
 {
 
 	if (!map->contigalloc)
 		free(vaddr, M_DEVBUF);
 	else
 		kmem_free(vaddr, dmat->maxsize);
 	bus_dmamap_destroy(dmat, map);
 	CTR3(KTR_BUSDMA, "%s: tag %p flags 0x%x", __func__, dmat, dmat->flags);
 }
 
 static void
 _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf,
     bus_size_t buflen, int flags)
 {
 	bus_addr_t curaddr;
 	bus_size_t sgsize;
 
 	if (map->pagesneeded == 0) {
 		CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, "
 		    "alignment= %d", dmat->lowaddr, ptoa((vm_paddr_t)Maxmem),
 		    dmat->boundary, dmat->alignment);
 		CTR2(KTR_BUSDMA, "map= %p, pagesneeded= %d", map, map->pagesneeded);
 		/*
 		 * Count the number of bounce pages
 		 * needed in order to complete this transfer
 		 */
 		curaddr = buf;
 		while (buflen != 0) {
 			sgsize = buflen;
 			if (must_bounce(dmat, curaddr)) {
 				sgsize = MIN(sgsize,
 				    PAGE_SIZE - (curaddr & PAGE_MASK));
 				map->pagesneeded++;
 			}
 			curaddr += sgsize;
 			buflen -= sgsize;
 		}
 		CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
 	}
 }
 
 static void
 _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap,
     void *buf, bus_size_t buflen, int flags)
 {
         vm_offset_t vaddr;
         vm_offset_t vendaddr;
         bus_addr_t paddr;
 
 	if (map->pagesneeded == 0) {
 		CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, "
 		    "alignment= %d", dmat->lowaddr, ptoa((vm_paddr_t)Maxmem),
 		    dmat->boundary, dmat->alignment);
 		CTR2(KTR_BUSDMA, "map= %p, pagesneeded= %d", map, map->pagesneeded);
 		/*
 		 * Count the number of bounce pages
 		 * needed in order to complete this transfer
 		 */
 		vaddr = (vm_offset_t)buf;
 		vendaddr = (vm_offset_t)buf + buflen;
 
 		while (vaddr < vendaddr) {
 			bus_size_t sg_len;
 
 			sg_len = MIN(vendaddr - vaddr,
 			    PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK));
 			if (pmap == kernel_pmap)
 				paddr = pmap_kextract(vaddr);
 			else
 				paddr = pmap_extract(pmap, vaddr);
 			if (must_bounce(dmat, paddr)) {
 				sg_len = roundup2(sg_len, dmat->alignment);
 				map->pagesneeded++;
 			}
 			vaddr += sg_len;
 		}
 		CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
 	}
 }
 
 /*
  * Utility function to load a physical buffer.  segp contains
  * the starting segment on entrace, and the ending segment on exit.
  */
 int
 _bus_dmamap_load_phys(bus_dma_tag_t dmat,
 		      bus_dmamap_t map,
 		      vm_paddr_t buf, bus_size_t buflen,
 		      int flags,
 		      bus_dma_segment_t *segs,
 		      int *segp)
 {
 	bus_addr_t curaddr;
 	bus_size_t sgsize;
 	int error;
 
 	if (segs == NULL)
 		segs = map->segments;
 
 	if ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) {
 		_bus_dmamap_count_phys(dmat, map, buf, buflen, flags);
 		if (map->pagesneeded != 0) {
 			error = _bus_dmamap_reserve_pages(dmat, map, flags);
 			if (error)
 				return (error);
 		}
 	}
 
 	while (buflen > 0) {
 		curaddr = buf;
 		sgsize = buflen;
 		if (map->pagesneeded != 0 && must_bounce(dmat, curaddr)) {
 			sgsize = MIN(sgsize, PAGE_SIZE - (curaddr & PAGE_MASK));
 			curaddr = add_bounce_page(dmat, map, 0, curaddr,
 			    sgsize);
 		}
 		if (!_bus_dmamap_addsegs(dmat, map, curaddr, sgsize, segs,
 		    segp))
 			break;
 		buf += sgsize;
 		buflen -= sgsize;
 	}
 
 	/*
 	 * Did we fit?
 	 */
 	return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */
 }
 
 int
 _bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map,
     struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags,
     bus_dma_segment_t *segs, int *segp)
 {
 
 	return (bus_dmamap_load_ma_triv(dmat, map, ma, tlen, ma_offs, flags,
 	    segs, segp));
 }
 
 /*
  * Utility function to load a linear buffer.  segp contains
  * the starting segment on entrance, and the ending segment on exit.
  */
 int
 _bus_dmamap_load_buffer(bus_dma_tag_t dmat,
     			bus_dmamap_t map,
 			void *buf, bus_size_t buflen,
 			pmap_t pmap,
 			int flags,
 			bus_dma_segment_t *segs,
 			int *segp)
 {
 	bus_size_t sgsize;
 	bus_addr_t curaddr;
 	vm_offset_t kvaddr, vaddr;
 	int error;
 
 	if (segs == NULL)
 		segs = map->segments;
 
 	if ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) {
 		_bus_dmamap_count_pages(dmat, map, pmap, buf, buflen, flags);
 		if (map->pagesneeded != 0) {
 			error = _bus_dmamap_reserve_pages(dmat, map, flags);
 			if (error)
 				return (error);
 		}
 	}
 
 	vaddr = (vm_offset_t)buf;
 
 	while (buflen > 0) {
 		/*
 		 * Get the physical address for this segment.
 		 */
 		if (pmap == kernel_pmap) {
 			curaddr = pmap_kextract(vaddr);
 			kvaddr = vaddr;
 		} else {
 			curaddr = pmap_extract(pmap, vaddr);
 			kvaddr = 0;
 		}
 
 		/*
 		 * Compute the segment size, and adjust counts.
 		 */
 		sgsize = MIN(buflen, PAGE_SIZE - (curaddr & PAGE_MASK));
 		if (map->pagesneeded != 0 && must_bounce(dmat, curaddr)) {
 			sgsize = roundup2(sgsize, dmat->alignment);
 			curaddr = add_bounce_page(dmat, map, kvaddr, curaddr,
 			    sgsize);
 		}
 
 		if (!_bus_dmamap_addsegs(dmat, map, curaddr, sgsize, segs,
 		    segp))
 			break;
 		vaddr += sgsize;
 		buflen -= MIN(sgsize, buflen); /* avoid underflow */
 	}
 
 	/*
 	 * Did we fit?
 	 */
 	return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */
 }
 
 void
 _bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap_t map,
 		    struct memdesc *mem, bus_dmamap_callback_t *callback,
 		    void *callback_arg)
 {
 
 	if (dmat->flags & BUS_DMA_COULD_BOUNCE) {
 		map->dmat = dmat;
 		map->mem = *mem;
 		map->callback = callback;
 		map->callback_arg = callback_arg;
 	}
 }
 
 bus_dma_segment_t *
 _bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map,
 		     bus_dma_segment_t *segs, int nsegs, int error)
 {
 
 	map->nsegs = nsegs;
 	if (segs != NULL)
 		memcpy(map->segments, segs, map->nsegs*sizeof(segs[0]));
 	if (dmat->iommu != NULL)
 		IOMMU_MAP(dmat->iommu, map->segments, &map->nsegs,
 		    dmat->lowaddr, dmat->highaddr, dmat->alignment,
 		    dmat->boundary, dmat->iommu_cookie);
 
 	if (segs != NULL)
 		memcpy(segs, map->segments, map->nsegs*sizeof(segs[0]));
 	else
 		segs = map->segments;
 
 	return (segs);
 }
 
 /*
  * Release the mapping held by map.
  */
 void
 bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
 	if (dmat->iommu) {
 		IOMMU_UNMAP(dmat->iommu, map->segments, map->nsegs, dmat->iommu_cookie);
 		map->nsegs = 0;
 	}
 
 	free_bounce_pages(dmat, map);
 }
 
 void
 bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
 {
 	struct bounce_page *bpage;
 	vm_offset_t datavaddr, tempvaddr;
 
 	if ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) {
 		/*
 		 * Handle data bouncing.  We might also
 		 * want to add support for invalidating
 		 * the caches on broken hardware
 		 */
 		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x op 0x%x "
 		    "performing bounce", __func__, dmat, dmat->flags, op);
 
 		if (op & BUS_DMASYNC_PREWRITE) {
 			while (bpage != NULL) {
 				tempvaddr = 0;
 				datavaddr = bpage->datavaddr;
 				if (datavaddr == 0) {
 					tempvaddr = pmap_quick_enter_page(
 					    bpage->datapage);
 					datavaddr = tempvaddr |
 					    bpage->dataoffs;
 				}
 
 				bcopy((void *)datavaddr,
 				    (void *)bpage->vaddr, bpage->datacount);
 
 				if (tempvaddr != 0)
 					pmap_quick_remove_page(tempvaddr);
 				bpage = STAILQ_NEXT(bpage, links);
 			}
 			dmat->bounce_zone->total_bounced++;
 		}
 
 		if (op & BUS_DMASYNC_POSTREAD) {
 			while (bpage != NULL) {
 				tempvaddr = 0;
 				datavaddr = bpage->datavaddr;
 				if (datavaddr == 0) {
 					tempvaddr = pmap_quick_enter_page(
 					    bpage->datapage);
 					datavaddr = tempvaddr |
 					    bpage->dataoffs;
 				}
 
 				bcopy((void *)bpage->vaddr,
 				    (void *)datavaddr, bpage->datacount);
 
 				if (tempvaddr != 0)
 					pmap_quick_remove_page(tempvaddr);
 				bpage = STAILQ_NEXT(bpage, links);
 			}
 			dmat->bounce_zone->total_bounced++;
 		}
 	}
 
 	powerpc_sync();
 }
 
 int
 bus_dma_tag_set_iommu(bus_dma_tag_t tag, device_t iommu, void *cookie)
 {
 	tag->iommu = iommu;
 	tag->iommu_cookie = cookie;
 
 	return (0);
 }
diff --git a/sys/riscv/include/bus_dma.h b/sys/riscv/include/bus_dma.h
index a29a3cd26195..b8f2a6f0fc88 100644
--- a/sys/riscv/include/bus_dma.h
+++ b/sys/riscv/include/bus_dma.h
@@ -1,140 +1,140 @@
 
 #ifndef _MACHINE_BUS_DMA_H_
 #define	_MACHINE_BUS_DMA_H_
 
 #define WANT_INLINE_DMAMAP
 #include <sys/bus_dma.h>
 
 #include <machine/bus_dma_impl.h>
 
 /*
  * Allocate a handle for mapping from kva/uva/physical
  * address space into bus device space.
  */
 static inline int
 bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->map_create(dmat, flags, mapp));
 }
 
 /*
  * Destroy a handle for mapping from kva/uva/physical
  * address space into bus device space.
  */
 static inline int
 bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->map_destroy(dmat, map));
 }
 
 /*
  * Allocate a piece of memory that can be efficiently mapped into
  * bus device space based on the constraints listed in the dma tag.
  * A dmamap to for use with dmamap_load is also allocated.
  */
 static inline int
 bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
     bus_dmamap_t *mapp)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->mem_alloc(dmat, vaddr, flags, mapp));
 }
 
 /*
  * Free a piece of memory and it's allociated dmamap, that was allocated
- * via bus_dmamem_alloc.  Make the same choice for free/contigfree.
+ * via bus_dmamem_alloc.
  */
 static inline void
 bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	tc->impl->mem_free(dmat, vaddr, map);
 }
 
 /*
  * Release the mapping held by map.
  */
 static inline void
 bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	tc->impl->map_unload(dmat, map);
 }
 
 static inline void
 bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	tc->impl->map_sync(dmat, map, op);
 }
 
 static inline int
 _bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf,
     bus_size_t buflen, int flags, bus_dma_segment_t *segs, int *segp)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->load_phys(dmat, map, buf, buflen, flags, segs,
 	    segp));
 }
 
 static inline int
 _bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map, struct vm_page **ma,
     bus_size_t tlen, int ma_offs, int flags, bus_dma_segment_t *segs,
     int *segp)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->load_ma(dmat, map, ma, tlen, ma_offs, flags,
 	    segs, segp));
 }
 
 static inline int
 _bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
     bus_size_t buflen, struct pmap *pmap, int flags, bus_dma_segment_t *segs,
     int *segp)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->load_buffer(dmat, map, buf, buflen, pmap, flags, segs,
 	    segp));
 }
 
 static inline void
 _bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap_t map,
     struct memdesc *mem, bus_dmamap_callback_t *callback, void *callback_arg)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	tc->impl->map_waitok(dmat, map, mem, callback, callback_arg);
 }
 
 static inline bus_dma_segment_t *
 _bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map,
     bus_dma_segment_t *segs, int nsegs, int error)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->map_complete(dmat, map, segs, nsegs, error));
 }
 
 #endif /* !_MACHINE_BUS_DMA_H_ */
diff --git a/sys/riscv/riscv/busdma_bounce.c b/sys/riscv/riscv/busdma_bounce.c
index 68525bb742bc..f652f08bf5dc 100644
--- a/sys/riscv/riscv/busdma_bounce.c
+++ b/sys/riscv/riscv/busdma_bounce.c
@@ -1,937 +1,937 @@
 /*-
  * Copyright (c) 1997, 1998 Justin T. Gibbs.
  * Copyright (c) 2015-2016 The FreeBSD Foundation
  * All rights reserved.
  *
  * Portions of this software were developed by Andrew Turner
  * under sponsorship of the FreeBSD Foundation.
  *
  * Portions of this software were developed by Semihalf
  * under sponsorship of the FreeBSD Foundation.
  *
  * 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,
  *    without modification, immediately at the beginning of the file.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
  * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/proc.h>
 #include <sys/memdesc.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 #include <sys/uio.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 
 #include <machine/atomic.h>
 #include <machine/bus.h>
 #include <machine/md_var.h>
 #include <machine/bus_dma_impl.h>
 
 #define MAX_BPAGES 4096
 
 enum {
 	BF_COULD_BOUNCE		= 0x01,
 	BF_MIN_ALLOC_COMP	= 0x02,
 	BF_KMEM_ALLOC		= 0x04,
 	BF_COHERENT		= 0x10,
 };
 
 struct bounce_page;
 struct bounce_zone;
 
 struct bus_dma_tag {
 	struct bus_dma_tag_common common;
 	int			map_count;
 	int			bounce_flags;
 	bus_dma_segment_t	*segments;
 	struct bounce_zone	*bounce_zone;
 };
 
 static SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
     "Busdma parameters");
 
 struct sync_list {
 	vm_offset_t	vaddr;		/* kva of client data */
 	bus_addr_t	paddr;		/* physical address */
 	vm_page_t	pages;		/* starting page of client data */
 	bus_size_t	datacount;	/* client data count */
 };
 
 struct bus_dmamap {
 	STAILQ_HEAD(, bounce_page) bpages;
 	int		       pagesneeded;
 	int		       pagesreserved;
 	bus_dma_tag_t	       dmat;
 	struct memdesc	       mem;
 	bus_dmamap_callback_t *callback;
 	void		      *callback_arg;
 	__sbintime_t	       queued_time;
 	STAILQ_ENTRY(bus_dmamap) links;
 	u_int			flags;
 #define	DMAMAP_COULD_BOUNCE	(1 << 0)
 #define	DMAMAP_FROM_DMAMEM	(1 << 1)
 	int			sync_count;
 	struct sync_list	slist[];
 };
 
 static void _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
     pmap_t pmap, void *buf, bus_size_t buflen, int flags);
 static void _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map,
     vm_paddr_t buf, bus_size_t buflen, int flags);
 
 static MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata");
 
 #define	dmat_alignment(dmat)	((dmat)->common.alignment)
 #define	dmat_bounce_flags(dmat)	((dmat)->bounce_flags)
 #define	dmat_boundary(dmat)	((dmat)->common.boundary)
 #define	dmat_flags(dmat)	((dmat)->common.flags)
 #define	dmat_highaddr(dmat)	((dmat)->common.highaddr)
 #define	dmat_lowaddr(dmat)	((dmat)->common.lowaddr)
 #define	dmat_lockfunc(dmat)	((dmat)->common.lockfunc)
 #define	dmat_lockfuncarg(dmat)	((dmat)->common.lockfuncarg)
 #define	dmat_maxsegsz(dmat)	((dmat)->common.maxsegsz)
 #define	dmat_nsegments(dmat)	((dmat)->common.nsegments)
 
 #include "../../kern/subr_busdma_bounce.c"
 
 /*
  * Allocate a device specific dma_tag.
  */
 static int
 bounce_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
     bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr,
     bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags,
     bus_dma_lock_t *lockfunc, void *lockfuncarg, bus_dma_tag_t *dmat)
 {
 	bus_dma_tag_t newtag;
 	int error;
 
 	*dmat = NULL;
 	error = common_bus_dma_tag_create(parent != NULL ? &parent->common :
 	    NULL, alignment, boundary, lowaddr, highaddr, maxsize, nsegments,
 	    maxsegsz, flags, lockfunc, lockfuncarg,
 	    sizeof (struct bus_dma_tag), (void **)&newtag);
 	if (error != 0)
 		return (error);
 
 	newtag->common.impl = &bus_dma_bounce_impl;
 	newtag->map_count = 0;
 	newtag->segments = NULL;
 
 	if ((flags & BUS_DMA_COHERENT) != 0)
 		newtag->bounce_flags |= BF_COHERENT;
 
 	if (parent != NULL) {
 		if ((parent->bounce_flags & BF_COULD_BOUNCE) != 0)
 			newtag->bounce_flags |= BF_COULD_BOUNCE;
 
 		/* Copy some flags from the parent */
 		newtag->bounce_flags |= parent->bounce_flags & BF_COHERENT;
 	}
 
 	if (newtag->common.lowaddr < ptoa((vm_paddr_t)Maxmem) ||
 	    newtag->common.alignment > 1)
 		newtag->bounce_flags |= BF_COULD_BOUNCE;
 
 	if (((newtag->bounce_flags & BF_COULD_BOUNCE) != 0) &&
 	    (flags & BUS_DMA_ALLOCNOW) != 0) {
 		struct bounce_zone *bz;
 
 		/* Must bounce */
 		if ((error = alloc_bounce_zone(newtag)) != 0) {
 			free(newtag, M_DEVBUF);
 			return (error);
 		}
 		bz = newtag->bounce_zone;
 
 		if (ptoa(bz->total_bpages) < maxsize) {
 			int pages;
 
 			pages = atop(round_page(maxsize)) - bz->total_bpages;
 
 			/* Add pages to our bounce pool */
 			if (alloc_bounce_pages(newtag, pages) < pages)
 				error = ENOMEM;
 		}
 		/* Performed initial allocation */
 		newtag->bounce_flags |= BF_MIN_ALLOC_COMP;
 	} else
 		error = 0;
 
 	if (error != 0)
 		free(newtag, M_DEVBUF);
 	else
 		*dmat = newtag;
 	CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
 	    __func__, newtag, (newtag != NULL ? newtag->common.flags : 0),
 	    error);
 	return (error);
 }
 
 static int
 bounce_bus_dma_tag_destroy(bus_dma_tag_t dmat)
 {
 	int error = 0;
 
 	if (dmat != NULL) {
 		if (dmat->map_count != 0) {
 			error = EBUSY;
 			goto out;
 		}
 		if (dmat->segments != NULL)
 			free(dmat->segments, M_DEVBUF);
 		free(dmat, M_DEVBUF);
 	}
 out:
 	CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat, error);
 	return (error);
 }
 
 static bus_dmamap_t
 alloc_dmamap(bus_dma_tag_t dmat, int flags)
 {
 	u_long mapsize;
 	bus_dmamap_t map;
 
 	mapsize = sizeof(*map);
 	mapsize += sizeof(struct sync_list) * dmat->common.nsegments;
 	map = malloc(mapsize, M_DEVBUF, flags | M_ZERO);
 	if (map == NULL)
 		return (NULL);
 
 	/* Initialize the new map */
 	STAILQ_INIT(&map->bpages);
 
 	return (map);
 }
 
 /*
  * Allocate a handle for mapping from kva/uva/physical
  * address space into bus device space.
  */
 static int
 bounce_bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
 {
 	struct bounce_zone *bz;
 	int error, maxpages, pages;
 
 	error = 0;
 
 	if (dmat->segments == NULL) {
 		dmat->segments = (bus_dma_segment_t *)malloc(
 		    sizeof(bus_dma_segment_t) * dmat->common.nsegments,
 		    M_DEVBUF, M_NOWAIT);
 		if (dmat->segments == NULL) {
 			CTR3(KTR_BUSDMA, "%s: tag %p error %d",
 			    __func__, dmat, ENOMEM);
 			return (ENOMEM);
 		}
 	}
 
 	*mapp = alloc_dmamap(dmat, M_NOWAIT);
 	if (*mapp == NULL) {
 		CTR3(KTR_BUSDMA, "%s: tag %p error %d",
 		    __func__, dmat, ENOMEM);
 		return (ENOMEM);
 	}
 
 	/*
 	 * Bouncing might be required if the driver asks for an active
 	 * exclusion region, a data alignment that is stricter than 1, and/or
 	 * an active address boundary.
 	 */
 	if (dmat->bounce_flags & BF_COULD_BOUNCE) {
 		/* Must bounce */
 		if (dmat->bounce_zone == NULL) {
 			if ((error = alloc_bounce_zone(dmat)) != 0) {
 				free(*mapp, M_DEVBUF);
 				return (error);
 			}
 		}
 		bz = dmat->bounce_zone;
 
 		(*mapp)->flags = DMAMAP_COULD_BOUNCE;
 
 		/*
 		 * Attempt to add pages to our pool on a per-instance
 		 * basis up to a sane limit.
 		 */
 		if (dmat->common.alignment > 1)
 			maxpages = MAX_BPAGES;
 		else
 			maxpages = MIN(MAX_BPAGES, Maxmem -
 			    atop(dmat->common.lowaddr));
 		if ((dmat->bounce_flags & BF_MIN_ALLOC_COMP) == 0 ||
 		    (bz->map_count > 0 && bz->total_bpages < maxpages)) {
 			pages = MAX(atop(dmat->common.maxsize), 1);
 			pages = MIN(maxpages - bz->total_bpages, pages);
 			pages = MAX(pages, 1);
 			if (alloc_bounce_pages(dmat, pages) < pages)
 				error = ENOMEM;
 			if ((dmat->bounce_flags & BF_MIN_ALLOC_COMP)
 			    == 0) {
 				if (error == 0) {
 					dmat->bounce_flags |=
 					    BF_MIN_ALLOC_COMP;
 				}
 			} else
 				error = 0;
 		}
 		bz->map_count++;
 	}
 	if (error == 0)
 		dmat->map_count++;
 	else
 		free(*mapp, M_DEVBUF);
 	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 	    __func__, dmat, dmat->common.flags, error);
 	return (error);
 }
 
 /*
  * Destroy a handle for mapping from kva/uva/physical
  * address space into bus device space.
  */
 static int
 bounce_bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
 
 	/* Check we are destroying the correct map type */
 	if ((map->flags & DMAMAP_FROM_DMAMEM) != 0)
 		panic("bounce_bus_dmamap_destroy: Invalid map freed\n");
 
 	if (STAILQ_FIRST(&map->bpages) != NULL || map->sync_count != 0) {
 		CTR3(KTR_BUSDMA, "%s: tag %p error %d", __func__, dmat, EBUSY);
 		return (EBUSY);
 	}
 	if (dmat->bounce_zone) {
 		KASSERT((map->flags & DMAMAP_COULD_BOUNCE) != 0,
 		    ("%s: Bounce zone when cannot bounce", __func__));
 		dmat->bounce_zone->map_count--;
 	}
 	free(map, M_DEVBUF);
 	dmat->map_count--;
 	CTR2(KTR_BUSDMA, "%s: tag %p error 0", __func__, dmat);
 	return (0);
 }
 
 /*
  * Allocate a piece of memory that can be efficiently mapped into
  * bus device space based on the constraints lited in the dma tag.
  * A dmamap to for use with dmamap_load is also allocated.
  */
 static int
 bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
     bus_dmamap_t *mapp)
 {
 	/*
 	 * XXX ARM64TODO:
 	 * This bus_dma implementation requires IO-Coherent architecutre.
 	 * If IO-Coherency is not guaranteed, the BUS_DMA_COHERENT flag has
 	 * to be implented using non-cacheable memory.
 	 */
 
 	vm_memattr_t attr;
 	int mflags;
 
 	if (flags & BUS_DMA_NOWAIT)
 		mflags = M_NOWAIT;
 	else
 		mflags = M_WAITOK;
 
 	if (dmat->segments == NULL) {
 		dmat->segments = (bus_dma_segment_t *)malloc(
 		    sizeof(bus_dma_segment_t) * dmat->common.nsegments,
 		    M_DEVBUF, mflags);
 		if (dmat->segments == NULL) {
 			CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 			    __func__, dmat, dmat->common.flags, ENOMEM);
 			return (ENOMEM);
 		}
 	}
 	if (flags & BUS_DMA_ZERO)
 		mflags |= M_ZERO;
 	if (flags & BUS_DMA_NOCACHE)
 		attr = VM_MEMATTR_UNCACHEABLE;
 	else if ((flags & BUS_DMA_COHERENT) != 0 &&
 	    (dmat->bounce_flags & BF_COHERENT) == 0)
 		/*
 		 * If we have a non-coherent tag, and are trying to allocate
 		 * a coherent block of memory it needs to be uncached.
 		 */
 		attr = VM_MEMATTR_UNCACHEABLE;
 	else
 		attr = VM_MEMATTR_DEFAULT;
 
 	/*
 	 * Create the map, but don't set the could bounce flag as
 	 * this allocation should never bounce;
 	 */
 	*mapp = alloc_dmamap(dmat, mflags);
 	if (*mapp == NULL) {
 		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 		    __func__, dmat, dmat->common.flags, ENOMEM);
 		return (ENOMEM);
 	}
 	(*mapp)->flags = DMAMAP_FROM_DMAMEM;
 
 	/*
 	 * Allocate the buffer from the malloc(9) allocator if...
 	 *  - It's small enough to fit into a single power of two sized bucket.
 	 *  - The alignment is less than or equal to the maximum size
 	 *  - The low address requirement is fulfilled.
 	 * else allocate non-contiguous pages if...
 	 *  - The page count that could get allocated doesn't exceed
 	 *    nsegments also when the maximum segment size is less
 	 *    than PAGE_SIZE.
 	 *  - The alignment constraint isn't larger than a page boundary.
 	 *  - There are no boundary-crossing constraints.
 	 * else allocate a block of contiguous pages because one or more of the
 	 * constraints is something that only the contig allocator can fulfill.
 	 *
 	 * NOTE: The (dmat->common.alignment <= dmat->maxsize) check
 	 * below is just a quick hack. The exact alignment guarantees
 	 * of malloc(9) need to be nailed down, and the code below
 	 * should be rewritten to take that into account.
 	 *
 	 * In the meantime warn the user if malloc gets it wrong.
 	 */
 	if ((dmat->common.maxsize <= PAGE_SIZE) &&
 	   (dmat->common.alignment <= dmat->common.maxsize) &&
 	    dmat->common.lowaddr >= ptoa((vm_paddr_t)Maxmem) &&
 	    attr == VM_MEMATTR_DEFAULT) {
 		*vaddr = malloc(dmat->common.maxsize, M_DEVBUF, mflags);
 	} else if (dmat->common.nsegments >=
 	    howmany(dmat->common.maxsize, MIN(dmat->common.maxsegsz, PAGE_SIZE)) &&
 	    dmat->common.alignment <= PAGE_SIZE &&
 	    (dmat->common.boundary % PAGE_SIZE) == 0) {
 		/* Page-based multi-segment allocations allowed */
 		*vaddr = kmem_alloc_attr(dmat->common.maxsize, mflags,
 		    0ul, dmat->common.lowaddr, attr);
 		dmat->bounce_flags |= BF_KMEM_ALLOC;
 	} else {
 		*vaddr = kmem_alloc_contig(dmat->common.maxsize, mflags,
 		    0ul, dmat->common.lowaddr, dmat->common.alignment != 0 ?
 		    dmat->common.alignment : 1ul, dmat->common.boundary, attr);
 		dmat->bounce_flags |= BF_KMEM_ALLOC;
 	}
 	if (*vaddr == NULL) {
 		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 		    __func__, dmat, dmat->common.flags, ENOMEM);
 		free(*mapp, M_DEVBUF);
 		return (ENOMEM);
 	} else if (!vm_addr_align_ok(vtophys(*vaddr), dmat->common.alignment)) {
 		printf("bus_dmamem_alloc failed to align memory properly.\n");
 	}
 	dmat->map_count++;
 	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 	    __func__, dmat, dmat->common.flags, 0);
 	return (0);
 }
 
 /*
  * Free a piece of memory and it's allociated dmamap, that was allocated
- * via bus_dmamem_alloc.  Make the same choice for free/contigfree.
+ * via bus_dmamem_alloc.
  */
 static void
 bounce_bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
 {
 
 	/*
 	 * Check the map came from bounce_bus_dmamem_alloc, so the map
 	 * should be NULL and the BF_KMEM_ALLOC flag cleared if malloc()
 	 * was used and set if kmem_alloc_contig() was used.
 	 */
 	if ((map->flags & DMAMAP_FROM_DMAMEM) == 0)
 		panic("bus_dmamem_free: Invalid map freed\n");
 	if ((dmat->bounce_flags & BF_KMEM_ALLOC) == 0)
 		free(vaddr, M_DEVBUF);
 	else
 		kmem_free(vaddr, dmat->common.maxsize);
 	free(map, M_DEVBUF);
 	dmat->map_count--;
 	CTR3(KTR_BUSDMA, "%s: tag %p flags 0x%x", __func__, dmat,
 	    dmat->bounce_flags);
 }
 
 static void
 _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf,
     bus_size_t buflen, int flags)
 {
 	bus_addr_t curaddr;
 	bus_size_t sgsize;
 
 	if ((map->flags & DMAMAP_COULD_BOUNCE) != 0 && map->pagesneeded == 0) {
 		/*
 		 * Count the number of bounce pages
 		 * needed in order to complete this transfer
 		 */
 		curaddr = buf;
 		while (buflen != 0) {
 			sgsize = buflen;
 			if (addr_needs_bounce(dmat, curaddr)) {
 				sgsize = MIN(sgsize,
 				    PAGE_SIZE - (curaddr & PAGE_MASK));
 				map->pagesneeded++;
 			}
 			curaddr += sgsize;
 			buflen -= sgsize;
 		}
 		CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
 	}
 }
 
 static void
 _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap,
     void *buf, bus_size_t buflen, int flags)
 {
 	vm_offset_t vaddr;
 	vm_offset_t vendaddr;
 	bus_addr_t paddr;
 	bus_size_t sg_len;
 
 	if ((map->flags & DMAMAP_COULD_BOUNCE) != 0 && map->pagesneeded == 0) {
 		CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, "
 		    "alignment= %d", dmat->common.lowaddr,
 		    ptoa((vm_paddr_t)Maxmem),
 		    dmat->common.boundary, dmat->common.alignment);
 		CTR2(KTR_BUSDMA, "map= %p, pagesneeded= %d", map,
 		    map->pagesneeded);
 		/*
 		 * Count the number of bounce pages
 		 * needed in order to complete this transfer
 		 */
 		vaddr = (vm_offset_t)buf;
 		vendaddr = (vm_offset_t)buf + buflen;
 
 		while (vaddr < vendaddr) {
 			sg_len = MIN(vendaddr - vaddr,
 			    PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK));
 			if (pmap == kernel_pmap)
 				paddr = pmap_kextract(vaddr);
 			else
 				paddr = pmap_extract(pmap, vaddr);
 			if (addr_needs_bounce(dmat, paddr)) {
 				sg_len = roundup2(sg_len,
 				    dmat->common.alignment);
 				map->pagesneeded++;
 			}
 			vaddr += sg_len;
 		}
 		CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
 	}
 }
 
 /*
  * Utility function to load a physical buffer.  segp contains
  * the starting segment on entrace, and the ending segment on exit.
  */
 static int
 bounce_bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map,
     vm_paddr_t buf, bus_size_t buflen, int flags, bus_dma_segment_t *segs,
     int *segp)
 {
 	struct sync_list *sl;
 	bus_size_t sgsize;
 	bus_addr_t curaddr, sl_end;
 	int error;
 
 	if (segs == NULL)
 		segs = dmat->segments;
 
 	if ((dmat->bounce_flags & BF_COULD_BOUNCE) != 0) {
 		_bus_dmamap_count_phys(dmat, map, buf, buflen, flags);
 		if (map->pagesneeded != 0) {
 			error = _bus_dmamap_reserve_pages(dmat, map, flags);
 			if (error)
 				return (error);
 		}
 	}
 
 	sl = map->slist + map->sync_count - 1;
 	sl_end = 0;
 
 	while (buflen > 0) {
 		curaddr = buf;
 		sgsize = buflen;
 		if (((dmat->bounce_flags & BF_COULD_BOUNCE) != 0) &&
 		    map->pagesneeded != 0 &&
 		    addr_needs_bounce(dmat, curaddr)) {
 			sgsize = MIN(sgsize, PAGE_SIZE - (curaddr & PAGE_MASK));
 			curaddr = add_bounce_page(dmat, map, 0, curaddr,
 			    sgsize);
 		} else if ((dmat->bounce_flags & BF_COHERENT) == 0) {
 			if (map->sync_count > 0)
 				sl_end = sl->paddr + sl->datacount;
 
 			if (map->sync_count == 0 || curaddr != sl_end) {
 				if (++map->sync_count > dmat->common.nsegments)
 					break;
 				sl++;
 				sl->vaddr = 0;
 				sl->paddr = curaddr;
 				sl->datacount = sgsize;
 				sl->pages = PHYS_TO_VM_PAGE(curaddr);
 				KASSERT(sl->pages != NULL,
 				    ("%s: page at PA:0x%08lx is not in "
 				    "vm_page_array", __func__, curaddr));
 			} else
 				sl->datacount += sgsize;
 		}
 		if (!_bus_dmamap_addsegs(dmat, map, curaddr, sgsize, segs,
 		    segp))
 			break;
 		buf += sgsize;
 		buflen -= sgsize;
 	}
 
 	/*
 	 * Did we fit?
 	 */
 	return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */
 }
 
 /*
  * Utility function to load a linear buffer.  segp contains
  * the starting segment on entrace, and the ending segment on exit.
  */
 static int
 bounce_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
     bus_size_t buflen, pmap_t pmap, int flags, bus_dma_segment_t *segs,
     int *segp)
 {
 	struct sync_list *sl;
 	bus_size_t sgsize;
 	bus_addr_t curaddr, sl_pend;
 	vm_offset_t kvaddr, vaddr, sl_vend;
 	int error;
 
 	if (segs == NULL)
 		segs = dmat->segments;
 
 	if ((dmat->bounce_flags & BF_COULD_BOUNCE) != 0) {
 		_bus_dmamap_count_pages(dmat, map, pmap, buf, buflen, flags);
 		if (map->pagesneeded != 0) {
 			error = _bus_dmamap_reserve_pages(dmat, map, flags);
 			if (error)
 				return (error);
 		}
 	}
 
 	sl = map->slist + map->sync_count - 1;
 	vaddr = (vm_offset_t)buf;
 	sl_pend = 0;
 	sl_vend = 0;
 
 	while (buflen > 0) {
 		/*
 		 * Get the physical address for this segment.
 		 */
 		if (pmap == kernel_pmap) {
 			curaddr = pmap_kextract(vaddr);
 			kvaddr = vaddr;
 		} else {
 			curaddr = pmap_extract(pmap, vaddr);
 			kvaddr = 0;
 		}
 
 		/*
 		 * Compute the segment size, and adjust counts.
 		 */
 		sgsize = MIN(buflen, PAGE_SIZE - (curaddr & PAGE_MASK));
 		if (((dmat->bounce_flags & BF_COULD_BOUNCE) != 0) &&
 		    map->pagesneeded != 0 &&
 		    addr_needs_bounce(dmat, curaddr)) {
 			sgsize = roundup2(sgsize, dmat->common.alignment);
 			curaddr = add_bounce_page(dmat, map, kvaddr, curaddr,
 			    sgsize);
 		} else if ((dmat->bounce_flags & BF_COHERENT) == 0) {
 			if (map->sync_count > 0) {
 				sl_pend = sl->paddr + sl->datacount;
 				sl_vend = sl->vaddr + sl->datacount;
 			}
 
 			if (map->sync_count == 0 ||
 			    (kvaddr != 0 && kvaddr != sl_vend) ||
 			    (curaddr != sl_pend)) {
 				if (++map->sync_count > dmat->common.nsegments)
 					goto cleanup;
 				sl++;
 				sl->vaddr = kvaddr;
 				sl->paddr = curaddr;
 				if (kvaddr != 0) {
 					sl->pages = NULL;
 				} else {
 					sl->pages = PHYS_TO_VM_PAGE(curaddr);
 					KASSERT(sl->pages != NULL,
 					    ("%s: page at PA:0x%08lx is not "
 					    "in vm_page_array", __func__,
 					    curaddr));
 				}
 				sl->datacount = sgsize;
 			} else
 				sl->datacount += sgsize;
 		}
 		if (!_bus_dmamap_addsegs(dmat, map, curaddr, sgsize, segs,
 		    segp))
 			break;
 		vaddr += sgsize;
 		buflen -= MIN(sgsize, buflen); /* avoid underflow */
 	}
 
 cleanup:
 	/*
 	 * Did we fit?
 	 */
 	return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */
 }
 
 static void
 bounce_bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap_t map,
     struct memdesc *mem, bus_dmamap_callback_t *callback, void *callback_arg)
 {
 
 	if ((map->flags & DMAMAP_COULD_BOUNCE) == 0)
 		return;
 	map->mem = *mem;
 	map->dmat = dmat;
 	map->callback = callback;
 	map->callback_arg = callback_arg;
 }
 
 static bus_dma_segment_t *
 bounce_bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map,
     bus_dma_segment_t *segs, int nsegs, int error)
 {
 
 	if (segs == NULL)
 		segs = dmat->segments;
 	return (segs);
 }
 
 /*
  * Release the mapping held by map.
  */
 static void
 bounce_bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
 	free_bounce_pages(dmat, map);
 	map->sync_count = 0;
 }
 
 static void
 dma_preread_safe(vm_offset_t va, vm_size_t size)
 {
 	/*
 	 * Write back any partial cachelines immediately before and
 	 * after the DMA region.
 	 */
 	if (va & (dcache_line_size - 1))
 		cpu_dcache_wb_range(va, 1);
 	if ((va + size) & (dcache_line_size - 1))
 		cpu_dcache_wb_range(va + size, 1);
 
 	cpu_dcache_inv_range(va, size);
 }
 
 static void
 dma_dcache_sync(struct sync_list *sl, bus_dmasync_op_t op)
 {
 	uint32_t len, offset;
 	vm_page_t m;
 	vm_paddr_t pa;
 	vm_offset_t va, tempva;
 	bus_size_t size;
 
 	offset = sl->paddr & PAGE_MASK;
 	m = sl->pages;
 	size = sl->datacount;
 	pa = sl->paddr;
 
 	for ( ; size != 0; size -= len, pa += len, offset = 0, ++m) {
 		tempva = 0;
 		if (sl->vaddr == 0) {
 			len = min(PAGE_SIZE - offset, size);
 			tempva = pmap_quick_enter_page(m);
 			va = tempva | offset;
 			KASSERT(pa == (VM_PAGE_TO_PHYS(m) | offset),
 			    ("unexpected vm_page_t phys: 0x%16lx != 0x%16lx",
 			    VM_PAGE_TO_PHYS(m) | offset, pa));
 		} else {
 			len = sl->datacount;
 			va = sl->vaddr;
 		}
 
 		switch (op) {
 		case BUS_DMASYNC_PREWRITE:
 		case BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD:
 			cpu_dcache_wb_range(va, len);
 			break;
 		case BUS_DMASYNC_PREREAD:
 			/*
 			 * An mbuf may start in the middle of a cacheline. There
 			 * will be no cpu writes to the beginning of that line
 			 * (which contains the mbuf header) while dma is in
 			 * progress.  Handle that case by doing a writeback of
 			 * just the first cacheline before invalidating the
 			 * overall buffer.  Any mbuf in a chain may have this
 			 * misalignment.  Buffers which are not mbufs bounce if
 			 * they are not aligned to a cacheline.
 			 */
 			dma_preread_safe(va, len);
 			break;
 		case BUS_DMASYNC_POSTREAD:
 		case BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE:
 			cpu_dcache_inv_range(va, len);
 			break;
 		default:
 			panic("unsupported combination of sync operations: "
                               "0x%08x\n", op);
 		}
 
 		if (tempva != 0)
 			pmap_quick_remove_page(tempva);
 	}
 }
 
 static void
 bounce_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map,
     bus_dmasync_op_t op)
 {
 	struct bounce_page *bpage;
 	struct sync_list *sl, *end;
 	vm_offset_t datavaddr, tempvaddr;
 
 	if (op == BUS_DMASYNC_POSTWRITE)
 		return;
 
 	if ((op & BUS_DMASYNC_POSTREAD) != 0) {
 		/*
 		 * Wait for any DMA operations to complete before the bcopy.
 		 */
 		fence();
 	}
 
 	if ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) {
 		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x op 0x%x "
 		    "performing bounce", __func__, dmat, dmat->common.flags,
 		    op);
 
 		if ((op & BUS_DMASYNC_PREWRITE) != 0) {
 			while (bpage != NULL) {
 				tempvaddr = 0;
 				datavaddr = bpage->datavaddr;
 				if (datavaddr == 0) {
 					tempvaddr = pmap_quick_enter_page(
 					    bpage->datapage);
 					datavaddr = tempvaddr | bpage->dataoffs;
 				}
 
 				bcopy((void *)datavaddr,
 				    (void *)bpage->vaddr, bpage->datacount);
 				if (tempvaddr != 0)
 					pmap_quick_remove_page(tempvaddr);
 				if ((dmat->bounce_flags & BF_COHERENT) == 0)
 					cpu_dcache_wb_range(bpage->vaddr,
 					    bpage->datacount);
 				bpage = STAILQ_NEXT(bpage, links);
 			}
 			dmat->bounce_zone->total_bounced++;
 		} else if ((op & BUS_DMASYNC_PREREAD) != 0) {
 			while (bpage != NULL) {
 				if ((dmat->bounce_flags & BF_COHERENT) == 0)
 					cpu_dcache_wbinv_range(bpage->vaddr,
 					    bpage->datacount);
 				bpage = STAILQ_NEXT(bpage, links);
 			}
 		}
 
 		if ((op & BUS_DMASYNC_POSTREAD) != 0) {
 			while (bpage != NULL) {
 				if ((dmat->bounce_flags & BF_COHERENT) == 0)
 					cpu_dcache_inv_range(bpage->vaddr,
 					    bpage->datacount);
 				tempvaddr = 0;
 				datavaddr = bpage->datavaddr;
 				if (datavaddr == 0) {
 					tempvaddr = pmap_quick_enter_page(
 					    bpage->datapage);
 					datavaddr = tempvaddr | bpage->dataoffs;
 				}
 
 				bcopy((void *)bpage->vaddr,
 				    (void *)datavaddr, bpage->datacount);
 
 				if (tempvaddr != 0)
 					pmap_quick_remove_page(tempvaddr);
 				bpage = STAILQ_NEXT(bpage, links);
 			}
 			dmat->bounce_zone->total_bounced++;
 		}
 	}
 
 	/*
 	 * Cache maintenance for normal (non-COHERENT non-bounce) buffers.
 	 */
 	if (map->sync_count != 0) {
 		sl = &map->slist[0];
 		end = &map->slist[map->sync_count];
 		CTR3(KTR_BUSDMA, "%s: tag %p op 0x%x "
 		    "performing sync", __func__, dmat, op);
 
 		for ( ; sl != end; ++sl)
 			dma_dcache_sync(sl, op);
 	}
 
 	if ((op & (BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE)) != 0) {
 		/*
 		 * Wait for the bcopy to complete before any DMA operations.
 		 */
 		fence();
 	}
 }
 
 struct bus_dma_impl bus_dma_bounce_impl = {
 	.tag_create = bounce_bus_dma_tag_create,
 	.tag_destroy = bounce_bus_dma_tag_destroy,
 	.map_create = bounce_bus_dmamap_create,
 	.map_destroy = bounce_bus_dmamap_destroy,
 	.mem_alloc = bounce_bus_dmamem_alloc,
 	.mem_free = bounce_bus_dmamem_free,
 	.load_phys = bounce_bus_dmamap_load_phys,
 	.load_buffer = bounce_bus_dmamap_load_buffer,
 	.load_ma = bus_dmamap_load_ma_triv,
 	.map_waitok = bounce_bus_dmamap_waitok,
 	.map_complete = bounce_bus_dmamap_complete,
 	.map_unload = bounce_bus_dmamap_unload,
 	.map_sync = bounce_bus_dmamap_sync
 };
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index f16231d61daf..dfd7928fc258 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -1,326 +1,327 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (c) 1987, 1993
  *	The Regents of the University of California.
  * Copyright (c) 2005, 2009 Robert N. M. Watson
  * 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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef _SYS_MALLOC_H_
 #define	_SYS_MALLOC_H_
 
 #ifndef _STANDALONE
 #include <sys/param.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
 #endif
 #include <sys/queue.h>
 #include <sys/_lock.h>
 #include <sys/_mutex.h>
 #include <machine/_limits.h>
 
 #define	MINALLOCSIZE	UMA_SMALLEST_UNIT
 
 /*
  * Flags to memory allocation functions.
  */
 #define	M_NOWAIT	0x0001		/* do not block */
 #define	M_WAITOK	0x0002		/* ok to block */
 #define	M_NORECLAIM	0x0080		/* do not reclaim after failure */
 #define	M_ZERO		0x0100		/* bzero the allocation */
 #define	M_NOVM		0x0200		/* don't ask VM for pages */
 #define	M_USE_RESERVE	0x0400		/* can alloc out of reserve memory */
 #define	M_NODUMP	0x0800		/* don't dump pages in this allocation */
 #define	M_FIRSTFIT	0x1000		/* only for vmem, fast fit */
 #define	M_BESTFIT	0x2000		/* only for vmem, low fragmentation */
 #define	M_EXEC		0x4000		/* allocate executable space */
 #define	M_NEXTFIT	0x8000		/* only for vmem, follow cursor */
 
 #define	M_VERSION	2020110501
 
 /*
  * Two malloc type structures are present: malloc_type, which is used by a
  * type owner to declare the type, and malloc_type_internal, which holds
  * malloc-owned statistics and other ABI-sensitive fields, such as the set of
  * malloc statistics indexed by the compile-time MAXCPU constant.
  * Applications should avoid introducing dependence on the allocator private
  * data layout and size.
  *
  * The malloc_type ks_next field is protected by malloc_mtx.  Other fields in
  * malloc_type are static after initialization so unsynchronized.
  *
  * Statistics in malloc_type_stats are written only when holding a critical
  * section and running on the CPU associated with the index into the stat
  * array, but read lock-free resulting in possible (minor) races, which the
  * monitoring app should take into account.
  */
 struct malloc_type_stats {
 	uint64_t	mts_memalloced;	/* Bytes allocated on CPU. */
 	uint64_t	mts_memfreed;	/* Bytes freed on CPU. */
 	uint64_t	mts_numallocs;	/* Number of allocates on CPU. */
 	uint64_t	mts_numfrees;	/* number of frees on CPU. */
 	uint64_t	mts_size;	/* Bitmask of sizes allocated on CPU. */
 	uint64_t	_mts_reserved1;	/* Reserved field. */
 	uint64_t	_mts_reserved2;	/* Reserved field. */
 	uint64_t	_mts_reserved3;	/* Reserved field. */
 };
 
 _Static_assert(sizeof(struct malloc_type_stats) == 64,
     "allocations come from pcpu_zone_64");
 
 /*
  * Index definitions for the mti_probes[] array.
  */
 #define DTMALLOC_PROBE_MALLOC		0
 #define DTMALLOC_PROBE_FREE		1
 #define DTMALLOC_PROBE_MAX		2
 
 struct malloc_type_internal {
 	uint32_t	mti_probes[DTMALLOC_PROBE_MAX];
 					/* DTrace probe ID array. */
 	u_char		mti_zone;
 	struct malloc_type_stats	*mti_stats;
 	u_long		mti_spare[8];
 };
 
 /*
  * Public data structure describing a malloc type.
  */
 struct malloc_type {
 	struct malloc_type *ks_next;	/* Next in global chain. */
 	u_long		 ks_version;	/* Detect programmer error. */
 	const char	*ks_shortdesc;	/* Printable type name. */
 	struct malloc_type_internal ks_mti;
 };
 
 /*
  * Statistics structure headers for user space.  The kern.malloc sysctl
  * exposes a structure stream consisting of a stream header, then a series of
  * malloc type headers and statistics structures (quantity maxcpus).  For
  * convenience, the kernel will provide the current value of maxcpus at the
  * head of the stream.
  */
 #define	MALLOC_TYPE_STREAM_VERSION	0x00000001
 struct malloc_type_stream_header {
 	uint32_t	mtsh_version;	/* Stream format version. */
 	uint32_t	mtsh_maxcpus;	/* Value of MAXCPU for stream. */
 	uint32_t	mtsh_count;	/* Number of records. */
 	uint32_t	_mtsh_pad;	/* Pad/reserved field. */
 };
 
 #define	MALLOC_MAX_NAME	32
 struct malloc_type_header {
 	char				mth_name[MALLOC_MAX_NAME];
 };
 
 #ifdef _KERNEL
 #define	MALLOC_DEFINE(type, shortdesc, longdesc)			\
 	struct malloc_type type[1] = {					\
 		{							\
 			.ks_next = NULL,				\
 			.ks_version = M_VERSION,			\
 			.ks_shortdesc = shortdesc,			\
 		}							\
 	};								\
 	SYSINIT(type##_init, SI_SUB_KMEM, SI_ORDER_THIRD, malloc_init,	\
 	    type);							\
 	SYSUNINIT(type##_uninit, SI_SUB_KMEM, SI_ORDER_ANY,		\
 	    malloc_uninit, type)
 
 #define	MALLOC_DECLARE(type) \
 	extern struct malloc_type type[1]
 
 MALLOC_DECLARE(M_CACHE);
 MALLOC_DECLARE(M_DEVBUF);
 MALLOC_DECLARE(M_PARGS);
 MALLOC_DECLARE(M_SESSION);
 MALLOC_DECLARE(M_SUBPROC);
 MALLOC_DECLARE(M_TEMP);
 
 /*
  * XXX this should be declared in <sys/uio.h>, but that tends to fail
  * because <sys/uio.h> is included in a header before the source file
  * has a chance to include <sys/malloc.h> to get MALLOC_DECLARE() defined.
  */
 MALLOC_DECLARE(M_IOV);
 
 struct domainset;
 extern struct mtx malloc_mtx;
 
 /*
  * Function type used when iterating over the list of malloc types.
  */
 typedef void malloc_type_list_func_t(struct malloc_type *, void *);
 
-void	contigfree(void *addr, unsigned long size, struct malloc_type *type);
+/* contigfree(9) is deprecated. */
+void	contigfree(void *addr, unsigned long, struct malloc_type *type);
 void	*contigmalloc(unsigned long size, struct malloc_type *type, int flags,
 	    vm_paddr_t low, vm_paddr_t high, unsigned long alignment,
 	    vm_paddr_t boundary) __malloc_like __result_use_check
 	    __alloc_size(1) __alloc_align(6);
 void	*contigmalloc_domainset(unsigned long size, struct malloc_type *type,
 	    struct domainset *ds, int flags, vm_paddr_t low, vm_paddr_t high,
 	    unsigned long alignment, vm_paddr_t boundary)
 	    __malloc_like __result_use_check __alloc_size(1) __alloc_align(7);
 void	free(void *addr, struct malloc_type *type);
 void	zfree(void *addr, struct malloc_type *type);
 void	*malloc(size_t size, struct malloc_type *type, int flags) __malloc_like
 	    __result_use_check __alloc_size(1);
 /*
  * Try to optimize malloc(..., ..., M_ZERO) allocations by doing zeroing in
  * place if the size is known at compilation time.
  *
  * Passing the flag down requires malloc to blindly zero the entire object.
  * In practice a lot of the zeroing can be avoided if most of the object
  * gets explicitly initialized after the allocation. Letting the compiler
  * zero in place gives it the opportunity to take advantage of this state.
  *
  * Note that the operation is only applicable if both flags and size are
  * known at compilation time. If M_ZERO is passed but M_WAITOK is not, the
  * allocation can fail and a NULL check is needed. However, if M_WAITOK is
  * passed we know the allocation must succeed and the check can be elided.
  *
  *	_malloc_item = malloc(_size, type, (flags) &~ M_ZERO);
  *	if (((flags) & M_WAITOK) != 0 || _malloc_item != NULL)
  *		bzero(_malloc_item, _size);
  *
  * If the flag is set, the compiler knows the left side is always true,
  * therefore the entire statement is true and the callsite is:
  *
  *	_malloc_item = malloc(_size, type, (flags) &~ M_ZERO);
  *	bzero(_malloc_item, _size);
  *
  * If the flag is not set, the compiler knows the left size is always false
  * and the NULL check is needed, therefore the callsite is:
  *
  * 	_malloc_item = malloc(_size, type, (flags) &~ M_ZERO);
  *	if (_malloc_item != NULL)
  *		bzero(_malloc_item, _size);			
  *
  * The implementation is a macro because of what appears to be a clang 6 bug:
  * an inline function variant ended up being compiled to a mere malloc call
  * regardless of argument. gcc generates expected code (like the above).
  */
 #define	malloc(size, type, flags) ({					\
 	void *_malloc_item;						\
 	size_t _size = (size);						\
 	if (__builtin_constant_p(size) && __builtin_constant_p(flags) &&\
 	    ((flags) & M_ZERO) != 0) {					\
 		_malloc_item = malloc(_size, type, (flags) &~ M_ZERO);	\
 		if (((flags) & M_WAITOK) != 0 ||			\
 		    __predict_true(_malloc_item != NULL))		\
 			memset(_malloc_item, 0, _size);			\
 	} else {							\
 		_malloc_item = malloc(_size, type, flags);		\
 	}								\
 	_malloc_item;							\
 })
 
 void	*malloc_domainset(size_t size, struct malloc_type *type,
 	    struct domainset *ds, int flags) __malloc_like __result_use_check
 	    __alloc_size(1);
 void	*mallocarray(size_t nmemb, size_t size, struct malloc_type *type,
 	    int flags) __malloc_like __result_use_check
 	    __alloc_size2(1, 2);
 void	*mallocarray_domainset(size_t nmemb, size_t size, struct malloc_type *type,
 	    struct domainset *ds, int flags) __malloc_like __result_use_check
 	    __alloc_size2(1, 2);
 void	*malloc_exec(size_t size, struct malloc_type *type, int flags) __malloc_like
 	    __result_use_check __alloc_size(1);
 void	*malloc_domainset_exec(size_t size, struct malloc_type *type,
 	    struct domainset *ds, int flags) __malloc_like __result_use_check
 	    __alloc_size(1);
 void	malloc_init(void *);
 void	malloc_type_allocated(struct malloc_type *type, unsigned long size);
 void	malloc_type_freed(struct malloc_type *type, unsigned long size);
 void	malloc_type_list(malloc_type_list_func_t *, void *);
 void	malloc_uninit(void *);
 size_t	malloc_size(size_t);
 size_t	malloc_usable_size(const void *);
 void	*realloc(void *addr, size_t size, struct malloc_type *type, int flags)
 	    __result_use_check __alloc_size(2);
 void	*reallocf(void *addr, size_t size, struct malloc_type *type, int flags)
 	    __result_use_check __alloc_size(2);
 void	*malloc_aligned(size_t size, size_t align, struct malloc_type *type,
 	    int flags) __malloc_like __result_use_check __alloc_size(1);
 void	*malloc_domainset_aligned(size_t size, size_t align,
 	    struct malloc_type *mtp, struct domainset *ds, int flags)
 	    __malloc_like __result_use_check __alloc_size(1);
 
 struct malloc_type *malloc_desc2type(const char *desc);
 
 /*
  * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
  * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
  */
 #define MUL_NO_OVERFLOW		(1UL << (sizeof(size_t) * 8 / 2))
 static inline bool
 WOULD_OVERFLOW(size_t nmemb, size_t size)
 {
 
 	return ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
 	    nmemb > 0 && __SIZE_T_MAX / nmemb < size);
 }
 #undef MUL_NO_OVERFLOW
 #endif /* _KERNEL */
 
 #else
 /*
  * The native stand malloc / free interface we're mapping to
  */
 extern void Free(void *p, const char *file, int line);
 extern void *Malloc(size_t bytes, const char *file, int line);
 
 /*
  * Minimal standalone malloc implementation / environment. None of the
  * flags mean anything and there's no need declare malloc types.
  * Define the simple alloc / free routines in terms of Malloc and
  * Free. None of the kernel features that this stuff disables are needed.
  */
 #define M_WAITOK 1
 #define M_ZERO 0
 #define M_NOWAIT 2
 #define MALLOC_DECLARE(x)
 
 #define kmem_zalloc(size, flags) ({					\
 	void *p = Malloc((size), __FILE__, __LINE__);			\
 	if (p == NULL && (flags &  M_WAITOK) != 0)			\
 		panic("Could not malloc %zd bytes with M_WAITOK from %s line %d", \
 		    (size_t)size, __FILE__, __LINE__);			\
 	p;								\
 })
 
 #define kmem_free(p, size) Free(p, __FILE__, __LINE__)
 
 /*
  * ZFS mem.h define that's the OpenZFS porting layer way of saying
  * M_WAITOK. Given the above, it will also be a nop.
  */
 #define KM_SLEEP M_WAITOK
 #define KM_NOSLEEP M_NOWAIT
 #endif /* _STANDALONE */
 #endif /* !_SYS_MALLOC_H_ */
diff --git a/sys/x86/include/bus_dma.h b/sys/x86/include/bus_dma.h
index cd3afa07f929..7e07127f56e9 100644
--- a/sys/x86/include/bus_dma.h
+++ b/sys/x86/include/bus_dma.h
@@ -1,204 +1,204 @@
 /*-
  * Copyright (c) 2017 Jason A. Harmening.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef _X86_BUS_DMA_H_
 #define _X86_BUS_DMA_H_
 
 #define WANT_INLINE_DMAMAP
 #include <sys/bus_dma.h>
 #include <sys/_null.h>
 
 #include <x86/busdma_impl.h>
 
 /*
  * Is DMA address 1:1 mapping of physical address
  */
 static inline bool
 bus_dma_id_mapped(bus_dma_tag_t dmat, vm_paddr_t buf, bus_size_t buflen)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->id_mapped(dmat, buf, buflen));
 }
 
 /*
  * Allocate a handle for mapping from kva/uva/physical
  * address space into bus device space.
  */
 static inline int
 bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->map_create(dmat, flags, mapp));
 }
 
 /*
  * Destroy a handle for mapping from kva/uva/physical
  * address space into bus device space.
  */
 static inline int
 bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->map_destroy(dmat, map));
 }
 
 /*
  * Allocate a piece of memory that can be efficiently mapped into
  * bus device space based on the constraints lited in the dma tag.
  * A dmamap to for use with dmamap_load is also allocated.
  */
 static inline int
 bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
     bus_dmamap_t *mapp)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->mem_alloc(dmat, vaddr, flags, mapp));
 }
 
 /*
  * Free a piece of memory and it's allociated dmamap, that was allocated
- * via bus_dmamem_alloc.  Make the same choice for free/contigfree.
+ * via bus_dmamem_alloc.
  */
 static inline void
 bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	tc->impl->mem_free(dmat, vaddr, map);
 }
 
 /*
  * Release the mapping held by map.
  */
 static inline void
 bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
 	struct bus_dma_tag_common *tc;
 
 	if (map != NULL) {
 		tc = (struct bus_dma_tag_common *)dmat;
 		tc->impl->map_unload(dmat, map);
 	}
 }
 
 static inline void
 bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
 {
 	struct bus_dma_tag_common *tc;
 
 	if (map != NULL) {
 		tc = (struct bus_dma_tag_common *)dmat;
 		tc->impl->map_sync(dmat, map, op);
 	}
 }
 
 /*
  * Utility function to load a physical buffer.  segp contains
  * the starting segment on entrace, and the ending segment on exit.
  */
 static inline int
 _bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf,
     bus_size_t buflen, int flags, bus_dma_segment_t *segs, int *segp)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->load_phys(dmat, map, buf, buflen, flags, segs,
 	    segp));
 }
 
 static inline int
 _bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map, struct vm_page **ma,
     bus_size_t tlen, int ma_offs, int flags, bus_dma_segment_t *segs,
     int *segp)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->load_ma(dmat, map, ma, tlen, ma_offs, flags,
 	    segs, segp));
 }
 
 /*
  * Utility function to load a linear buffer.  segp contains
  * the starting segment on entrace, and the ending segment on exit.
  */
 static inline int
 _bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
     bus_size_t buflen, struct pmap *pmap, int flags, bus_dma_segment_t *segs,
     int *segp)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->load_buffer(dmat, map, buf, buflen, pmap, flags, segs,
 	    segp));
 }
 
 static inline void
 _bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap_t map,
     struct memdesc *mem, bus_dmamap_callback_t *callback, void *callback_arg)
 {
 	struct bus_dma_tag_common *tc;
 
 	if (map != NULL) {
 		tc = (struct bus_dma_tag_common *)dmat;
 		tc->impl->map_waitok(dmat, map, mem, callback, callback_arg);
 	}
 }
 
 static inline bus_dma_segment_t *
 _bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map,
     bus_dma_segment_t *segs, int nsegs, int error)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->map_complete(dmat, map, segs, nsegs, error));
 }
 
 #ifdef KMSAN
 static inline void
 _bus_dmamap_load_kmsan(bus_dma_tag_t dmat, bus_dmamap_t map,
     struct memdesc *mem)
 {
 	struct bus_dma_tag_common *tc;
 
 	tc = (struct bus_dma_tag_common *)dmat;
 	return (tc->impl->load_kmsan(map, mem));
 }
 #endif
 
 #endif /* !_X86_BUS_DMA_H_ */
diff --git a/sys/x86/isa/isa_dma.c b/sys/x86/isa/isa_dma.c
index 257e41756ce5..cf2f2ea417e6 100644
--- a/sys/x86/isa/isa_dma.c
+++ b/sys/x86/isa/isa_dma.c
@@ -1,605 +1,599 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (c) 1991 The Regents of the University of California.
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
  *
  * 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.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 /*
  * code to manage AT bus
  *
  * 92/08/18  Frank P. MacLachlan (fpm@crash.cts.com):
  * Fixed uninitialized variable problem and added code to deal
  * with DMA page boundaries in isa_dmarangecheck().  Fixed word
  * mode DMA count compution and reorganized DMA setup code in
  * isa_dmastart()
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/lock.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <sys/module.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <isa/isareg.h>
 #include <isa/isavar.h>
 #include <isa/isa_dmareg.h>
 
 #define	ISARAM_END	0x1000000
 
 static int isa_dmarangecheck(caddr_t va, u_int length, int chan);
 
 static caddr_t	dma_bouncebuf[8];
 static u_int	dma_bouncebufsize[8];
 static u_int8_t	dma_bounced = 0;
 static u_int8_t	dma_busy = 0;		/* Used in isa_dmastart() */
 static u_int8_t	dma_inuse = 0;		/* User for acquire/release */
 static u_int8_t dma_auto_mode = 0;
 static struct mtx isa_dma_lock;
 MTX_SYSINIT(isa_dma_lock, &isa_dma_lock, "isa DMA lock", MTX_DEF);
 
 #define VALID_DMA_MASK (7)
 
 /* high byte of address is stored in this port for i-th dma channel */
 static int dmapageport[8] = { 0x87, 0x83, 0x81, 0x82, 0x8f, 0x8b, 0x89, 0x8a };
 
 /*
  * Setup a DMA channel's bounce buffer.
  */
 int
 isa_dma_init(int chan, u_int bouncebufsize, int flag)
 {
 	void *buf;
-	int contig;
 
 #ifdef DIAGNOSTIC
 	if (chan & ~VALID_DMA_MASK)
 		panic("isa_dma_init: channel out of range");
 #endif
 
 	/* Try malloc() first.  It works better if it works. */
 	buf = malloc(bouncebufsize, M_DEVBUF, flag);
 	if (buf != NULL) {
 		if (isa_dmarangecheck(buf, bouncebufsize, chan) != 0) {
 			free(buf, M_DEVBUF);
 			buf = NULL;
 		}
-		contig = 0;
 	}
 
 	if (buf == NULL) {
 		buf = contigmalloc(bouncebufsize, M_DEVBUF, flag, 0ul, 0xfffffful,
 			   1ul, chan & 4 ? 0x20000ul : 0x10000ul);
-		contig = 1;
 	}
 
 	if (buf == NULL)
 		return (ENOMEM);
 
 	mtx_lock(&isa_dma_lock);
 	/*
 	 * If a DMA channel is shared, both drivers have to call isa_dma_init
 	 * since they don't know that the other driver will do it.
 	 * Just return if we're already set up good.
 	 * XXX: this only works if they agree on the bouncebuf size.  This
 	 * XXX: is typically the case since they are multiple instances of
 	 * XXX: the same driver.
 	 */
 	if (dma_bouncebuf[chan] != NULL) {
-		if (contig)
-			contigfree(buf, bouncebufsize, M_DEVBUF);
-		else
-			free(buf, M_DEVBUF);
+		free(buf, M_DEVBUF);
 		mtx_unlock(&isa_dma_lock);
 		return (0);
 	}
 
 	dma_bouncebufsize[chan] = bouncebufsize;
 	dma_bouncebuf[chan] = buf;
 
 	mtx_unlock(&isa_dma_lock);
 
 	return (0);
 }
 
 /*
  * Register a DMA channel's usage.  Usually called from a device driver
  * in open() or during its initialization.
  */
 int
 isa_dma_acquire(int chan)
 {
 #ifdef DIAGNOSTIC
 	if (chan & ~VALID_DMA_MASK)
 		panic("isa_dma_acquire: channel out of range");
 #endif
 
 	mtx_lock(&isa_dma_lock);
 	if (dma_inuse & (1 << chan)) {
 		printf("isa_dma_acquire: channel %d already in use\n", chan);
 		mtx_unlock(&isa_dma_lock);
 		return (EBUSY);
 	}
 	dma_inuse |= (1 << chan);
 	dma_auto_mode &= ~(1 << chan);
 	mtx_unlock(&isa_dma_lock);
 
 	return (0);
 }
 
 /*
  * Unregister a DMA channel's usage.  Usually called from a device driver
  * during close() or during its shutdown.
  */
 void
 isa_dma_release(int chan)
 {
 #ifdef DIAGNOSTIC
 	if (chan & ~VALID_DMA_MASK)
 		panic("isa_dma_release: channel out of range");
 
 	mtx_lock(&isa_dma_lock);
 	if ((dma_inuse & (1 << chan)) == 0)
 		printf("isa_dma_release: channel %d not in use\n", chan);
 #else
 	mtx_lock(&isa_dma_lock);
 #endif
 
 	if (dma_busy & (1 << chan)) {
 		dma_busy &= ~(1 << chan);
 		/* 
 		 * XXX We should also do "dma_bounced &= (1 << chan);"
 		 * because we are acting on behalf of isa_dmadone() which
 		 * was not called to end the last DMA operation.  This does
 		 * not matter now, but it may in the future.
 		 */
 	}
 
 	dma_inuse &= ~(1 << chan);
 	dma_auto_mode &= ~(1 << chan);
 
 	mtx_unlock(&isa_dma_lock);
 }
 
 /*
  * isa_dmacascade(): program 8237 DMA controller channel to accept
  * external dma control by a board.
  */
 void
 isa_dmacascade(int chan)
 {
 #ifdef DIAGNOSTIC
 	if (chan & ~VALID_DMA_MASK)
 		panic("isa_dmacascade: channel out of range");
 #endif
 
 	mtx_lock(&isa_dma_lock);
 	/* set dma channel mode, and set dma channel mode */
 	if ((chan & 4) == 0) {
 		outb(DMA1_MODE, DMA37MD_CASCADE | chan);
 		outb(DMA1_SMSK, chan);
 	} else {
 		outb(DMA2_MODE, DMA37MD_CASCADE | (chan & 3));
 		outb(DMA2_SMSK, chan & 3);
 	}
 	mtx_unlock(&isa_dma_lock);
 }
 
 /*
  * isa_dmastart(): program 8237 DMA controller channel, avoid page alignment
  * problems by using a bounce buffer.
  */
 void
 isa_dmastart(int flags, caddr_t addr, u_int nbytes, int chan)
 {
 	vm_paddr_t phys;
 	int waport;
 	caddr_t newaddr;
 	int dma_range_checked;
 
 	dma_range_checked = isa_dmarangecheck(addr, nbytes, chan);
 
 #ifdef DIAGNOSTIC
 	if (chan & ~VALID_DMA_MASK)
 		panic("isa_dmastart: channel out of range");
 
 	if ((chan < 4 && nbytes > (1<<16))
 	    || (chan >= 4 && (nbytes > (1<<17) || (uintptr_t)addr & 1)))
 		panic("isa_dmastart: impossible request");
 
 	mtx_lock(&isa_dma_lock);
 	if ((dma_inuse & (1 << chan)) == 0)
 		printf("isa_dmastart: channel %d not acquired\n", chan);
 #else
 	mtx_lock(&isa_dma_lock);
 #endif
 
 #if 0
 	/*
 	 * XXX This should be checked, but drivers like ad1848 only call
 	 * isa_dmastart() once because they use Auto DMA mode.  If we
 	 * leave this in, drivers that do this will print this continuously.
 	 */
 	if (dma_busy & (1 << chan))
 		printf("isa_dmastart: channel %d busy\n", chan);
 #endif
 
 	dma_busy |= (1 << chan);
 
 	if (dma_range_checked) {
 		if (dma_bouncebuf[chan] == NULL
 		    || dma_bouncebufsize[chan] < nbytes)
 			panic("isa_dmastart: bad bounce buffer"); 
 		dma_bounced |= (1 << chan);
 		newaddr = dma_bouncebuf[chan];
 
 		/* copy bounce buffer on write */
 		if (!(flags & ISADMA_READ))
 			bcopy(addr, newaddr, nbytes);
 		addr = newaddr;
 	}
 
 	/* translate to physical */
 	phys = pmap_extract(kernel_pmap, (vm_offset_t)addr);
 
 	if (flags & ISADMA_RAW) {
 	    dma_auto_mode |= (1 << chan);
 	} else { 
 	    dma_auto_mode &= ~(1 << chan);
 	}
 
 	if ((chan & 4) == 0) {
 		/*
 		 * Program one of DMA channels 0..3.  These are
 		 * byte mode channels.
 		 */
 		/* set dma channel mode, and reset address ff */
 
 		/* If ISADMA_RAW flag is set, then use autoinitialise mode */
 		if (flags & ISADMA_RAW) {
 		  if (flags & ISADMA_READ)
 			outb(DMA1_MODE, DMA37MD_AUTO|DMA37MD_WRITE|chan);
 		  else
 			outb(DMA1_MODE, DMA37MD_AUTO|DMA37MD_READ|chan);
 		}
 		else
 		if (flags & ISADMA_READ)
 			outb(DMA1_MODE, DMA37MD_SINGLE|DMA37MD_WRITE|chan);
 		else
 			outb(DMA1_MODE, DMA37MD_SINGLE|DMA37MD_READ|chan);
 		outb(DMA1_FFC, 0);
 
 		/* send start address */
 		waport =  DMA1_CHN(chan);
 		outb(waport, phys);
 		outb(waport, phys>>8);
 		outb(dmapageport[chan], phys>>16);
 
 		/* send count */
 		outb(waport + 1, --nbytes);
 		outb(waport + 1, nbytes>>8);
 
 		/* unmask channel */
 		outb(DMA1_SMSK, chan);
 	} else {
 		/*
 		 * Program one of DMA channels 4..7.  These are
 		 * word mode channels.
 		 */
 		/* set dma channel mode, and reset address ff */
 
 		/* If ISADMA_RAW flag is set, then use autoinitialise mode */
 		if (flags & ISADMA_RAW) {
 		  if (flags & ISADMA_READ)
 			outb(DMA2_MODE, DMA37MD_AUTO|DMA37MD_WRITE|(chan&3));
 		  else
 			outb(DMA2_MODE, DMA37MD_AUTO|DMA37MD_READ|(chan&3));
 		}
 		else
 		if (flags & ISADMA_READ)
 			outb(DMA2_MODE, DMA37MD_SINGLE|DMA37MD_WRITE|(chan&3));
 		else
 			outb(DMA2_MODE, DMA37MD_SINGLE|DMA37MD_READ|(chan&3));
 		outb(DMA2_FFC, 0);
 
 		/* send start address */
 		waport = DMA2_CHN(chan - 4);
 		outb(waport, phys>>1);
 		outb(waport, phys>>9);
 		outb(dmapageport[chan], phys>>16);
 
 		/* send count */
 		nbytes >>= 1;
 		outb(waport + 2, --nbytes);
 		outb(waport + 2, nbytes>>8);
 
 		/* unmask channel */
 		outb(DMA2_SMSK, chan & 3);
 	}
 	mtx_unlock(&isa_dma_lock);
 }
 
 void
 isa_dmadone(int flags, caddr_t addr, int nbytes, int chan)
 {  
 #ifdef DIAGNOSTIC
 	if (chan & ~VALID_DMA_MASK)
 		panic("isa_dmadone: channel out of range");
 
 	if ((dma_inuse & (1 << chan)) == 0)
 		printf("isa_dmadone: channel %d not acquired\n", chan);
 #endif
 
 	mtx_lock(&isa_dma_lock);
 	if (((dma_busy & (1 << chan)) == 0) && 
 	    (dma_auto_mode & (1 << chan)) == 0 )
 		printf("isa_dmadone: channel %d not busy\n", chan);
 
 	if ((dma_auto_mode & (1 << chan)) == 0)
 		outb(chan & 4 ? DMA2_SMSK : DMA1_SMSK, (chan & 3) | 4);
 
 	if (dma_bounced & (1 << chan)) {
 		/* copy bounce buffer on read */
 		if (flags & ISADMA_READ)
 			bcopy(dma_bouncebuf[chan], addr, nbytes);
 
 		dma_bounced &= ~(1 << chan);
 	}
 	dma_busy &= ~(1 << chan);
 	mtx_unlock(&isa_dma_lock);
 }
 
 /*
  * Check for problems with the address range of a DMA transfer
  * (non-contiguous physical pages, outside of bus address space,
  * crossing DMA page boundaries).
  * Return true if special handling needed.
  */
 
 static int
 isa_dmarangecheck(caddr_t va, u_int length, int chan)
 {
 	vm_paddr_t phys, priorpage = 0;
 	vm_offset_t endva;
 	u_int dma_pgmsk = (chan & 4) ?  ~(128*1024-1) : ~(64*1024-1);
 
 	endva = (vm_offset_t)round_page((vm_offset_t)va + length);
 	for (; va < (caddr_t) endva ; va += PAGE_SIZE) {
 		phys = trunc_page(pmap_extract(kernel_pmap, (vm_offset_t)va));
 		if (phys == 0)
 			panic("isa_dmacheck: no physical page present");
 		if (phys >= ISARAM_END)
 			return (1);
 		if (priorpage) {
 			if (priorpage + PAGE_SIZE != phys)
 				return (1);
 			/* check if crossing a DMA page boundary */
 			if (((u_int)priorpage ^ (u_int)phys) & dma_pgmsk)
 				return (1);
 		}
 		priorpage = phys;
 	}
 	return (0);
 }
 
 /*
  * Query the progress of a transfer on a DMA channel.
  *
  * To avoid having to interrupt a transfer in progress, we sample
  * each of the high and low databytes twice, and apply the following
  * logic to determine the correct count.
  *
  * Reads are performed with interrupts disabled, thus it is to be
  * expected that the time between reads is very small.  At most
  * one rollover in the low count byte can be expected within the
  * four reads that are performed.
  *
  * There are three gaps in which a rollover can occur :
  *
  * - read low1
  *              gap1
  * - read high1
  *              gap2
  * - read low2
  *              gap3
  * - read high2
  *
  * If a rollover occurs in gap1 or gap2, the low2 value will be
  * greater than the low1 value.  In this case, low2 and high2 are a
  * corresponding pair. 
  *
  * In any other case, low1 and high1 can be considered to be correct.
  *
  * The function returns the number of bytes remaining in the transfer,
  * or -1 if the channel requested is not active.
  *
  */
 static int
 isa_dmastatus_locked(int chan)
 {
 	u_long	cnt = 0;
 	int	ffport, waport;
 	u_long	low1, high1, low2, high2;
 
 	mtx_assert(&isa_dma_lock, MA_OWNED);
 
 	/* channel active? */
 	if ((dma_inuse & (1 << chan)) == 0) {
 		printf("isa_dmastatus: channel %d not active\n", chan);
 		return(-1);
 	}
 	/* channel busy? */
 
 	if (((dma_busy & (1 << chan)) == 0) &&
 	    (dma_auto_mode & (1 << chan)) == 0 ) {
 	    printf("chan %d not busy\n", chan);
 	    return -2 ;
 	}	
 	if (chan < 4) {			/* low DMA controller */
 		ffport = DMA1_FFC;
 		waport = DMA1_CHN(chan) + 1;
 	} else {			/* high DMA controller */
 		ffport = DMA2_FFC;
 		waport = DMA2_CHN(chan - 4) + 2;
 	}
 
 	disable_intr();			/* no interrupts Mr Jones! */
 	outb(ffport, 0);		/* clear register LSB flipflop */
 	low1 = inb(waport);
 	high1 = inb(waport);
 	outb(ffport, 0);		/* clear again */
 	low2 = inb(waport);
 	high2 = inb(waport);
 	enable_intr();			/* enable interrupts again */
 
 	/* 
 	 * Now decide if a wrap has tried to skew our results.
 	 * Note that after TC, the count will read 0xffff, while we want 
 	 * to return zero, so we add and then mask to compensate.
 	 */
 	if (low1 >= low2) {
 		cnt = (low1 + (high1 << 8) + 1) & 0xffff;
 	} else {
 		cnt = (low2 + (high2 << 8) + 1) & 0xffff;
 	}
 
 	if (chan >= 4)			/* high channels move words */
 		cnt *= 2;
 	return(cnt);
 }
 
 int
 isa_dmastatus(int chan)
 {
 	int status;
 
 	mtx_lock(&isa_dma_lock);
 	status = isa_dmastatus_locked(chan);
 	mtx_unlock(&isa_dma_lock);
 
 	return (status);
 }
 
 /*
  * Reached terminal count yet ?
  */
 int
 isa_dmatc(int chan)
 {
 
 	if (chan < 4)
 		return(inb(DMA1_STATUS) & (1 << chan));
 	else
 		return(inb(DMA2_STATUS) & (1 << (chan & 3)));
 }
 
 /*
  * Stop a DMA transfer currently in progress.
  */
 int
 isa_dmastop(int chan) 
 {
 	int status;
 
 	mtx_lock(&isa_dma_lock);
 	if ((dma_inuse & (1 << chan)) == 0)
 		printf("isa_dmastop: channel %d not acquired\n", chan);  
 
 	if (((dma_busy & (1 << chan)) == 0) &&
 	    ((dma_auto_mode & (1 << chan)) == 0)) {
 		printf("chan %d not busy\n", chan);
 		mtx_unlock(&isa_dma_lock);
 		return -2 ;
 	}
     
 	if ((chan & 4) == 0) {
 		outb(DMA1_SMSK, (chan & 3) | 4 /* disable mask */);
 	} else {
 		outb(DMA2_SMSK, (chan & 3) | 4 /* disable mask */);
 	}
 
 	status = isa_dmastatus_locked(chan);
 
 	mtx_unlock(&isa_dma_lock);
 
 	return (status);
 }
 
 /*
  * Attach to the ISA PnP descriptor for the AT DMA controller
  */
 static struct isa_pnp_id atdma_ids[] = {
 	{ 0x0002d041 /* PNP0200 */, "AT DMA controller" },
 	{ 0 }
 };
 
 static int
 atdma_probe(device_t dev)
 {
 	int result;
 
 	if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, atdma_ids)) <= 0)
 		device_quiet(dev);
 	return(result);
 }
 
 static int
 atdma_attach(device_t dev)
 {
 	return(0);
 }
 
 static device_method_t atdma_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		atdma_probe),
 	DEVMETHOD(device_attach,	atdma_attach),
 	DEVMETHOD(device_detach,	bus_generic_detach),
 	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
 	DEVMETHOD(device_suspend,	bus_generic_suspend),
 	DEVMETHOD(device_resume,	bus_generic_resume),
 	{ 0, 0 }
 };
 
 static driver_t atdma_driver = {
 	"atdma",
 	atdma_methods,
 	1,		/* no softc */
 };
 
 DRIVER_MODULE(atdma, isa, atdma_driver, 0, 0);
 DRIVER_MODULE(atdma, acpi, atdma_driver, 0, 0);
 ISA_PNP_INFO(atdma_ids);
diff --git a/sys/x86/x86/busdma_bounce.c b/sys/x86/x86/busdma_bounce.c
index 656b76159250..040174113104 100644
--- a/sys/x86/x86/busdma_bounce.c
+++ b/sys/x86/x86/busdma_bounce.c
@@ -1,994 +1,994 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 1997, 1998 Justin T. Gibbs.
  * 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,
  *    without modification, immediately at the beginning of the file.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
  * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/domainset.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/proc.h>
 #include <sys/memdesc.h>
 #include <sys/msan.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 #include <sys/uio.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 
 #include <machine/atomic.h>
 #include <machine/bus.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 #include <x86/include/busdma_impl.h>
 
 #ifdef __i386__
 #define MAX_BPAGES (Maxmem > atop(0x100000000ULL) ? 8192 : 512)
 #else
 #define MAX_BPAGES 8192
 #endif
 
 enum {
 	BUS_DMA_COULD_BOUNCE	= 0x01,
 	BUS_DMA_MIN_ALLOC_COMP	= 0x02,
 	BUS_DMA_KMEM_ALLOC	= 0x04,
 	BUS_DMA_FORCE_MAP	= 0x08,
 };
 
 struct bounce_page;
 struct bounce_zone;
 
 struct bus_dma_tag {
 	struct bus_dma_tag_common common;
 	int			map_count;
 	int			bounce_flags;
 	bus_dma_segment_t	*segments;
 	struct bounce_zone	*bounce_zone;
 };
 
 static SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
     "Busdma parameters");
 
 struct bus_dmamap {
 	STAILQ_HEAD(, bounce_page) bpages;
 	int		       pagesneeded;
 	int		       pagesreserved;
 	bus_dma_tag_t	       dmat;
 	struct memdesc	       mem;
 	bus_dmamap_callback_t *callback;
 	void		      *callback_arg;
 	__sbintime_t	       queued_time;
 	STAILQ_ENTRY(bus_dmamap) links;
 #ifdef KMSAN
 	struct memdesc	       kmsan_mem;
 #endif
 };
 
 static struct bus_dmamap nobounce_dmamap;
 
 static bool _bus_dmamap_pagesneeded(bus_dma_tag_t dmat, vm_paddr_t buf,
     bus_size_t buflen, int *pagesneeded);
 static void _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
     pmap_t pmap, void *buf, bus_size_t buflen, int flags);
 static void _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map,
     vm_paddr_t buf, bus_size_t buflen, int flags);
 
 static MALLOC_DEFINE(M_BUSDMA, "busdma", "busdma metadata");
 
 #define	dmat_alignment(dmat)	((dmat)->common.alignment)
 #define	dmat_bounce_flags(dmat)	((dmat)->bounce_flags)
 #define	dmat_boundary(dmat)	((dmat)->common.boundary)
 #define	dmat_domain(dmat)	((dmat)->common.domain)
 #define	dmat_flags(dmat)	((dmat)->common.flags)
 #define	dmat_highaddr(dmat)	((dmat)->common.highaddr)
 #define	dmat_lowaddr(dmat)	((dmat)->common.lowaddr)
 #define	dmat_lockfunc(dmat)	((dmat)->common.lockfunc)
 #define	dmat_lockfuncarg(dmat)	((dmat)->common.lockfuncarg)
 #define	dmat_maxsegsz(dmat)	((dmat)->common.maxsegsz)
 #define	dmat_nsegments(dmat)	((dmat)->common.nsegments)
 
 #include "../../kern/subr_busdma_bounce.c"
 
 /*
  * On i386 kernels without 'options PAE' we need to also bounce any
  * physical addresses above 4G.
  *
  * NB: vm_paddr_t is required here since bus_addr_t is only 32 bits in
  * i386 kernels without 'options PAE'.
  */
 static __inline bool
 must_bounce(bus_dma_tag_t dmat, vm_paddr_t paddr)
 {
 #if defined(__i386__) && !defined(PAE)
 	if (paddr > BUS_SPACE_MAXADDR)
 		return (true);
 #endif
 	return (addr_needs_bounce(dmat, paddr));
 }
 
 static int
 bounce_bus_dma_zone_setup(bus_dma_tag_t dmat)
 {
 	struct bounce_zone *bz;
 	int error;
 
 	/* Must bounce */
 	if ((error = alloc_bounce_zone(dmat)) != 0)
 		return (error);
 	bz = dmat->bounce_zone;
 
 	if (ptoa(bz->total_bpages) < dmat->common.maxsize) {
 		int pages;
 
 		pages = atop(dmat->common.maxsize) - bz->total_bpages;
 
 		/* Add pages to our bounce pool */
 		if (alloc_bounce_pages(dmat, pages) < pages)
 			return (ENOMEM);
 	}
 	/* Performed initial allocation */
 	dmat->bounce_flags |= BUS_DMA_MIN_ALLOC_COMP;
 
 	return (0);
 }
 
 /*
  * Allocate a device specific dma_tag.
  */
 static int
 bounce_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
     bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr,
     bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags,
     bus_dma_lock_t *lockfunc, void *lockfuncarg, bus_dma_tag_t *dmat)
 {
 	bus_dma_tag_t newtag;
 	int error;
 
 	*dmat = NULL;
 	error = common_bus_dma_tag_create(parent != NULL ? &parent->common :
 	    NULL, alignment, boundary, lowaddr, highaddr, maxsize, nsegments,
 	    maxsegsz, flags, lockfunc, lockfuncarg, sizeof(struct bus_dma_tag),
 	    (void **)&newtag);
 	if (error != 0)
 		return (error);
 
 	newtag->common.impl = &bus_dma_bounce_impl;
 	newtag->map_count = 0;
 	newtag->segments = NULL;
 
 #ifdef KMSAN
 	/*
 	 * When KMSAN is configured, we need a map to store a memory descriptor
 	 * which can be used for validation.
 	 */
 	newtag->bounce_flags |= BUS_DMA_FORCE_MAP;
 #endif
 
 	if (parent != NULL &&
 	    (parent->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0)
 		newtag->bounce_flags |= BUS_DMA_COULD_BOUNCE;
 
 	if (newtag->common.lowaddr < ptoa((vm_paddr_t)Maxmem) ||
 	    newtag->common.alignment > 1)
 		newtag->bounce_flags |= BUS_DMA_COULD_BOUNCE;
 
 	if ((newtag->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0 &&
 	    (flags & BUS_DMA_ALLOCNOW) != 0)
 		error = bounce_bus_dma_zone_setup(newtag);
 	else
 		error = 0;
 
 	if (error != 0)
 		free(newtag, M_DEVBUF);
 	else
 		*dmat = newtag;
 	CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
 	    __func__, newtag, (newtag != NULL ? newtag->common.flags : 0),
 	    error);
 	return (error);
 }
 
 static bool
 bounce_bus_dma_id_mapped(bus_dma_tag_t dmat, vm_paddr_t buf, bus_size_t buflen)
 {
 
 	if ((dmat->bounce_flags & BUS_DMA_COULD_BOUNCE) == 0)
 		return (true);
 	return (!_bus_dmamap_pagesneeded(dmat, buf, buflen, NULL));
 }
 
 /*
  * Update the domain for the tag.  We may need to reallocate the zone and
  * bounce pages.
  */ 
 static int
 bounce_bus_dma_tag_set_domain(bus_dma_tag_t dmat)
 {
 
 	KASSERT(dmat->map_count == 0,
 	    ("bounce_bus_dma_tag_set_domain:  Domain set after use.\n"));
 	if ((dmat->bounce_flags & BUS_DMA_COULD_BOUNCE) == 0 ||
 	    dmat->bounce_zone == NULL)
 		return (0);
 	dmat->bounce_flags &= ~BUS_DMA_MIN_ALLOC_COMP;
 	return (bounce_bus_dma_zone_setup(dmat));
 }
 
 static int
 bounce_bus_dma_tag_destroy(bus_dma_tag_t dmat)
 {
 	int error = 0;
 
 	if (dmat != NULL) {
 		if (dmat->map_count != 0) {
 			error = EBUSY;
 			goto out;
 		}
 		if (dmat->segments != NULL)
 			free(dmat->segments, M_DEVBUF);
 		free(dmat, M_DEVBUF);
 	}
 out:
 	CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat, error);
 	return (error);
 }
 
 /*
  * Allocate a handle for mapping from kva/uva/physical
  * address space into bus device space.
  */
 static int
 bounce_bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
 {
 	struct bounce_zone *bz;
 	int error, maxpages, pages;
 
 	error = 0;
 
 	if (dmat->segments == NULL) {
 		dmat->segments = malloc_domainset(
 		    sizeof(bus_dma_segment_t) * dmat->common.nsegments,
 		    M_DEVBUF, DOMAINSET_PREF(dmat->common.domain), M_NOWAIT);
 		if (dmat->segments == NULL) {
 			CTR3(KTR_BUSDMA, "%s: tag %p error %d",
 			    __func__, dmat, ENOMEM);
 			return (ENOMEM);
 		}
 	}
 
 	if (dmat->bounce_flags & (BUS_DMA_COULD_BOUNCE | BUS_DMA_FORCE_MAP)) {
 		*mapp = malloc_domainset(sizeof(**mapp), M_DEVBUF,
 		    DOMAINSET_PREF(dmat->common.domain), M_NOWAIT | M_ZERO);
 		if (*mapp == NULL) {
 			CTR3(KTR_BUSDMA, "%s: tag %p error %d",
 			    __func__, dmat, ENOMEM);
 			return (ENOMEM);
 		}
 		STAILQ_INIT(&(*mapp)->bpages);
 	} else {
 		*mapp = NULL;
 	}
 
 	/*
 	 * Bouncing might be required if the driver asks for an active
 	 * exclusion region, a data alignment that is stricter than 1, and/or
 	 * an active address boundary.
 	 */
 	if ((dmat->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0) {
 		/* Must bounce */
 		if (dmat->bounce_zone == NULL &&
 		    (error = alloc_bounce_zone(dmat)) != 0)
 			goto out;
 		bz = dmat->bounce_zone;
 
 		/*
 		 * Attempt to add pages to our pool on a per-instance
 		 * basis up to a sane limit.
 		 */
 		if (dmat->common.alignment > 1)
 			maxpages = MAX_BPAGES;
 		else
 			maxpages = MIN(MAX_BPAGES, Maxmem -
 			    atop(dmat->common.lowaddr));
 		if ((dmat->bounce_flags & BUS_DMA_MIN_ALLOC_COMP) == 0 ||
 		    (bz->map_count > 0 && bz->total_bpages < maxpages)) {
 			pages = MAX(atop(dmat->common.maxsize), 1);
 			pages = MIN(dmat->common.nsegments, pages);
 			pages = MIN(maxpages - bz->total_bpages, pages);
 			pages = MAX(pages, 1);
 			if (alloc_bounce_pages(dmat, pages) < pages)
 				error = ENOMEM;
 			if ((dmat->bounce_flags & BUS_DMA_MIN_ALLOC_COMP)
 			    == 0) {
 				if (error == 0) {
 					dmat->bounce_flags |=
 					    BUS_DMA_MIN_ALLOC_COMP;
 				}
 			} else
 				error = 0;
 		}
 		bz->map_count++;
 	}
 
 out:
 	if (error == 0) {
 		dmat->map_count++;
 	} else {
 		free(*mapp, M_DEVBUF);
 		*mapp = NULL;
 	}
 
 	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 	    __func__, dmat, dmat->common.flags, error);
 	return (error);
 }
 
 /*
  * Destroy a handle for mapping from kva/uva/physical
  * address space into bus device space.
  */
 static int
 bounce_bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
 
 	if (map != NULL && map != &nobounce_dmamap) {
 		if (STAILQ_FIRST(&map->bpages) != NULL) {
 			CTR3(KTR_BUSDMA, "%s: tag %p error %d",
 			    __func__, dmat, EBUSY);
 			return (EBUSY);
 		}
 		if (dmat->bounce_zone)
 			dmat->bounce_zone->map_count--;
 		free(map, M_DEVBUF);
 	}
 	dmat->map_count--;
 	CTR2(KTR_BUSDMA, "%s: tag %p error 0", __func__, dmat);
 	return (0);
 }
 
 /*
  * Allocate a piece of memory that can be efficiently mapped into
  * bus device space based on the constraints lited in the dma tag.
  * A dmamap to for use with dmamap_load is also allocated.
  */
 static int
 bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int flags,
     bus_dmamap_t *mapp)
 {
 	vm_memattr_t attr;
 	int mflags;
 
 	if (flags & BUS_DMA_NOWAIT)
 		mflags = M_NOWAIT;
 	else
 		mflags = M_WAITOK;
 
 	/* If we succeed, no mapping/bouncing will be required */
 	*mapp = NULL;
 
 	if (dmat->segments == NULL) {
 		dmat->segments = (bus_dma_segment_t *)malloc_domainset(
 		    sizeof(bus_dma_segment_t) * dmat->common.nsegments,
 		    M_DEVBUF, DOMAINSET_PREF(dmat->common.domain), mflags);
 		if (dmat->segments == NULL) {
 			CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 			    __func__, dmat, dmat->common.flags, ENOMEM);
 			return (ENOMEM);
 		}
 	}
 	if (flags & BUS_DMA_ZERO)
 		mflags |= M_ZERO;
 	if (flags & BUS_DMA_NOCACHE)
 		attr = VM_MEMATTR_UNCACHEABLE;
 	else
 		attr = VM_MEMATTR_DEFAULT;
 
 	/*
 	 * Allocate the buffer from the malloc(9) allocator if...
 	 *  - It's small enough to fit into a single page.
 	 *  - Its alignment requirement is also smaller than the page size.
 	 *  - The low address requirement is fulfilled.
 	 *  - Default cache attributes are requested (WB).
 	 * else allocate non-contiguous pages if...
 	 *  - The page count that could get allocated doesn't exceed
 	 *    nsegments also when the maximum segment size is less
 	 *    than PAGE_SIZE.
 	 *  - The alignment constraint isn't larger than a page boundary.
 	 *  - There are no boundary-crossing constraints.
 	 * else allocate a block of contiguous pages because one or more of the
 	 * constraints is something that only the contig allocator can fulfill.
 	 *
 	 * Warn the user if malloc gets it wrong.
 	 */
 	if (dmat->common.maxsize <= PAGE_SIZE &&
 	    dmat->common.alignment <= PAGE_SIZE &&
 	    dmat->common.lowaddr >= ptoa((vm_paddr_t)Maxmem) &&
 	    attr == VM_MEMATTR_DEFAULT) {
 		*vaddr = malloc_domainset_aligned(dmat->common.maxsize,
 		    dmat->common.alignment, M_DEVBUF,
 		    DOMAINSET_PREF(dmat->common.domain), mflags);
 		KASSERT(*vaddr == NULL || ((uintptr_t)*vaddr & PAGE_MASK) +
 		    dmat->common.maxsize <= PAGE_SIZE,
 		    ("bounce_bus_dmamem_alloc: multi-page alloc %p maxsize "
 		    "%#jx align %#jx", *vaddr, (uintmax_t)dmat->common.maxsize,
 		    (uintmax_t)dmat->common.alignment));
 	} else if (dmat->common.nsegments >=
 	    howmany(dmat->common.maxsize, MIN(dmat->common.maxsegsz,
 	    PAGE_SIZE)) &&
 	    dmat->common.alignment <= PAGE_SIZE &&
 	    (dmat->common.boundary % PAGE_SIZE) == 0) {
 		/* Page-based multi-segment allocations allowed */
 		*vaddr = kmem_alloc_attr_domainset(
 		    DOMAINSET_PREF(dmat->common.domain), dmat->common.maxsize,
 		    mflags, 0ul, dmat->common.lowaddr, attr);
 		dmat->bounce_flags |= BUS_DMA_KMEM_ALLOC;
 	} else {
 		*vaddr = kmem_alloc_contig_domainset(
 		    DOMAINSET_PREF(dmat->common.domain), dmat->common.maxsize,
 		    mflags, 0ul, dmat->common.lowaddr,
 		    dmat->common.alignment != 0 ? dmat->common.alignment : 1ul,
 		    dmat->common.boundary, attr);
 		dmat->bounce_flags |= BUS_DMA_KMEM_ALLOC;
 	}
 	if (*vaddr == NULL) {
 		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 		    __func__, dmat, dmat->common.flags, ENOMEM);
 		return (ENOMEM);
 	} else if (!vm_addr_align_ok(vtophys(*vaddr), dmat->common.alignment)) {
 		printf("bus_dmamem_alloc failed to align memory properly.\n");
 	}
 	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 	    __func__, dmat, dmat->common.flags, 0);
 	return (0);
 }
 
 /*
  * Free a piece of memory and its associated dmamap, that was allocated
- * via bus_dmamem_alloc.  Make the same choice for free/contigfree.
+ * via bus_dmamem_alloc.
  */
 static void
 bounce_bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
 {
 	/*
 	 * dmamem does not need to be bounced, so the map should be
 	 * NULL and the BUS_DMA_KMEM_ALLOC flag cleared if malloc()
 	 * was used and set if kmem_alloc_contig() was used.
 	 */
 	if (map != NULL)
 		panic("bus_dmamem_free: Invalid map freed\n");
 	if ((dmat->bounce_flags & BUS_DMA_KMEM_ALLOC) == 0)
 		free(vaddr, M_DEVBUF);
 	else
 		kmem_free(vaddr, dmat->common.maxsize);
 	CTR3(KTR_BUSDMA, "%s: tag %p flags 0x%x", __func__, dmat,
 	    dmat->bounce_flags);
 }
 
 static bool
 _bus_dmamap_pagesneeded(bus_dma_tag_t dmat, vm_paddr_t buf, bus_size_t buflen,
     int *pagesneeded)
 {
 	vm_paddr_t curaddr;
 	bus_size_t sgsize;
 	int count;
 
 	/*
 	 * Count the number of bounce pages needed in order to
 	 * complete this transfer
 	 */
 	count = 0;
 	curaddr = buf;
 	while (buflen != 0) {
 		sgsize = buflen;
 		if (must_bounce(dmat, curaddr)) {
 			sgsize = MIN(sgsize,
 			    PAGE_SIZE - (curaddr & PAGE_MASK));
 			if (pagesneeded == NULL)
 				return (true);
 			count++;
 		}
 		curaddr += sgsize;
 		buflen -= sgsize;
 	}
 
 	if (pagesneeded != NULL)
 		*pagesneeded = count;
 	return (count != 0);
 }
 
 static void
 _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf,
     bus_size_t buflen, int flags)
 {
 
 	if (map != &nobounce_dmamap && map->pagesneeded == 0) {
 		_bus_dmamap_pagesneeded(dmat, buf, buflen, &map->pagesneeded);
 		CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
 	}
 }
 
 static void
 _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap,
     void *buf, bus_size_t buflen, int flags)
 {
 	vm_offset_t vaddr;
 	vm_offset_t vendaddr;
 	vm_paddr_t paddr;
 	bus_size_t sg_len;
 
 	if (map != &nobounce_dmamap && map->pagesneeded == 0) {
 		CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, "
 		    "alignment= %d", dmat->common.lowaddr,
 		    ptoa((vm_paddr_t)Maxmem),
 		    dmat->common.boundary, dmat->common.alignment);
 		CTR3(KTR_BUSDMA, "map= %p, nobouncemap= %p, pagesneeded= %d",
 		    map, &nobounce_dmamap, map->pagesneeded);
 		/*
 		 * Count the number of bounce pages
 		 * needed in order to complete this transfer
 		 */
 		vaddr = (vm_offset_t)buf;
 		vendaddr = (vm_offset_t)buf + buflen;
 
 		while (vaddr < vendaddr) {
 			sg_len = MIN(vendaddr - vaddr,
 			    PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK));
 			if (pmap == kernel_pmap)
 				paddr = pmap_kextract(vaddr);
 			else
 				paddr = pmap_extract(pmap, vaddr);
 			if (must_bounce(dmat, paddr)) {
 				sg_len = roundup2(sg_len,
 				    dmat->common.alignment);
 				map->pagesneeded++;
 			}
 			vaddr += sg_len;
 		}
 		CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
 	}
 }
 
 static void
 _bus_dmamap_count_ma(bus_dma_tag_t dmat, bus_dmamap_t map, struct vm_page **ma,
     int ma_offs, bus_size_t buflen, int flags)
 {
 	bus_size_t sg_len;
 	int page_index;
 	vm_paddr_t paddr;
 
 	if (map != &nobounce_dmamap && map->pagesneeded == 0) {
 		CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, "
 		    "alignment= %d", dmat->common.lowaddr,
 		    ptoa((vm_paddr_t)Maxmem),
 		    dmat->common.boundary, dmat->common.alignment);
 		CTR3(KTR_BUSDMA, "map= %p, nobouncemap= %p, pagesneeded= %d",
 		    map, &nobounce_dmamap, map->pagesneeded);
 
 		/*
 		 * Count the number of bounce pages
 		 * needed in order to complete this transfer
 		 */
 		page_index = 0;
 		while (buflen > 0) {
 			paddr = VM_PAGE_TO_PHYS(ma[page_index]) + ma_offs;
 			sg_len = PAGE_SIZE - ma_offs;
 			sg_len = MIN(sg_len, buflen);
 			if (must_bounce(dmat, paddr)) {
 				sg_len = roundup2(sg_len,
 				    dmat->common.alignment);
 				KASSERT(vm_addr_align_ok(sg_len,
 				    dmat->common.alignment),
 				    ("Segment size is not aligned"));
 				map->pagesneeded++;
 			}
 			if (((ma_offs + sg_len) & ~PAGE_MASK) != 0)
 				page_index++;
 			ma_offs = (ma_offs + sg_len) & PAGE_MASK;
 			KASSERT(buflen >= sg_len,
 			    ("Segment length overruns original buffer"));
 			buflen -= sg_len;
 		}
 		CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
 	}
 }
 
 /*
  * Utility function to load a physical buffer.  segp contains
  * the starting segment on entrace, and the ending segment on exit.
  */
 static int
 bounce_bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map,
     vm_paddr_t buf, bus_size_t buflen, int flags, bus_dma_segment_t *segs,
     int *segp)
 {
 	bus_size_t sgsize;
 	vm_paddr_t curaddr;
 	int error;
 
 	if (map == NULL)
 		map = &nobounce_dmamap;
 
 	if (segs == NULL)
 		segs = dmat->segments;
 
 	if ((dmat->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0) {
 		_bus_dmamap_count_phys(dmat, map, buf, buflen, flags);
 		if (map->pagesneeded != 0) {
 			error = _bus_dmamap_reserve_pages(dmat, map, flags);
 			if (error)
 				return (error);
 		}
 	}
 
 	while (buflen > 0) {
 		curaddr = buf;
 		sgsize = buflen;
 		if ((dmat->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0 &&
 		    map->pagesneeded != 0 &&
 		    must_bounce(dmat, curaddr)) {
 			sgsize = MIN(sgsize, PAGE_SIZE - (curaddr & PAGE_MASK));
 			curaddr = add_bounce_page(dmat, map, 0, curaddr, 0,
 			    sgsize);
 		}
 
 		if (!_bus_dmamap_addsegs(dmat, map, curaddr, sgsize, segs,
 		    segp))
 			break;
 		buf += sgsize;
 		buflen -= sgsize;
 	}
 
 	/*
 	 * Did we fit?
 	 */
 	return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */
 }
 
 /*
  * Utility function to load a linear buffer.  segp contains
  * the starting segment on entrace, and the ending segment on exit.
  */
 static int
 bounce_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
     bus_size_t buflen, pmap_t pmap, int flags, bus_dma_segment_t *segs,
     int *segp)
 {
 	bus_size_t sgsize;
 	vm_paddr_t curaddr;
 	vm_offset_t kvaddr, vaddr;
 	int error;
 
 	if (map == NULL)
 		map = &nobounce_dmamap;
 
 	if (segs == NULL)
 		segs = dmat->segments;
 
 	if ((dmat->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0) {
 		_bus_dmamap_count_pages(dmat, map, pmap, buf, buflen, flags);
 		if (map->pagesneeded != 0) {
 			error = _bus_dmamap_reserve_pages(dmat, map, flags);
 			if (error)
 				return (error);
 		}
 	}
 
 	vaddr = (vm_offset_t)buf;
 	while (buflen > 0) {
 		/*
 		 * Get the physical address for this segment.
 		 */
 		if (pmap == kernel_pmap) {
 			curaddr = pmap_kextract(vaddr);
 			kvaddr = vaddr;
 		} else {
 			curaddr = pmap_extract(pmap, vaddr);
 			kvaddr = 0;
 		}
 
 		/*
 		 * Compute the segment size, and adjust counts.
 		 */
 		sgsize = MIN(buflen, PAGE_SIZE - (curaddr & PAGE_MASK));
 		if ((dmat->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0 &&
 		    map->pagesneeded != 0 &&
 		    must_bounce(dmat, curaddr)) {
 			sgsize = roundup2(sgsize, dmat->common.alignment);
 			curaddr = add_bounce_page(dmat, map, kvaddr, curaddr, 0,
 			    sgsize);
 		}
 		if (!_bus_dmamap_addsegs(dmat, map, curaddr, sgsize, segs,
 		    segp))
 			break;
 		vaddr += sgsize;
 		buflen -= MIN(sgsize, buflen); /* avoid underflow */
 	}
 
 	/*
 	 * Did we fit?
 	 */
 	return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */
 }
 
 static int
 bounce_bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map,
     struct vm_page **ma, bus_size_t buflen, int ma_offs, int flags,
     bus_dma_segment_t *segs, int *segp)
 {
 	vm_paddr_t paddr, next_paddr;
 	int error, page_index;
 	bus_size_t sgsize;
 
 	if (dmat->common.flags & BUS_DMA_KEEP_PG_OFFSET) {
 		/*
 		 * If we have to keep the offset of each page this function
 		 * is not suitable, switch back to bus_dmamap_load_ma_triv
 		 * which is going to do the right thing in this case.
 		 */
 		error = bus_dmamap_load_ma_triv(dmat, map, ma, buflen, ma_offs,
 		    flags, segs, segp);
 		return (error);
 	}
 
 	if (map == NULL)
 		map = &nobounce_dmamap;
 
 	if (segs == NULL)
 		segs = dmat->segments;
 
 	if ((dmat->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0) {
 		_bus_dmamap_count_ma(dmat, map, ma, ma_offs, buflen, flags);
 		if (map->pagesneeded != 0) {
 			error = _bus_dmamap_reserve_pages(dmat, map, flags);
 			if (error)
 				return (error);
 		}
 	}
 
 	page_index = 0;
 	while (buflen > 0) {
 		/*
 		 * Compute the segment size, and adjust counts.
 		 */
 		paddr = VM_PAGE_TO_PHYS(ma[page_index]) + ma_offs;
 		sgsize = MIN(buflen, PAGE_SIZE - ma_offs);
 		if ((dmat->bounce_flags & BUS_DMA_COULD_BOUNCE) != 0 &&
 		    map->pagesneeded != 0 &&
 		    must_bounce(dmat, paddr)) {
 			sgsize = roundup2(sgsize, dmat->common.alignment);
 			KASSERT(vm_addr_align_ok(sgsize,
 			    dmat->common.alignment),
 			    ("Segment size is not aligned"));
 			/*
 			 * Check if two pages of the user provided buffer
 			 * are used.
 			 */
 			if ((ma_offs + sgsize) > PAGE_SIZE)
 				next_paddr =
 				    VM_PAGE_TO_PHYS(ma[page_index + 1]);
 			else
 				next_paddr = 0;
 			paddr = add_bounce_page(dmat, map, 0, paddr,
 			    next_paddr, sgsize);
 		}
 		if (!_bus_dmamap_addsegs(dmat, map, paddr, sgsize, segs,
 		    segp))
 			break;
 		KASSERT(buflen >= sgsize,
 		    ("Segment length overruns original buffer"));
 		buflen -= MIN(sgsize, buflen); /* avoid underflow */
 		if (((ma_offs + sgsize) & ~PAGE_MASK) != 0)
 			page_index++;
 		ma_offs = (ma_offs + sgsize) & PAGE_MASK;
 	}
 
 	/*
 	 * Did we fit?
 	 */
 	return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */
 }
 
 static void
 bounce_bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap_t map,
     struct memdesc *mem, bus_dmamap_callback_t *callback, void *callback_arg)
 {
 
 	if (map == NULL)
 		return;
 	map->mem = *mem;
 	map->dmat = dmat;
 	map->callback = callback;
 	map->callback_arg = callback_arg;
 }
 
 static bus_dma_segment_t *
 bounce_bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map,
     bus_dma_segment_t *segs, int nsegs, int error)
 {
 
 	if (segs == NULL)
 		segs = dmat->segments;
 	return (segs);
 }
 
 /*
  * Release the mapping held by map.
  */
 static void
 bounce_bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
 	if (map == NULL)
 		return;
 
 	free_bounce_pages(dmat, map);
 }
 
 static void
 bounce_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map,
     bus_dmasync_op_t op)
 {
 	struct bounce_page *bpage;
 	vm_offset_t datavaddr, tempvaddr;
 	bus_size_t datacount1, datacount2;
 
 	if (map == NULL)
 		goto out;
 	if ((bpage = STAILQ_FIRST(&map->bpages)) == NULL)
 		goto out;
 
 	/*
 	 * Handle data bouncing.  We might also want to add support for
 	 * invalidating the caches on broken hardware.
 	 */
 	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x op 0x%x "
 	    "performing bounce", __func__, dmat, dmat->common.flags, op);
 
 	if ((op & BUS_DMASYNC_PREWRITE) != 0) {
 		while (bpage != NULL) {
 			tempvaddr = 0;
 			datavaddr = bpage->datavaddr;
 			datacount1 = bpage->datacount;
 			if (datavaddr == 0) {
 				tempvaddr =
 				    pmap_quick_enter_page(bpage->datapage[0]);
 				datavaddr = tempvaddr | bpage->dataoffs;
 				datacount1 = min(PAGE_SIZE - bpage->dataoffs,
 				    datacount1);
 			}
 
 			bcopy((void *)datavaddr,
 			    (void *)bpage->vaddr, datacount1);
 
 			if (tempvaddr != 0)
 				pmap_quick_remove_page(tempvaddr);
 
 			if (bpage->datapage[1] == 0) {
 				KASSERT(datacount1 == bpage->datacount,
 		("Mismatch between data size and provided memory space"));
 				goto next_w;
 			}
 
 			/*
 			 * We are dealing with an unmapped buffer that expands
 			 * over two pages.
 			 */
 			datavaddr = pmap_quick_enter_page(bpage->datapage[1]);
 			datacount2 = bpage->datacount - datacount1;
 			bcopy((void *)datavaddr,
 			    (void *)(bpage->vaddr + datacount1), datacount2);
 			pmap_quick_remove_page(datavaddr);
 
 next_w:
 			bpage = STAILQ_NEXT(bpage, links);
 		}
 		dmat->bounce_zone->total_bounced++;
 	}
 
 	if ((op & BUS_DMASYNC_POSTREAD) != 0) {
 		while (bpage != NULL) {
 			tempvaddr = 0;
 			datavaddr = bpage->datavaddr;
 			datacount1 = bpage->datacount;
 			if (datavaddr == 0) {
 				tempvaddr =
 				    pmap_quick_enter_page(bpage->datapage[0]);
 				datavaddr = tempvaddr | bpage->dataoffs;
 				datacount1 = min(PAGE_SIZE - bpage->dataoffs,
 				    datacount1);
 			}
 
 			bcopy((void *)bpage->vaddr, (void *)datavaddr,
 			    datacount1);
 
 			if (tempvaddr != 0)
 				pmap_quick_remove_page(tempvaddr);
 
 			if (bpage->datapage[1] == 0) {
 				KASSERT(datacount1 == bpage->datacount,
 		("Mismatch between data size and provided memory space"));
 				goto next_r;
 			}
 
 			/*
 			 * We are dealing with an unmapped buffer that expands
 			 * over two pages.
 			 */
 			datavaddr = pmap_quick_enter_page(bpage->datapage[1]);
 			datacount2 = bpage->datacount - datacount1;
 			bcopy((void *)(bpage->vaddr + datacount1),
 			    (void *)datavaddr, datacount2);
 			pmap_quick_remove_page(datavaddr);
 
 next_r:
 			bpage = STAILQ_NEXT(bpage, links);
 		}
 		dmat->bounce_zone->total_bounced++;
 	}
 out:
 	atomic_thread_fence_rel();
 	if (map != NULL)
 		kmsan_bus_dmamap_sync(&map->kmsan_mem, op);
 }
 
 #ifdef KMSAN
 static void
 bounce_bus_dmamap_load_kmsan(bus_dmamap_t map, struct memdesc *mem)
 {
 	if (map == NULL)
 		return;
 	memcpy(&map->kmsan_mem, mem, sizeof(map->kmsan_mem));
 }
 #endif
 
 struct bus_dma_impl bus_dma_bounce_impl = {
 	.tag_create = bounce_bus_dma_tag_create,
 	.tag_destroy = bounce_bus_dma_tag_destroy,
 	.tag_set_domain = bounce_bus_dma_tag_set_domain,
 	.id_mapped = bounce_bus_dma_id_mapped,
 	.map_create = bounce_bus_dmamap_create,
 	.map_destroy = bounce_bus_dmamap_destroy,
 	.mem_alloc = bounce_bus_dmamem_alloc,
 	.mem_free = bounce_bus_dmamem_free,
 	.load_phys = bounce_bus_dmamap_load_phys,
 	.load_buffer = bounce_bus_dmamap_load_buffer,
 	.load_ma = bounce_bus_dmamap_load_ma,
 	.map_waitok = bounce_bus_dmamap_waitok,
 	.map_complete = bounce_bus_dmamap_complete,
 	.map_unload = bounce_bus_dmamap_unload,
 	.map_sync = bounce_bus_dmamap_sync,
 #ifdef KMSAN
 	.load_kmsan = bounce_bus_dmamap_load_kmsan,
 #endif
 };
diff --git a/tools/test/stress2/misc/contigmalloc.sh b/tools/test/stress2/misc/contigmalloc.sh
index 92bf6ff40905..abaa2c3cad53 100755
--- a/tools/test/stress2/misc/contigmalloc.sh
+++ b/tools/test/stress2/misc/contigmalloc.sh
@@ -1,255 +1,253 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2014 EMC Corp.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 
-# contigmalloc(9) / contigfree(9) test scenario.
+# contigmalloc(9) / free(9) test scenario.
 # malloc() a random number of buffers with random size and then free them.
 
 # A malloc pattern might look like this:
 # contigmalloc(186 pages)
 # contigmalloc(56 pages)
 # contigmalloc(9 pages)
 # contigmalloc(202 pages)
 # contigmalloc(49 pages)
 # contigmalloc(5 pages)
 
 # "panic: vm_reserv_alloc_contig: reserv 0xff... isn't free" seen.
 # http://people.freebsd.org/~pho/stress/log/contigmalloc.txt
 # Fixed by r271351.
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 [ -d /usr/src/sys ] || exit 0
 builddir=`sysctl kern.version | grep @ | sed 's/.*://'`
 [ -d "$builddir" ] && export KERNBUILDDIR=$builddir || exit 0
 export SYSDIR=`echo $builddir | sed 's#/sys.*#/sys#'`
 
 . ../default.cfg
 
 odir=`pwd`
 dir=/tmp/contigmalloc
 rm -rf $dir; mkdir -p $dir
 cat > $dir/ctest.c <<EOF
 #include <sys/param.h>
 #include <sys/syscall.h>
 
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
 
 #define min(a,b) (((a)<(b))?(a):(b))
 #define CAP (64 * 1024 * 1024)		/* Total allocation */
 #define MAXBUF (32 * 1024 * 1024)	/* Max buffer size */
 #define N 512				/* Max allocations */
 #define RUNTIME 120
 #define TALLOC 1
 #define TFREE  2
 
 void *p[N];
 long size[N];
 int n;
 
 void
 test(int argc, char *argv[])
 {
 	long mw, s;
 	int i, no, ps, res;
 
 	if (argc == 3) {
 		no = atoi(argv[1]);
 		mw = atol(argv[2]);
 	}
 	if (argc != 3 || no == 0 || mw == 0)
 		errx(1, "Usage: %s <syscall number> <max wired>", argv[0]);
 
 	ps = getpagesize();
 	s = 0;
 	n = arc4random() % N + 1;
 	mw = mw / 100 * 10 * ps;	/* Use 10% of vm.max_user_wired */
 	mw = min(mw, CAP);
 	for (i = 0; i < n; i++) {
 		size[i] = round_page((arc4random() % MAXBUF) + 1);
 		if (s + size[i] > mw)
 			continue;
 		res = syscall(no, TALLOC, &p[i], &size[i]);
 		if (res == -1) {
 			warn("contigmalloc(%lu pages) failed at loop %d",
 			    size[i] / ps, i);
 			usleep(200000);
 		} else {
 #if defined(TEST)
 			fprintf(stderr, "contigmalloc(%lu pages)\n",
 			    size[i] / ps);
 #endif
 			s += size[i];
 		}
 	}
 
 	setproctitle("%ld Mb", s / 1024 / 1024);
 
 	for (i = 0; i < n; i++) {
 		if (p[i] != NULL) {
 			res = syscall(no, TFREE, &p[i], &size[i]);
 #if defined(TEST)
-			fprintf(stderr, "contigfree(%lu pages)\n",
+			fprintf(stderr, "free(%lu pages)\n",
 			    size[i] / ps);
 #endif
 			p[i] = NULL;
 		}
 	}
 }
 
 int
 main(int argc, char *argv[])
 {
 	time_t start;
 
 	start = time(NULL);
 	while (time(NULL) - start < RUNTIME)
 		test(argc, argv);
 
 	return (0);
 }
 
 EOF
 mycc -o /tmp/ctest -Wall -Wextra -O0 -g $dir/ctest.c || exit 1
 rm $dir/ctest.c
 
 cd $dir
 cat > Makefile <<EOF
 KMOD= cmalloc
 SRCS= cmalloc.c
 
 .include <bsd.kmod.mk>
 EOF
 
 sed '1,/^EOF2/d' < $odir/$0 > cmalloc.c
 make || exit 1
 kldload $dir/cmalloc.ko || exit 1
 
 cd $odir
 mw=`sysctl -n vm.max_user_wired` || exit 1
 /tmp/ctest `sysctl -n debug.cmalloc_offset` $mw 2>&1 | tail -5
 kldunload $dir/cmalloc.ko
 rm -rf $dir /tmp/ctest
 exit 0
 
 EOF2
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
 #include <sys/systm.h>
 
 #define TALLOC 1
 #define TFREE  2
 
 /*
  * Hook up a syscall for contigmalloc testing.
  */
 
 struct cmalloc_args {
         int a_op;
 	void *a_ptr;
 	void *a_size;
 };
 
 static int
 cmalloc(struct thread *td, struct cmalloc_args *uap)
 {
 	void *p;
 	unsigned long size;
 	int error;
 
 	error = copyin(uap->a_size, &size, sizeof(size));
 	if (error != 0) {
 		return (error);
 	}
 	switch (uap->a_op) {
 	case TFREE:
 		error = copyin(uap->a_ptr, &p, sizeof(p));
-		if (error == 0) {
-			if (p != NULL)
-				contigfree(p, size, M_TEMP);
-		}
+		if (error == 0)
+			free(p, M_TEMP);
 		return (error);
 
 	case TALLOC:
 		p = contigmalloc(size, M_TEMP, M_NOWAIT, 0ul, ~0ul, 4096, 0);
 		if (p != NULL) {
 			error = copyout(&p, uap->a_ptr, sizeof(p));
 			return (error);
 		}
 		return (ENOMEM);
 	}
         return (EINVAL);
 }
 
 /*
  * The sysent for the new syscall
  */
 static struct sysent cmalloc_sysent = {
 	.sy_narg =  3,				/* sy_narg */
 	.sy_call = (sy_call_t *) cmalloc	/* sy_call */
 };
 
 /*
  * The offset in sysent where the syscall is allocated.
  */
 static int cmalloc_offset = NO_SYSCALL;
 
 SYSCTL_INT(_debug, OID_AUTO, cmalloc_offset, CTLFLAG_RD, &cmalloc_offset, 0,
     "cmalloc syscall number");
 
 /*
  * The function called at load/unload.
  */
 
 static int
 cmalloc_load(struct module *module, int cmd, void *arg)
 {
         int error = 0;
 
         switch (cmd) {
         case MOD_LOAD :
                 break;
         case MOD_UNLOAD :
                 break;
         default :
                 error = EOPNOTSUPP;
                 break;
         }
         return (error);
 }
 
 SYSCALL_MODULE(cmalloc_syscall, &cmalloc_offset, &cmalloc_sysent,
     cmalloc_load, NULL);
diff --git a/tools/test/stress2/misc/contigmalloc2.sh b/tools/test/stress2/misc/contigmalloc2.sh
index e3ec5bf3a358..dd4bbd751fd4 100755
--- a/tools/test/stress2/misc/contigmalloc2.sh
+++ b/tools/test/stress2/misc/contigmalloc2.sh
@@ -1,223 +1,220 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2015 EMC Corp.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 
-# contigmalloc(9) / contigfree(9) test scenario.
+# contigmalloc(9) / free(9) test scenario.
 # Regression test for allocations >= 2 GiB.
 # "panic: vm_page_insert_after: mpred doesn't precede pindex" seen.
 # Fixed by r284207.
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 [ -d /usr/src/sys ] || exit 0
 builddir=`sysctl kern.version | grep @ | sed 's/.*://'`
 [ -d "$builddir" ] && export KERNBUILDDIR=$builddir || exit 0
 export SYSDIR=`echo $builddir | sed 's#/sys.*#/sys#'`
 
 . ../default.cfg
 
 odir=`pwd`
 dir=/tmp/contigmalloc
 rm -rf $dir; mkdir -p $dir
 cat > $dir/ctest2.c <<EOF
 #include <sys/param.h>
 #include <sys/syscall.h>
 
 #include <err.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 #define TALLOC 1
 #define TFREE  2
 
 void *p;
 long size;
 int n;
 
 void
 test(int argc, char *argv[])
 {
 	long mw;
 	int no, ps, res;
 
 	if (argc == 3) {
 		no = atoi(argv[1]);
 		mw = atol(argv[2]);
 	}
 	if (argc != 3 || no == 0 || mw == 0)
 		errx(1, "Usage: %s <syscall number> <max wired>", argv[0]);
 
 	ps = getpagesize();
 	size = mw / 100 * 80 * ps;	/* Use 80% of vm.max_user_wired */
 	while (size > 0) {
 		res = syscall(no, TALLOC, &p, &size);
 		if (res == -1) {
 			if (errno != ENOMEM)
 				warn("contigmalloc(%lu pages) failed",
 				    size);
 		} else {
 #if defined(TEST)
 			fprintf(stderr, "pre contigmalloc(%lu pages): %lu MiB\n",
 			    size, size * ps / 1024 / 1024);
 #endif
 			res = syscall(no, TFREE, &p, &size);
 #if defined(TEST)
-			fprintf(stderr, "contigfree(%lu pages)\n",
-			    size);
+			fprintf(stderr, "free(%lu pages)\n", size);
 #endif
 		}
 		size /= 2;
 	}
 }
 
 int
 main(int argc, char *argv[])
 {
 	test(argc, argv);
 
 	return (0);
 }
 
 EOF
 mycc -o /tmp/ctest2 -Wall -Wextra -O0 -g $dir/ctest2.c || exit 1
 rm $dir/ctest2.c
 
 cd $dir
 cat > Makefile <<EOF
 KMOD= cmalloc2
 SRCS= cmalloc2.c
 
 .include <bsd.kmod.mk>
 EOF
 
 sed '1,/^EOF2/d' < $odir/$0 > cmalloc2.c
 make depend all || exit 1
 kldload $dir/cmalloc2.ko || exit 1
 
 cd $odir
 mw=$((`sysctl -n vm.max_user_wired` - \
     `sysctl -n vm.stats.vm.v_user_wire_count`)) || exit 1
 /tmp/ctest2 `sysctl -n debug.cmalloc_offset` $mw #2>&1 | tail -5
 kldunload $dir/cmalloc2.ko
 rm -rf $dir /tmp/ctest2
 exit 0
 
 EOF2
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
 #include <sys/systm.h>
 
 #define TALLOC 1
 #define TFREE  2
 
 /*
  * Hook up a syscall for contigmalloc testing.
  */
 
 struct cmalloc_args {
         int a_op;
 	void *a_ptr;
 	void *a_size;
 };
 
 static int
 cmalloc(struct thread *td, struct cmalloc_args *uap)
 {
 	void *p;
 	unsigned long size;
 	int error;
 
 	error = copyin(uap->a_size, &size, sizeof(size));
 	if (error != 0) {
 		return (error);
 	}
 	switch (uap->a_op) {
 	case TFREE:
 		error = copyin(uap->a_ptr, &p, sizeof(p));
-		if (error == 0) {
-			if (p != NULL)
-				contigfree(p, size, M_TEMP);
-		}
+		if (error == 0)
+			free(p, M_TEMP);
 		return (error);
 
 	case TALLOC:
 		p = contigmalloc(size, M_TEMP, M_NOWAIT, 0ul, ~0ul, 4096, 0);
 		if (p != NULL) {
 			error = copyout(&p, uap->a_ptr, sizeof(p));
 			return (error);
 		}
 		return (ENOMEM);
 	}
         return (EINVAL);
 }
 
 /*
  * The sysent for the new syscall
  */
 static struct sysent cmalloc_sysent = {
 	.sy_narg =  3,				/* sy_narg */
 	.sy_call = (sy_call_t *) cmalloc	/* sy_call */
 };
 
 /*
  * The offset in sysent where the syscall is allocated.
  */
 static int cmalloc_offset = NO_SYSCALL;
 
 SYSCTL_INT(_debug, OID_AUTO, cmalloc_offset, CTLFLAG_RD, &cmalloc_offset, 0,
     "cmalloc syscall number");
 
 /*
  * The function called at load/unload.
  */
 
 static int
 cmalloc_load(struct module *module, int cmd, void *arg)
 {
         int error = 0;
 
         switch (cmd) {
         case MOD_LOAD :
                 break;
         case MOD_UNLOAD :
                 break;
         default :
                 error = EOPNOTSUPP;
                 break;
         }
         return (error);
 }
 
 SYSCALL_MODULE(cmalloc_syscall, &cmalloc_offset, &cmalloc_sysent,
     cmalloc_load, NULL);
diff --git a/tools/test/stress2/misc/contigmalloc3.sh b/tools/test/stress2/misc/contigmalloc3.sh
index 9baf7c129688..28d5c17e0566 100755
--- a/tools/test/stress2/misc/contigmalloc3.sh
+++ b/tools/test/stress2/misc/contigmalloc3.sh
@@ -1,224 +1,222 @@
 #!/bin/sh
 
 #
 # Copyright (c) 2014 EMC Corp.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 
-# contigmalloc(9) / contigfree(9) test scenario.
+# contigmalloc(9) / free(9) test scenario.
 # Test allocation with 1GB
 
 # "panic: Bad link elm 0x6766fbc next->prev != elm" seen:
 # https://people.freebsd.org/~pho/stress/log/kostik1094.txt
 # Fixed by r331247
 
 [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1
 [ -d /usr/src/sys ] || exit 0
 builddir=`sysctl kern.version | grep @ | sed 's/.*://'`
 [ -d "$builddir" ] && export KERNBUILDDIR=$builddir || exit 0
 export SYSDIR=`echo $builddir | sed 's#/sys.*#/sys#'`
 
 . ../default.cfg
 
 odir=`pwd`
 dir=/tmp/contigmalloc
 rm -rf $dir; mkdir -p $dir
 cat > $dir/ctest.c <<EOF
 #include <sys/param.h>
 #include <sys/syscall.h>
 
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
 
 #define MAXBUF (1LL * 1024 * 1024 * 1024)	/* Max buffer size */
 #define TALLOC 1
 #define TFREE  2
 
 void
 test(int argc, char *argv[])
 {
 	long mw, size;
 	int no, ps, res;
 	char *cp;
 
 	if (argc == 3) {
 		no = atoi(argv[1]);
 		mw = atol(argv[2]);
 	}
 	if (argc != 3 || no == 0 || mw == 0)
 		errx(1, "Usage: %s <syscall number> <max wired>", argv[0]);
 
 	ps = getpagesize();
 	if (mw < MAXBUF / ps) {
 		fprintf(stderr, "max_user_wired too small for this test\n");
 		exit (0);
 	}
 	size = round_page(MAXBUF);
 	res = syscall(no, TALLOC, &cp, &size);
 	if (res == -1) {
 		err(1, "contigmalloc(%lu MB) failed",
 		    size / 1024 / 1024);
 	} else {
 #if defined(TEST)
 		fprintf(stderr, "contigmalloc(%lu pages) %luMB\n",
 		    size / ps, size / 1024 / 1024);
 #endif
 	}
 
 	res = syscall(no, TFREE, &cp, &size);
 #if defined(TEST)
-	fprintf(stderr, "contigfree(%lu pages) %luMB\n",
+	fprintf(stderr, "free(%lu pages) %luMB\n",
 	    size / ps, size / 1024 / 1024);
 #endif
 }
 
 int
 main(int argc, char *argv[])
 {
 
 	test(argc, argv);
 
 	return (0);
 }
 
 EOF
 mycc -o /tmp/ctest -Wall -Wextra -O0 -g $dir/ctest.c || exit 1
 rm $dir/ctest.c
 
 cd $dir
 cat > Makefile <<EOF
 KMOD= cmalloc
 SRCS= cmalloc.c
 
 .include <bsd.kmod.mk>
 EOF
 
 sed '1,/^EOF2/d' < $odir/$0 > cmalloc.c
 make || exit 1
 kldload $dir/cmalloc.ko || exit 1
 
 cd $odir
 mw=`sysctl -n vm.max_user_wired` || exit 1
 /tmp/ctest `sysctl -n debug.cmalloc_offset` $mw 2>&1 | tail -5
 kldunload $dir/cmalloc.ko
 rm -rf $dir /tmp/ctest
 exit 0
 
 EOF2
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
 #include <sys/systm.h>
 
 #define TALLOC 1
 #define TFREE  2
 
 /*
  * Hook up a syscall for contigmalloc testing.
  */
 
 struct cmalloc_args {
         int a_op;
 	void *a_ptr;
 	void *a_size;
 };
 
 static int
 cmalloc(struct thread *td, struct cmalloc_args *uap)
 {
 	void *p;
 	unsigned long size;
 	int error;
 
 	error = copyin(uap->a_size, &size, sizeof(size));
 	if (error != 0) {
 		return (error);
 	}
 	switch (uap->a_op) {
 	case TFREE:
 		error = copyin(uap->a_ptr, &p, sizeof(p));
-		if (error == 0) {
-			if (p != NULL)
-				contigfree(p, size, M_TEMP);
-		}
+		if (error == 0)
+			free(p, M_TEMP);
 		return (error);
 
 	case TALLOC:
 		p = contigmalloc(size, M_TEMP, M_NOWAIT, 0ul, ~0ul, 4096, 0);
 		if (p != NULL) {
 			error = copyout(&p, uap->a_ptr, sizeof(p));
 			return (error);
 		}
 		return (ENOMEM);
 	}
         return (EINVAL);
 }
 
 /*
  * The sysent for the new syscall
  */
 static struct sysent cmalloc_sysent = {
 	.sy_narg =  3,				/* sy_narg */
 	.sy_call = (sy_call_t *) cmalloc	/* sy_call */
 };
 
 /*
  * The offset in sysent where the syscall is allocated.
  */
 static int cmalloc_offset = NO_SYSCALL;
 
 SYSCTL_INT(_debug, OID_AUTO, cmalloc_offset, CTLFLAG_RD, &cmalloc_offset, 0,
     "cmalloc syscall number");
 
 /*
  * The function called at load/unload.
  */
 
 static int
 cmalloc_load(struct module *module, int cmd, void *arg)
 {
         int error = 0;
 
         switch (cmd) {
         case MOD_LOAD :
                 break;
         case MOD_UNLOAD :
                 break;
         default :
                 error = EOPNOTSUPP;
                 break;
         }
         return (error);
 }
 
 SYSCALL_MODULE(cmalloc_syscall, &cmalloc_offset, &cmalloc_sysent,
     cmalloc_load, NULL);