svn commit: r325499 - in projects/runtime-coverage: . release release/scripts share/mk sys/boot sys/boot/efi sys/boot/efi/boot1 sys/boot/efi/fdt sys/boot/efi/loader sys/boot/fdt sys/boot/ficl sys/b...
Ngie Cooper
ngie at FreeBSD.org
Tue Nov 7 04:28:18 UTC 2017
Author: ngie
Date: Tue Nov 7 04:26:57 2017
New Revision: 325499
URL: https://svnweb.freebsd.org/changeset/base/325499
Log:
MFhead at r325498
Modified:
projects/runtime-coverage/UPDATING
projects/runtime-coverage/release/release.sh
projects/runtime-coverage/release/scripts/mm-mtree.sh
projects/runtime-coverage/share/mk/bsd.incs.mk
projects/runtime-coverage/share/mk/bsd.links.mk
projects/runtime-coverage/sys/boot/Makefile
projects/runtime-coverage/sys/boot/Makefile.inc
projects/runtime-coverage/sys/boot/Makefile.powerpc
projects/runtime-coverage/sys/boot/defs.mk
projects/runtime-coverage/sys/boot/efi/Makefile
projects/runtime-coverage/sys/boot/efi/boot1/Makefile
projects/runtime-coverage/sys/boot/efi/fdt/Makefile
projects/runtime-coverage/sys/boot/efi/loader/Makefile
projects/runtime-coverage/sys/boot/fdt/Makefile
projects/runtime-coverage/sys/boot/ficl.mk
projects/runtime-coverage/sys/boot/ficl/Makefile
projects/runtime-coverage/sys/boot/ficl32/Makefile
projects/runtime-coverage/sys/boot/geli/Makefile
projects/runtime-coverage/sys/boot/i386/Makefile
projects/runtime-coverage/sys/boot/i386/Makefile.inc
projects/runtime-coverage/sys/boot/i386/boot2/Makefile
projects/runtime-coverage/sys/boot/i386/gptboot/Makefile
projects/runtime-coverage/sys/boot/i386/gptzfsboot/Makefile
projects/runtime-coverage/sys/boot/i386/libfirewire/Makefile
projects/runtime-coverage/sys/boot/i386/libi386/Makefile
projects/runtime-coverage/sys/boot/i386/loader/Makefile
projects/runtime-coverage/sys/boot/i386/zfsboot/Makefile
projects/runtime-coverage/sys/boot/libsa/Makefile
projects/runtime-coverage/sys/boot/libsa32/Makefile
projects/runtime-coverage/sys/boot/man/Makefile
projects/runtime-coverage/sys/boot/ofw/Makefile.inc
projects/runtime-coverage/sys/boot/ofw/libofw/Makefile
projects/runtime-coverage/sys/boot/powerpc/Makefile.inc
projects/runtime-coverage/sys/boot/powerpc/kboot/Makefile
projects/runtime-coverage/sys/boot/powerpc/ofw/Makefile
projects/runtime-coverage/sys/boot/powerpc/ps3/Makefile
projects/runtime-coverage/sys/boot/powerpc/uboot/Makefile
projects/runtime-coverage/sys/boot/uboot/Makefile
projects/runtime-coverage/sys/boot/uboot/Makefile.inc
projects/runtime-coverage/sys/boot/uboot/fdt/Makefile
projects/runtime-coverage/sys/boot/uboot/lib/Makefile
projects/runtime-coverage/sys/boot/zfs/Makefile
projects/runtime-coverage/sys/boot/zfs32/Makefile
projects/runtime-coverage/sys/dev/bnxt/if_bnxt.c
projects/runtime-coverage/sys/dev/ixgbe/if_ix.c
projects/runtime-coverage/sys/kern/kern_rwlock.c
projects/runtime-coverage/sys/kern/vfs_cache.c
projects/runtime-coverage/sys/net/iflib.c
projects/runtime-coverage/sys/powerpc/mpc85xx/fsl_sata.c
Directory Properties:
projects/runtime-coverage/ (props changed)
Modified: projects/runtime-coverage/UPDATING
==============================================================================
--- projects/runtime-coverage/UPDATING Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/UPDATING Tue Nov 7 04:26:57 2017 (r325499)
@@ -51,6 +51,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
****************************** SPECIAL WARNING: ******************************
+20171106:
+ The naive and non-compliant support of posix_fallocate(2) in ZFS
+ has been removed as of r325320. The system call now returns EINVAL
+ when used on a ZFS file. Although the new behavior complies with the
+ standard, some consumers are not prepared to cope with it.
+ One known victim is lld prior to r325420.
+
20171102:
Building in a FreeBSD src checkout will automatically create object
directories now rather than store files in the current directory if
Modified: projects/runtime-coverage/release/release.sh
==============================================================================
--- projects/runtime-coverage/release/release.sh Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/release/release.sh Tue Nov 7 04:26:57 2017 (r325499)
@@ -350,9 +350,6 @@ chroot_build_release() {
# chroot_arm_build_release(): Create arm SD card image.
chroot_arm_build_release() {
load_target_env
- MAKE_FLAGS="${MAKE_FLAGS} TARGET=${EMBEDDED_TARGET}"
- MAKE_FLAGS="${MAKE_FLAGS} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}"
- eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release obj
case ${EMBEDDED_TARGET} in
arm|arm64)
if [ -e "${RELENGDIR}/tools/arm.subr" ]; then
@@ -363,11 +360,14 @@ chroot_arm_build_release() {
;;
esac
[ ! -z "${RELEASECONF}" ] && . "${RELEASECONF}"
- WORLDDIR="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release -V WORLDDIR)"
- OBJDIR="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release -V .OBJDIR)"
- DESTDIR="${OBJDIR}/${KERNEL}"
- IMGBASE="${CHROOTDIR}/${OBJDIR}/${KERNEL}.img"
- OSRELEASE="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release \
+ export MAKE_FLAGS="${MAKE_FLAGS} TARGET=${EMBEDDED_TARGET}"
+ export MAKE_FLAGS="${MAKE_FLAGS} TARGET_ARCH=${EMBEDDED_TARGET_ARCH}"
+ eval chroot ${CHROOTDIR} env WITH_UNIFIED_OBJDIR=1 make ${MAKE_FLAGS} -C /usr/src/release obj
+ export WORLDDIR="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release -V WORLDDIR)"
+ export OBJDIR="$(eval chroot ${CHROOTDIR} env WITH_UNIFIED_OBJDIR=1 make ${MAKE_FLAGS} -C /usr/src/release -V .OBJDIR)"
+ export DESTDIR="${OBJDIR}/${KERNEL}"
+ export IMGBASE="${CHROOTDIR}/${OBJDIR}/${KERNEL}.img"
+ export OSRELEASE="$(eval chroot ${CHROOTDIR} make ${MAKE_FLAGS} -C /usr/src/release \
TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
-V OSRELEASE)"
chroot ${CHROOTDIR} mkdir -p ${DESTDIR}
Modified: projects/runtime-coverage/release/scripts/mm-mtree.sh
==============================================================================
--- projects/runtime-coverage/release/scripts/mm-mtree.sh Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/release/scripts/mm-mtree.sh Tue Nov 7 04:26:57 2017 (r325499)
@@ -114,14 +114,10 @@ echo ''
${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs
;;
esac
- od=${TEMPROOT}/usr/obj
${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs &&
- MAKEOBJDIRPREFIX=$od ${MM_MAKE} kernel-toolchain \
- MK_TOOLCHAIN=no MK_CROSS_COMPILER=no \
- MK_CDDL=no MK_TESTS=no MK_RESCUE=no &&
- MAKEOBJDIRPREFIX=$od ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc &&
- MAKEOBJDIRPREFIX=$od ${MM_MAKE} everything SUBDIR_OVERRIDE=etc &&
- MAKEOBJDIRPREFIX=$od ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} ||
+ ${MM_MAKE} _obj SUBDIR_OVERRIDE=etc &&
+ ${MM_MAKE} everything SUBDIR_OVERRIDE=etc &&
+ ${MM_MAKE} DESTDIR=${TEMPROOT} distribution;} ||
{ echo '';
echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install files to";
echo " the temproot environment";
Modified: projects/runtime-coverage/share/mk/bsd.incs.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.incs.mk Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/share/mk/bsd.incs.mk Tue Nov 7 04:26:57 2017 (r325499)
@@ -89,7 +89,6 @@ _${group}INS: ${_${group}INCS}
.if defined(INCSLINKS) && !empty(INCSLINKS)
installincludes:
.for s t in ${INCSLINKS}
- @${ECHO} "${DESTDIR}${t} -> ${s}" ; \
${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${s} ${DESTDIR}${t}
.endfor
.endif
Modified: projects/runtime-coverage/share/mk/bsd.links.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.links.mk Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/share/mk/bsd.links.mk Tue Nov 7 04:26:57 2017 (r325499)
@@ -15,10 +15,8 @@ afterinstall: _installlinks
.ORDER: realinstall _installlinks
_installlinks:
.for s t in ${LINKS}
- @${ECHO} "${t} -> ${s}" ;\
${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${s} ${DESTDIR}${t}
.endfor
.for s t in ${SYMLINKS}
- @${ECHO} "${t} -> ${s}" ;\
${INSTALL_SYMLINK} ${TAG_ARGS} ${s} ${DESTDIR}${t}
.endfor
Modified: projects/runtime-coverage/sys/boot/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -13,10 +13,8 @@ SUBDIR+= man
.include <bsd.arch.inc.mk>
-# Pick the machine-dependent subdir based on the target architecture.
-ADIR= ${MACHINE:S/powerpc64/powerpc/}
-.if exists(${.CURDIR}/${ADIR}/.)
-SUBDIR+= ${ADIR}
+.if exists(${.CURDIR}/${MACHINE}/.)
+SUBDIR+= ${MACHINE}
.endif
.include <bsd.subdir.mk>
Modified: projects/runtime-coverage/sys/boot/Makefile.inc
==============================================================================
--- projects/runtime-coverage/sys/boot/Makefile.inc Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/Makefile.inc Tue Nov 7 04:26:57 2017 (r325499)
@@ -1,7 +1,5 @@
# $FreeBSD$
-.include <src.opts.mk>
-
MK_COVERAGE= no
.include "defs.mk"
Modified: projects/runtime-coverage/sys/boot/Makefile.powerpc
==============================================================================
--- projects/runtime-coverage/sys/boot/Makefile.powerpc Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/Makefile.powerpc Tue Nov 7 04:26:57 2017 (r325499)
@@ -4,6 +4,5 @@
SUBDIR+= fdt
.endif
-SUBDIR+= libsa32
SUBDIR+= ofw
SUBDIR+= uboot
Modified: projects/runtime-coverage/sys/boot/defs.mk
==============================================================================
--- projects/runtime-coverage/sys/boot/defs.mk Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/defs.mk Tue Nov 7 04:26:57 2017 (r325499)
@@ -25,8 +25,12 @@ BINDIR?= /boot
# NB: The makefiles depend on these being empty when we don't build forth.
.if ${MK_FORTH} != "no"
LIBFICL= ${BOOTOBJ}/ficl/libficl.a
+.if ${MACHINE} == "i386"
+LIBFICL32= ${LIBFICL}
+.else
LIBFICL32= ${BOOTOBJ}/ficl32/libficl.a
.endif
+.endif
LIBSA= ${BOOTOBJ}/libsa/libsa.a
.if ${MACHINE} == "i386"
LIBSA32= ${LIBSA}
@@ -85,5 +89,60 @@ CFLAGS+= -DLOADER_MBR_SUPPORT
CFLAGS+= -DLOADER_GELI_SUPPORT
.endif
.endif
+
+# All PowerPC builds are 32 bit. We have no 64-bit loaders on powerpc
+# or powerpc64.
+.if ${MACHINE_ARCH} == "powerpc64"
+CFLAGS+= -m32 -mcpu=powerpc
+.endif
+
+# For amd64, there's a bit of mixed bag. Some of the tree (i386, lib*32) is
+# build 32-bit and some 64-bit (lib*, efi). Centralize all the 32-bit magic here
+# and activate it when DO32 is explicitly defined to be 1.
+.if ${MACHINE_ARCH} == "amd64" && ${DO32:U0} == 1
+CFLAGS+= -m32 -mcpu=i386
+# LD_FLAGS is passed directly to ${LD}, not via ${CC}:
+LD_FLAGS+= -m elf_i386_fbsd
+AFLAGS+= --32
+.endif
+
+_ILINKS=machine
+.if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64"
+_ILINKS+=${MACHINE_CPUARCH}
+.endif
+.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
+_ILINKS+=x86
+.endif
+CLEANFILES+=${_ILINKS}
+
+all: ${PROG}
+
+beforedepend: ${_ILINKS}
+beforebuild: ${_ILINKS}
+
+# Ensure that the links exist without depending on it when it exists which
+# causes all the modules to be rebuilt when the directory pointed to changes.
+.for _link in ${_ILINKS}
+.if !exists(${.OBJDIR}/${_link})
+${OBJS}: ${_link}
+.endif
+.endfor
+
+.NOPATH: ${_ILINKS}
+
+${_ILINKS}:
+ @case ${.TARGET} in \
+ machine) \
+ if [ ${DO32:U0} -eq 0 ]; then \
+ path=${SYSDIR}/${MACHINE}/include ; \
+ else \
+ path=${SYSDIR}/${MACHINE:C/amd64/i386/}/include ; \
+ fi ;; \
+ *) \
+ path=${SYSDIR}/${.TARGET:T}/include ;; \
+ esac ; \
+ path=`(cd $$path && /bin/pwd)` ; \
+ ${ECHO} ${.TARGET:T} "->" $$path ; \
+ ln -fhs $$path ${.TARGET:T}
.endif # __BOOT_DEFS_MK__
Modified: projects/runtime-coverage/sys/boot/efi/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/efi/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/efi/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <src.opts.mk>
+.include <bsd.init.mk>
# In-tree GCC does not support __attribute__((ms_abi)), but gcc newer
# than 4.5 supports it.
Modified: projects/runtime-coverage/sys/boot/efi/boot1/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/efi/boot1/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/efi/boot1/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -129,18 +129,3 @@ boot1.efifat: boot1.efi
CLEANFILES= boot1.efi boot1.efifat
.include <bsd.prog.mk>
-
-beforedepend ${OBJS}: machine
-
-CLEANFILES+= machine
-
-machine: .NOMETA
- ln -sf ${SYSDIR}/${MACHINE}/include machine
-
-.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
-beforedepend ${OBJS}: x86
-CLEANFILES+= x86
-
-x86: .NOMETA
- ln -sf ${SYSDIR}/x86/include x86
-.endif
Modified: projects/runtime-coverage/sys/boot/efi/fdt/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/efi/fdt/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/efi/fdt/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -27,11 +27,4 @@ CFLAGS+= -I${FDTSRC}
# Pick up the bootstrap header for some interface items
CFLAGS+= -I${LDRSRC} -I${SYSDIR} -I.
-machine: .NOMETA
- ln -sf ${SYSDIR}/${MACHINE}/include machine
-
-CLEANFILES+= machine
-
.include <bsd.lib.mk>
-
-beforedepend ${OBJS}: machine
Modified: projects/runtime-coverage/sys/boot/efi/loader/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/efi/loader/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/efi/loader/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -133,18 +133,3 @@ DPADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} $
LDADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBZFSBOOT} ${LIBSA}
.include <bsd.prog.mk>
-
-beforedepend ${OBJS}: machine
-
-CLEANFILES+= machine
-
-machine: .NOMETA
- ln -sf ${SYSDIR}/${MACHINE}/include machine
-
-.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
-beforedepend ${OBJS}: x86
-CLEANFILES+= x86
-
-x86: .NOMETA
- ln -sf ${SYSDIR}/x86/include x86
-.endif
Modified: projects/runtime-coverage/sys/boot/fdt/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/fdt/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/fdt/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -22,10 +22,6 @@ CFLAGS+= -ffreestanding
CFLAGS+= -msoft-float
.endif
-.if ${MACHINE_ARCH} == "powerpc64"
-CFLAGS+= -m32
-.endif
-
CFLAGS+= -Wformat -Wall
.include <bsd.stand.mk>
Modified: projects/runtime-coverage/sys/boot/ficl.mk
==============================================================================
--- projects/runtime-coverage/sys/boot/ficl.mk Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/ficl.mk Tue Nov 7 04:26:57 2017 (r325499)
@@ -4,7 +4,7 @@
.include "defs.mk"
-.if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32)
+.if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 1
FICL_CPUARCH= i386
.elif ${MACHINE_ARCH:Mmips64*} != ""
FICL_CPUARCH= mips64
@@ -14,31 +14,10 @@ FICL_CPUARCH= ${MACHINE_CPUARCH}
.PATH: ${FICLSRC} ${FICLSRC}/${FICL_CPUARCH}
-.if ${MACHINE_CPUARCH} == "amd64"
-.if defined(FICL32)
-CFLAGS+= -m32 -I.
-.else
+.if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 0
CFLAGS+= -fPIC
.endif
-.endif
-.if ${MACHINE_ARCH} == "powerpc64"
-CFLAGS+= -m32 -mcpu=powerpc -I.
-.endif
-
CFLAGS+= -I${FICLSRC} -I${FICLSRC}/${FICL_CPUARCH} -I${LDRSRC}
CFLAGS+= -DBOOT_FORTH
CFLAGS+= -DBF_DICTSIZE=15000
-
-.if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32)
-.if !exists(machine)
-${SRCS:M*.c:R:S/$/.o/g}: machine
-
-beforedepend ${OBJS}: machine
-.endif
-
-machine: .NOMETA
- ln -sf ${SYSDIR}/i386/include machine
-
-CLEANFILES+= machine
-.endif
Modified: projects/runtime-coverage/sys/boot/ficl/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/ficl/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/ficl/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -9,10 +9,7 @@ BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c
SRCS= ${BASE_SRCS} sysdep.c softcore.c
CLEANFILES= softcore.c testmain testmain.o
-.if ${MACHINE_CPUARCH} == "i386" || \
- (${MACHINE_CPUARCH} == "amd64" && defined(FICL32))
-CFLAGS+= -march=i386
-.endif
+
.if defined(HAVE_PNP)
CFLAGS+= -DHAVE_PNP
.endif
Modified: projects/runtime-coverage/sys/boot/ficl32/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/ficl32/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/ficl32/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -1,5 +1,5 @@
# $FreeBSD$
-FICL32=
+DO32=1
.include "${.CURDIR}/../ficl/Makefile"
Modified: projects/runtime-coverage/sys/boot/geli/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/geli/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/geli/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -3,9 +3,8 @@
MAN=
-.include <src.opts.mk>
-MK_SSP= no
.include <bsd.init.mk>
+MK_SSP= no
LIB= geliboot
INTERNALLIB=
@@ -15,7 +14,7 @@ NO_PIC=
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
CFLAGS+= -march=i386
.endif
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
+.if ${MACHINE_ARCH} == "amd64"
CFLAGS+= -m32
.endif
Modified: projects/runtime-coverage/sys/boot/i386/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/i386/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/i386/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <src.opts.mk>
+.include <bsd.init.mk>
SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
libi386 libfirewire loader
Modified: projects/runtime-coverage/sys/boot/i386/Makefile.inc
==============================================================================
--- projects/runtime-coverage/sys/boot/i386/Makefile.inc Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/i386/Makefile.inc Tue Nov 7 04:26:57 2017 (r325499)
@@ -25,11 +25,7 @@ LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat
LD_FLAGS_BIN=-static -N --gc-sections
.if ${MACHINE_CPUARCH} == "amd64"
-CFLAGS+= -m32
-ACFLAGS+= -m32
-# LD_FLAGS is passed directly to ${LD}, not via ${CC}:
-LD_FLAGS+= -m elf_i386_fbsd
-AFLAGS+= --32
+DO32=1
.endif
.include "../Makefile.inc"
Modified: projects/runtime-coverage/sys/boot/i386/boot2/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/i386/boot2/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/i386/boot2/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -93,13 +93,6 @@ boot2.h: boot1.out
ORG1=`printf "%d" ${ORG1}` \
REL1=`printf "%d" ${REL1}` > ${.TARGET}
-.if ${MACHINE_CPUARCH} == "amd64"
-beforedepend boot2.s: machine
-CLEANFILES+= machine
-machine: ${SYSDIR}/i386/include .NOMETA
- ln -sf ${.ALLSRC} ${.TARGET}
-.endif
-
.include <bsd.prog.mk>
# XXX: clang integrated-as doesn't grok .codeNN directives yet
Modified: projects/runtime-coverage/sys/boot/i386/gptboot/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/i386/gptboot/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/i386/gptboot/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -76,13 +76,6 @@ gptboot.out: ${BTXCRT} gptboot.o sio.o crc32.o drv.o c
gptboot.o: ${SASRC}/ufsread.c
-.if ${MACHINE_CPUARCH} == "amd64"
-beforedepend gptboot.o: machine
-CLEANFILES+= machine
-machine: .NOMETA
- ln -sf ${SYSDIR}/i386/include machine
-.endif
-
.include <bsd.prog.mk>
# XXX: clang integrated-as doesn't grok .codeNN directives yet
Modified: projects/runtime-coverage/sys/boot/i386/gptzfsboot/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/i386/gptzfsboot/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/i386/gptzfsboot/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -88,13 +88,6 @@ gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o gpt.o drv.o
zfsboot.o: ${ZFSSRC}/zfsimpl.c
-.if ${MACHINE_CPUARCH} == "amd64"
-beforedepend zfsboot.o: machine
-CLEANFILES+= machine
-machine: .NOMETA
- ln -sf ${SYSDIR}/i386/include machine
-.endif
-
.include <bsd.prog.mk>
# XXX: clang integrated-as doesn't grok .codeNN directives yet
Modified: projects/runtime-coverage/sys/boot/i386/libfirewire/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/i386/libfirewire/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/i386/libfirewire/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -17,15 +17,4 @@ CFLAGS+= -I${BOOTSRC}/i386/libi386
CFLAGS+= -Wformat -Wall
-.if ${MACHINE_CPUARCH} == "amd64"
-CLEANFILES+= machine
-machine: .NOMETA
- ln -sf ${SYSDIR}/i386/include machine
-.endif
-
.include <bsd.lib.mk>
-
-.if ${MACHINE_CPUARCH} == "amd64"
-beforedepend ${OBJS}: machine
-.endif
-
Modified: projects/runtime-coverage/sys/boot/i386/libi386/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/i386/libi386/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/i386/libi386/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -58,18 +58,8 @@ CFLAGS+= -I${BOOTSRC}/ficl -I${BOOTSRC}/ficl/i386 \
# Handle FreeBSD specific %b and %D printf format specifiers
CFLAGS+= ${FORMAT_EXTENSIONS}
-.if ${MACHINE_CPUARCH} == "amd64"
-CLEANFILES+= machine
-machine: .NOMETA
- ln -sf ${SYSDIR}/i386/include machine
-.endif
-
.include <bsd.lib.mk>
# XXX: clang integrated-as doesn't grok .codeNN directives yet
CFLAGS.amd64_tramp.S= ${CLANG_NO_IAS}
CFLAGS.multiboot_tramp.S= ${CLANG_NO_IAS}
-
-.if ${MACHINE_CPUARCH} == "amd64"
-beforedepend ${OBJS}: machine
-.endif
Modified: projects/runtime-coverage/sys/boot/i386/loader/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/i386/loader/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/i386/loader/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -101,22 +101,11 @@ FILES+= loader.rc menu.rc
# XXX crt0.o needs to be first for pxeboot(8) to work
OBJS= ${BTXCRT}
-# XXX not happy with this construct, revisit
-.if ${MACHINE_CPUARCH} == "amd64"
-FICL= ${LIBFICL32}
-.else
-FICL= ${LIBFICL}
-.endif
+DPADD= ${LIBFICL32} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT} ${LIBSA32}
+LDADD= ${LIBFICL32} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT} ${LIBSA32}
-DPADD= ${FICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT} ${LIBSA32}
-LDADD= ${FICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT} ${LIBSA32}
-
-.include <bsd.prog.mk>
-
.if ${MACHINE_CPUARCH} == "amd64"
-beforedepend ${OBJS}: machine
-CLEANFILES+= machine
CFLAGS+= -DLOADER_PREFER_AMD64
-machine: .NOMETA
- ln -sf ${SYSDIR}/i386/include machine
.endif
+
+.include <bsd.prog.mk>
Modified: projects/runtime-coverage/sys/boot/i386/zfsboot/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/i386/zfsboot/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/i386/zfsboot/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -87,13 +87,6 @@ zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o ut
SRCS= zfsboot.c
-.if ${MACHINE_CPUARCH} == "amd64"
-beforedepend zfsboot.o: machine
-CLEANFILES+= machine
-machine: .NOMETA
- ln -sf ${SYSDIR}/i386/include machine
-.endif
-
.include <bsd.prog.mk>
# XXX: clang integrated-as doesn't grok .codeNN directives yet
Modified: projects/runtime-coverage/sys/boot/libsa/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/libsa/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/libsa/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -9,9 +9,7 @@
MK_PROFILE= no
MK_SSP= no
-.include <src.opts.mk>
-
-.include "../Makefile.inc"
+.include <bsd.init.mk>
INTERNALLIB=
LIBSA_CPUARCH?=${MACHINE_CPUARCH}
Modified: projects/runtime-coverage/sys/boot/libsa32/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/libsa32/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/libsa32/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -1,24 +1,13 @@
# $FreeBSD$
+DO32=1
+
.include <bsd.init.mk>
LIB=sa32
-.if ${MACHINE_CPUARCH} == "amd64"
-LIBSA_CPUARCH=i386
-.else
-LIBSA_CPUARCH=${MACHINE_CPUARCH}
-.endif
+LIBSA_CPUARCH=${MACHINE_CPUARCH:C/amd64/i386/}
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
-CFLAGS+= -m32 -I.
-.endif
+CFLAGS+= -I.
.PATH: ${SASRC}
.include "${SASRC}/Makefile"
-
-.if ${MACHINE_CPUARCH} == "amd64"
-CLEANFILES+= machine
-beforedepend ${OBJS}: machine
-machine: .NOMETA
- ln -fs ${SYSDIR}/i386/include machine
-.endif
Modified: projects/runtime-coverage/sys/boot/man/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/man/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/man/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <src.opts.mk>
+.include <bsd.init.mk>
MAN+= loader.8
.if ${MK_ZFS} != "no"
Modified: projects/runtime-coverage/sys/boot/ofw/Makefile.inc
==============================================================================
--- projects/runtime-coverage/sys/boot/ofw/Makefile.inc Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/ofw/Makefile.inc Tue Nov 7 04:26:57 2017 (r325499)
@@ -1,8 +1,3 @@
# $FreeBSD$
-.if ${MACHINE_ARCH} == "powerpc64"
-CFLAGS+= -m32 -mcpu=powerpc
-LDFLAGS+= -m elf32ppc_fbsd
-.endif
-
.include "../Makefile.inc"
Modified: projects/runtime-coverage/sys/boot/ofw/libofw/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/ofw/libofw/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/ofw/libofw/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -25,11 +25,4 @@ SRCS+= ppc64_elf_freebsd.c
CFLAGS+= -DDISK_DEBUG
.endif
-machine: .NOMETA
- ln -sf ${SYSDIR}/${MACHINE_CPUARCH}/include machine
-
-CLEANFILES+= machine
-
.include <bsd.lib.mk>
-
-beforedepend ${OBJS}: machine
Modified: projects/runtime-coverage/sys/boot/powerpc/Makefile.inc
==============================================================================
--- projects/runtime-coverage/sys/boot/powerpc/Makefile.inc Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/powerpc/Makefile.inc Tue Nov 7 04:26:57 2017 (r325499)
@@ -1,7 +1,3 @@
# $FreeBSD$
-.if ${MACHINE_ARCH} == "powerpc64"
-CFLAGS+= -m32 -mcpu=powerpc
-.endif
-
.include "../Makefile.inc"
Modified: projects/runtime-coverage/sys/boot/powerpc/kboot/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/powerpc/kboot/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/powerpc/kboot/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -51,8 +51,8 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powe
# 64-bit bridge extensions
CFLAGS+= -Wa,-mppc64bridge
-DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
-LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
+DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
+LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
loader.help: help.common help.kboot ${FDTSRC}/help.fdt
cat ${.ALLSRC} | \
Modified: projects/runtime-coverage/sys/boot/powerpc/ofw/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/powerpc/ofw/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/powerpc/ofw/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -55,8 +55,8 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powe
LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a
CFLAGS+= -I${BOOTSRC}/ofw/libofw
-DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
-LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA32}
+DPADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
+LDADD= ${LIBFICL} ${LIBOFW} ${LIBFDT} ${LIBSA}
loader.help: help.common help.ofw ${FDTSRC}/help.fdt
cat ${.ALLSRC} | \
Modified: projects/runtime-coverage/sys/boot/powerpc/ps3/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/powerpc/ps3/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/powerpc/ps3/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -47,8 +47,8 @@ CFLAGS+= -DRELOC=${RELOC}
LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powerpc
-DPADD= ${LIBFICL} ${LIBOFW} ${LIBSA32}
-LDADD= ${LIBFICL} ${LIBOFW} ${LIBSA32}
+DPADD= ${LIBFICL} ${LIBOFW} ${LIBSA}
+LDADD= ${LIBFICL} ${LIBOFW} ${LIBSA}
SC_DFLT_FONT=cp437
Modified: projects/runtime-coverage/sys/boot/powerpc/uboot/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/powerpc/uboot/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/powerpc/uboot/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -35,8 +35,8 @@ LDFLAGS= -nostdlib -static -T ${.CURDIR}/ldscript.powe
.include "${BOOTSRC}/uboot.mk"
-DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA32}
-LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA32}
+DPADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA}
+LDADD= ${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSA}
loader.help: help.common help.uboot ${BOOTSRC}/fdt/help.fdt
cat ${.ALLSRC} | \
Modified: projects/runtime-coverage/sys/boot/uboot/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/uboot/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/uboot/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <src.opts.mk>
+.include <bsd.init.mk>
SUBDIR= lib
Modified: projects/runtime-coverage/sys/boot/uboot/Makefile.inc
==============================================================================
--- projects/runtime-coverage/sys/boot/uboot/Makefile.inc Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/uboot/Makefile.inc Tue Nov 7 04:26:57 2017 (r325499)
@@ -1,8 +1,3 @@
# $FreeBSD$
-.if ${MACHINE_ARCH} == "powerpc64"
-CFLAGS+= -m32 -mcpu=powerpc
-LDFLAGS+= -m elf32ppc_fbsd
-.endif
-
.include "../Makefile.inc"
Modified: projects/runtime-coverage/sys/boot/uboot/fdt/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/uboot/fdt/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/uboot/fdt/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -21,12 +21,5 @@ CFLAGS+= -I${FDTSRC}
# Pick up the bootstrap header for some interface items
CFLAGS+= -I${LDRSRC} -I${SYSDIR} -I.
-machine: .NOMETA
- ln -sf ${SYSDIR}/${MACHINE_CPUARCH}/include machine
-
-CLEANFILES+= machine
-
.include <bsd.stand.mk>
.include <bsd.lib.mk>
-
-beforedepend ${OBJS}: machine
Modified: projects/runtime-coverage/sys/boot/uboot/lib/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/uboot/lib/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/uboot/lib/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -38,12 +38,5 @@ CFLAGS+= -I${LDRSRC} -I${SYSDIR} -I.
CFLAGS+= -DDISK_DEBUG
.endif
-machine: .NOMETA
- ln -sf ${SYSDIR}/${MACHINE_CPUARCH}/include machine
-
-CLEANFILES+= machine
-
.include <bsd.stand.mk>
.include <bsd.lib.mk>
-
-beforedepend ${OBJS}: machine
Modified: projects/runtime-coverage/sys/boot/zfs/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/zfs/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/zfs/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -16,27 +16,7 @@ CFLAGS+= -I${LDRSRC} -I${SYSDIR} -I.
CFLAGS+= -I${SYSDIR}/cddl/boot/zfs
CFLAGS+= -I${SYSDIR}/crypto/skein
-.if ${MACHINE_CPUARCH} == "i386" || \
- (${MACHINE_CPUARCH} == "amd64" && defined(ZFS32))
-CFLAGS+= -march=i386
-.endif
-.if ${MACHINE_CPUARCH} == "amd64" && defined(ZFS32)
-CFLAGS+= -m32
-.endif
-
CFLAGS+= -Wformat -Wall
-.if ${MACHINE_CPUARCH} == "amd64" && defined(ZFS32)
-CLEANFILES+= machine
-machine: .NOMETA
- ln -sf ${SYSDIR}/i386/include machine
-.endif
-
.include <bsd.stand.mk>
.include <bsd.lib.mk>
-
-.if ${MACHINE_CPUARCH} == "amd64" && defined(ZFS32)
-.if !exists(machine)
-beforedepend ${OBJS}: machine
-.endif
-.endif
Modified: projects/runtime-coverage/sys/boot/zfs32/Makefile
==============================================================================
--- projects/runtime-coverage/sys/boot/zfs32/Makefile Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/boot/zfs32/Makefile Tue Nov 7 04:26:57 2017 (r325499)
@@ -1,5 +1,5 @@
# $FreeBSD$
-ZFS32=1
+DO32=1
.include "${.CURDIR}/../zfs/Makefile"
Modified: projects/runtime-coverage/sys/dev/bnxt/if_bnxt.c
==============================================================================
--- projects/runtime-coverage/sys/dev/bnxt/if_bnxt.c Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/dev/bnxt/if_bnxt.c Tue Nov 7 04:26:57 2017 (r325499)
@@ -1198,8 +1198,11 @@ bnxt_media_status(if_ctx_t ctx, struct ifmediareq * if
{
struct bnxt_softc *softc = iflib_get_softc(ctx);
struct bnxt_link_info *link_info = &softc->link_info;
- uint8_t phy_type = get_phy_type(softc);
+ struct ifmedia_entry *next;
+ uint64_t target_baudrate = bnxt_get_baudrate(link_info);
+ int active_media = IFM_UNKNOWN;
+
bnxt_update_link(softc, true);
ifmr->ifm_status = IFM_AVALID;
@@ -1215,171 +1218,17 @@ bnxt_media_status(if_ctx_t ctx, struct ifmediareq * if
else
ifmr->ifm_active |= IFM_HDX;
- switch (link_info->link_speed) {
- case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_100MB:
- ifmr->ifm_active |= IFM_100_T;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_1GB:
- switch (phy_type) {
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKX:
- ifmr->ifm_active |= IFM_1000_KX;
+ /*
+ * Go through the list of supported media which got prepared
+ * as part of bnxt_add_media_types() using api ifmedia_add().
+ */
+ LIST_FOREACH(next, &(iflib_get_media(ctx)->ifm_list), ifm_list) {
+ if (ifmedia_baudrate(next->ifm_media) == target_baudrate) {
+ active_media = next->ifm_media;
break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET:
- ifmr->ifm_active |= IFM_1000_T;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_SGMIIEXTPHY:
- ifmr->ifm_active |= IFM_1000_SGMII;
- break;
- default:
- /*
- * Workaround:
- * Don't return IFM_UNKNOWN until
- * Stratus return proper media_type
- */
- ifmr->ifm_active |= IFM_1000_KX;
- break;
}
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_2_5GB:
- switch (phy_type) {
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKX:
- ifmr->ifm_active |= IFM_2500_KX;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET:
- ifmr->ifm_active |= IFM_2500_T;
- break;
- default:
- ifmr->ifm_active |= IFM_UNKNOWN;
- break;
- }
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_10GB:
- switch (phy_type) {
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASECR:
- ifmr->ifm_active |= IFM_10G_CR1;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR4:
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR2:
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR:
- ifmr->ifm_active |= IFM_10G_KR;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASELR:
- ifmr->ifm_active |= IFM_10G_LR;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASESR:
- ifmr->ifm_active |= IFM_10G_SR;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKX:
- ifmr->ifm_active |= IFM_10G_KX4;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET:
- ifmr->ifm_active |= IFM_10G_T;
- break;
- default:
- /*
- * Workaround:
- * Don't return IFM_UNKNOWN until
- * Stratus return proper media_type
- */
- ifmr->ifm_active |= IFM_10G_CR1;
- break;
- }
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_20GB:
- ifmr->ifm_active |= IFM_20G_KR2;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_25GB:
- switch (phy_type) {
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASECR:
- ifmr->ifm_active |= IFM_25G_CR;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR4:
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR2:
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR:
- ifmr->ifm_active |= IFM_25G_KR;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASESR:
- ifmr->ifm_active |= IFM_25G_SR;
- break;
- default:
- /*
- * Workaround:
- * Don't return IFM_UNKNOWN until
- * Stratus return proper media_type
- */
- ifmr->ifm_active |= IFM_25G_CR;
- break;
- }
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_40GB:
- switch (phy_type) {
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASECR:
- ifmr->ifm_active |= IFM_40G_CR4;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR4:
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR2:
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR:
- ifmr->ifm_active |= IFM_40G_KR4;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASELR:
- ifmr->ifm_active |= IFM_40G_LR4;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASESR:
- ifmr->ifm_active |= IFM_40G_SR4;
- break;
- default:
- ifmr->ifm_active |= IFM_UNKNOWN;
- break;
- }
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_50GB:
- switch (phy_type) {
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASECR:
- ifmr->ifm_active |= IFM_50G_CR2;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR4:
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR2:
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR:
- ifmr->ifm_active |= IFM_50G_KR2;
- break;
- default:
- /*
- * Workaround:
- * Don't return IFM_UNKNOWN until
- * Stratus return proper media_type
- */
- ifmr->ifm_active |= IFM_50G_CR2;
- break;
- }
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_100GB:
- switch (phy_type) {
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASECR:
- ifmr->ifm_active |= IFM_100G_CR4;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR4:
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR2:
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR:
- ifmr->ifm_active |= IFM_100G_KR4;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASELR:
- ifmr->ifm_active |= IFM_100G_LR4;
- break;
- case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASESR:
- ifmr->ifm_active |= IFM_100G_SR4;
- break;
- default:
- /*
- * Workaround:
- * Don't return IFM_UNKNOWN until
- * Stratus return proper media_type
- */
- ifmr->ifm_active |= IFM_100G_CR4;
- break;
- }
- default:
- return;
}
+ ifmr->ifm_active |= active_media;
if (link_info->flow_ctrl.rx)
ifmr->ifm_active |= IFM_ETH_RXPAUSE;
@@ -2184,6 +2033,8 @@ bnxt_add_media_types(struct bnxt_softc *softc)
case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASET:
case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET:
case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASETE:
+ BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_T);
+ BNXT_IFMEDIA_ADD(supported, SPEEDS_2_5GB, IFM_2500_T);
BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_T);
BNXT_IFMEDIA_ADD(supported, SPEEDS_100MB, IFM_100_T);
BNXT_IFMEDIA_ADD(supported, SPEEDS_10MB, IFM_10_T);
@@ -2191,6 +2042,7 @@ bnxt_add_media_types(struct bnxt_softc *softc)
case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKX:
BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_KR);
+ BNXT_IFMEDIA_ADD(supported, SPEEDS_2_5GB, IFM_2500_KX);
BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_KX);
break;
Modified: projects/runtime-coverage/sys/dev/ixgbe/if_ix.c
==============================================================================
--- projects/runtime-coverage/sys/dev/ixgbe/if_ix.c Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/dev/ixgbe/if_ix.c Tue Nov 7 04:26:57 2017 (r325499)
@@ -1754,15 +1754,17 @@ ixgbe_setup_vlan_hw_support(struct adapter *adapter)
return;
/* Setup the queues for vlans */
- for (i = 0; i < adapter->num_queues; i++) {
- rxr = &adapter->rx_rings[i];
- /* On 82599 the VLAN enable is per/queue in RXDCTL */
- if (hw->mac.type != ixgbe_mac_82598EB) {
- ctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(rxr->me));
- ctrl |= IXGBE_RXDCTL_VME;
- IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(rxr->me), ctrl);
+ if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) {
+ for (i = 0; i < adapter->num_queues; i++) {
+ rxr = &adapter->rx_rings[i];
+ /* On 82599 the VLAN enable is per/queue in RXDCTL */
+ if (hw->mac.type != ixgbe_mac_82598EB) {
+ ctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(rxr->me));
+ ctrl |= IXGBE_RXDCTL_VME;
+ IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(rxr->me), ctrl);
+ }
+ rxr->vtag_strip = TRUE;
}
- rxr->vtag_strip = TRUE;
}
if ((ifp->if_capenable & IFCAP_VLAN_HWFILTER) == 0)
Modified: projects/runtime-coverage/sys/kern/kern_rwlock.c
==============================================================================
--- projects/runtime-coverage/sys/kern/kern_rwlock.c Tue Nov 7 01:07:39 2017 (r325498)
+++ projects/runtime-coverage/sys/kern/kern_rwlock.c Tue Nov 7 04:26:57 2017 (r325499)
@@ -842,12 +842,12 @@ __rw_wlock_hard(volatile uintptr_t *c, uintptr_t v, ui
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list