svn commit: r325479 - in head/sys/boot: . i386/loader
Author: imp
Date: Mon Nov 6 15:21:45 2017
New Revision: 325479
URL: https://svnweb.freebsd.org/changeset/base/325479
Log:
Define LIBFICL32 to be libficl.a on i386 and libficl32.a on amd64.
Sponsored by: Netflix
Modified:
head/sys/boot/defs.mk
head/sys/boot/i386/loader/Makefile
Modified: head/sys/boot/defs.mk
==
--- head/sys/boot/defs.mk Mon Nov 6 15:21:39 2017(r325478)
+++ head/sys/boot/defs.mk Mon Nov 6 15:21:45 2017(r325479)
@@ -25,7 +25,11 @@ 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"
Modified: head/sys/boot/i386/loader/Makefile
==
--- head/sys/boot/i386/loader/Makefile Mon Nov 6 15:21:39 2017
(r325478)
+++ head/sys/boot/i386/loader/Makefile Mon Nov 6 15:21:45 2017
(r325479)
@@ -101,15 +101,8 @@ 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= ${FICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT}
${LIBSA32}
-LDADD= ${FICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT}
${LIBSA32}
+DPADD= ${LIBFICL32} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT}
${LIBSA32}
+LDADD= ${LIBFICL32} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT}
${LIBSA32}
.include
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r325478 - in head/sys/boot: . libsa32 powerpc powerpc/kboot powerpc/ofw powerpc/ps3 powerpc/uboot
Author: imp
Date: Mon Nov 6 15:21:39 2017
New Revision: 325478
URL: https://svnweb.freebsd.org/changeset/base/325478
Log:
Powerpc is a 32-bit boot loader.
Stop building libsa32 on powerpc. Build everything on powerpc64
-m32. Transition to using LIBSA from LIBSA32. This elimiantes the
useless build of libsa on powerpc64 (nothing used to use it) and
should be a more direct way of saying this.
Sponsored by: Netflix
Modified:
head/sys/boot/Makefile.powerpc
head/sys/boot/defs.mk
head/sys/boot/libsa32/Makefile
head/sys/boot/powerpc/Makefile.inc
head/sys/boot/powerpc/kboot/Makefile
head/sys/boot/powerpc/ofw/Makefile
head/sys/boot/powerpc/ps3/Makefile
head/sys/boot/powerpc/uboot/Makefile
Modified: head/sys/boot/Makefile.powerpc
==
--- head/sys/boot/Makefile.powerpc Mon Nov 6 15:12:30 2017
(r325477)
+++ head/sys/boot/Makefile.powerpc Mon Nov 6 15:21:39 2017
(r325478)
@@ -4,6 +4,5 @@
SUBDIR+= fdt
.endif
-SUBDIR+= libsa32
SUBDIR+= ofw
SUBDIR+= uboot
Modified: head/sys/boot/defs.mk
==
--- head/sys/boot/defs.mk Mon Nov 6 15:12:30 2017(r325477)
+++ head/sys/boot/defs.mk Mon Nov 6 15:21:39 2017(r325478)
@@ -86,4 +86,10 @@ 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
+
.endif # __BOOT_DEFS_MK__
Modified: head/sys/boot/libsa32/Makefile
==
--- head/sys/boot/libsa32/Makefile Mon Nov 6 15:12:30 2017
(r325477)
+++ head/sys/boot/libsa32/Makefile Mon Nov 6 15:21:39 2017
(r325478)
@@ -9,7 +9,7 @@ LIBSA_CPUARCH=i386
LIBSA_CPUARCH=${MACHINE_CPUARCH}
.endif
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
+.if ${MACHINE_ARCH} == "amd64"
CFLAGS+= -m32 -I.
.endif
Modified: head/sys/boot/powerpc/Makefile.inc
==
--- head/sys/boot/powerpc/Makefile.inc Mon Nov 6 15:12:30 2017
(r325477)
+++ head/sys/boot/powerpc/Makefile.inc Mon Nov 6 15:21:39 2017
(r325478)
@@ -1,7 +1,3 @@
# $FreeBSD$
-.if ${MACHINE_ARCH} == "powerpc64"
-CFLAGS+= -m32 -mcpu=powerpc
-.endif
-
.include "../Makefile.inc"
Modified: head/sys/boot/powerpc/kboot/Makefile
==
--- head/sys/boot/powerpc/kboot/MakefileMon Nov 6 15:12:30 2017
(r325477)
+++ head/sys/boot/powerpc/kboot/MakefileMon Nov 6 15:21:39 2017
(r325478)
@@ -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: head/sys/boot/powerpc/ofw/Makefile
==
--- head/sys/boot/powerpc/ofw/Makefile Mon Nov 6 15:12:30 2017
(r325477)
+++ head/sys/boot/powerpc/ofw/Makefile Mon Nov 6 15:21:39 2017
(r325478)
@@ -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: head/sys/boot/powerpc/ps3/Makefile
==
--- head/sys/boot/powerpc/ps3/Makefile Mon Nov 6 15:12:30 2017
(r325477)
+++ head/sys/boot/powerpc/ps3/Makefile Mon Nov 6 15:21:39 2017
(r325478)
@@ -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: head/sys/boot/powerpc/uboot/Makefile
==
--- head/sys/boot/powerpc/uboot/MakefileMon Nov 6 15:12:30 2017
(r325477)
+++ head/sys/b
svn commit: r325480 - in head/sys/boot: . ficl ficl32 libsa32 zfs zfs32
Author: imp
Date: Mon Nov 6 15:21:51 2017
New Revision: 325480
URL: https://svnweb.freebsd.org/changeset/base/325480
Log:
Use DO32 for all the places that we need to flag we're building a 32
bit version of a library. Use a generic name since this may be usefule
elsewhere.
Sponsored by: Netflix
Modified:
head/sys/boot/ficl.mk
head/sys/boot/ficl/Makefile
head/sys/boot/ficl32/Makefile
head/sys/boot/libsa32/Makefile
head/sys/boot/zfs/Makefile
head/sys/boot/zfs32/Makefile
Modified: head/sys/boot/ficl.mk
==
--- head/sys/boot/ficl.mk Mon Nov 6 15:21:45 2017(r325479)
+++ head/sys/boot/ficl.mk Mon Nov 6 15:21:51 2017(r325480)
@@ -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
@@ -15,7 +15,7 @@ FICL_CPUARCH= ${MACHINE_CPUARCH}
.PATH: ${FICLSRC} ${FICLSRC}/${FICL_CPUARCH}
.if ${MACHINE_CPUARCH} == "amd64"
-.if defined(FICL32)
+.if ${DO32:U0} == 1
CFLAGS+= -m32 -I.
.else
CFLAGS+= -fPIC
@@ -30,7 +30,7 @@ CFLAGS+= -I${FICLSRC} -I${FICLSRC}/${FICL_CPUARCH} -I$
CFLAGS+= -DBOOT_FORTH
CFLAGS+= -DBF_DICTSIZE=15000
-.if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32)
+.if ${MACHINE_CPUARCH} == "amd64" && ${DO32:U0} == 1
.if !exists(machine)
${SRCS:M*.c:R:S/$/.o/g}: machine
Modified: head/sys/boot/ficl/Makefile
==
--- head/sys/boot/ficl/Makefile Mon Nov 6 15:21:45 2017(r325479)
+++ head/sys/boot/ficl/Makefile Mon Nov 6 15:21:51 2017(r325480)
@@ -10,9 +10,13 @@ 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))
+(${MACHINE_CPUARCH} == "amd64" && defined(DO32))
CFLAGS+= -march=i386
.endif
+.if ${MACHINE_CPUARCH} == "amd64" && defined(DO32)
+CFLAGS+= -m32
+.endif
+
.if defined(HAVE_PNP)
CFLAGS+= -DHAVE_PNP
.endif
Modified: head/sys/boot/ficl32/Makefile
==
--- head/sys/boot/ficl32/Makefile Mon Nov 6 15:21:45 2017
(r325479)
+++ head/sys/boot/ficl32/Makefile Mon Nov 6 15:21:51 2017
(r325480)
@@ -1,5 +1,5 @@
# $FreeBSD$
-FICL32=
+DO32=1
.include "${.CURDIR}/../ficl/Makefile"
Modified: head/sys/boot/libsa32/Makefile
==
--- head/sys/boot/libsa32/Makefile Mon Nov 6 15:21:45 2017
(r325479)
+++ head/sys/boot/libsa32/Makefile Mon Nov 6 15:21:51 2017
(r325480)
@@ -1,5 +1,7 @@
# $FreeBSD$
+DO32=1
+
.include
LIB=sa32
Modified: head/sys/boot/zfs/Makefile
==
--- head/sys/boot/zfs/Makefile Mon Nov 6 15:21:45 2017(r325479)
+++ head/sys/boot/zfs/Makefile Mon Nov 6 15:21:51 2017(r325480)
@@ -17,16 +17,16 @@ CFLAGS+=-I${SYSDIR}/cddl/boot/zfs
CFLAGS+= -I${SYSDIR}/crypto/skein
.if ${MACHINE_CPUARCH} == "i386" || \
- (${MACHINE_CPUARCH} == "amd64" && defined(ZFS32))
+ (${MACHINE_CPUARCH} == "amd64" && defined(DO32))
CFLAGS+= -march=i386
.endif
-.if ${MACHINE_CPUARCH} == "amd64" && defined(ZFS32)
+.if ${MACHINE_CPUARCH} == "amd64" && defined(DO32)
CFLAGS+= -m32
.endif
CFLAGS+= -Wformat -Wall
-.if ${MACHINE_CPUARCH} == "amd64" && defined(ZFS32)
+.if ${MACHINE_CPUARCH} == "amd64" && defined(DO32)
CLEANFILES+=machine
machine: .NOMETA
ln -sf ${SYSDIR}/i386/include machine
@@ -35,7 +35,7 @@ machine: .NOMETA
.include
.include
-.if ${MACHINE_CPUARCH} == "amd64" && defined(ZFS32)
+.if ${MACHINE_CPUARCH} == "amd64" && defined(DO32)
.if !exists(machine)
beforedepend ${OBJS}: machine
.endif
Modified: head/sys/boot/zfs32/Makefile
==
--- head/sys/boot/zfs32/MakefileMon Nov 6 15:21:45 2017
(r325479)
+++ head/sys/boot/zfs32/MakefileMon Nov 6 15:21:51 2017
(r325480)
@@ -1,5 +1,5 @@
# $FreeBSD$
-ZFS32=1
+DO32=1
.include "${.CURDIR}/../zfs/Makefile"
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r325481 - head/sys/boot/libsa
Author: imp
Date: Mon Nov 6 15:21:56 2017
New Revision: 325481
URL: https://svnweb.freebsd.org/changeset/base/325481
Log:
Prefer bsd.init.mk to other constructs.
Sponsored by: Netflix
Modified:
head/sys/boot/libsa/Makefile
Modified: head/sys/boot/libsa/Makefile
==
--- head/sys/boot/libsa/MakefileMon Nov 6 15:21:51 2017
(r325480)
+++ head/sys/boot/libsa/MakefileMon Nov 6 15:21:56 2017
(r325481)
@@ -9,9 +9,7 @@
MK_PROFILE=no
MK_SSP=no
-.include
-
-.include "../Makefile.inc"
+.include
INTERNALLIB=
LIBSA_CPUARCH?=${MACHINE_CPUARCH}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r325483 - head/sys/boot
Author: imp
Date: Mon Nov 6 15:22:11 2017
New Revision: 325483
URL: https://svnweb.freebsd.org/changeset/base/325483
Log:
MACHINE can never be powerpc64, so cleanup code that thinks it can.
Sponsored by: Netflix
Modified:
head/sys/boot/Makefile
Modified: head/sys/boot/Makefile
==
--- head/sys/boot/Makefile Mon Nov 6 15:22:04 2017(r325482)
+++ head/sys/boot/Makefile Mon Nov 6 15:22:11 2017(r325483)
@@ -13,10 +13,8 @@ SUBDIR+= man
.include
-# 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
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r325482 - in head/sys/boot: . efi/boot1 efi/fdt efi/loader i386 i386/boot2 i386/gptboot i386/gptzfsboot i386/libfirewire i386/libi386 i386/loader i386/zfsboot libsa32 ofw/libofw uboot/f...
Author: imp
Date: Mon Nov 6 15:22:04 2017
New Revision: 325482
URL: https://svnweb.freebsd.org/changeset/base/325482
Log:
Move machine and other link creation to defs.mk
Steal the code from kmod.mk and use it to automatically create
links. Modify it a little for the needs of the loader (no need to
guess the OBJS dependency, and we have 32-on-64 cases to contend
with). Remove 15 redundant implementations (which were mostly
different, but kinda the same).
A future commit should factor out this code and that of kmod.mk so we
have only one copy of it in the tree.
Sposnored by: Netflix
Modified:
head/sys/boot/defs.mk
head/sys/boot/efi/boot1/Makefile
head/sys/boot/efi/fdt/Makefile
head/sys/boot/efi/loader/Makefile
head/sys/boot/ficl.mk
head/sys/boot/i386/Makefile.inc
head/sys/boot/i386/boot2/Makefile
head/sys/boot/i386/gptboot/Makefile
head/sys/boot/i386/gptzfsboot/Makefile
head/sys/boot/i386/libfirewire/Makefile
head/sys/boot/i386/libi386/Makefile
head/sys/boot/i386/loader/Makefile
head/sys/boot/i386/zfsboot/Makefile
head/sys/boot/libsa32/Makefile
head/sys/boot/ofw/libofw/Makefile
head/sys/boot/uboot/fdt/Makefile
head/sys/boot/uboot/lib/Makefile
head/sys/boot/zfs/Makefile
Modified: head/sys/boot/defs.mk
==
--- head/sys/boot/defs.mk Mon Nov 6 15:21:56 2017(r325481)
+++ head/sys/boot/defs.mk Mon Nov 6 15:22:04 2017(r325482)
@@ -96,4 +96,43 @@ CFLAGS+= -DLOADER_GELI_SUPPORT
CFLAGS+= -m32 -mcpu=powerpc
.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: head/sys/boot/efi/boot1/Makefile
==
--- head/sys/boot/efi/boot1/MakefileMon Nov 6 15:21:56 2017
(r325481)
+++ head/sys/boot/efi/boot1/MakefileMon Nov 6 15:22:04 2017
(r325482)
@@ -129,18 +129,3 @@ boot1.efifat: boot1.efi
CLEANFILES= boot1.efi boot1.efifat
.include
-
-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: head/sys/boot/efi/fdt/Makefile
==
--- head/sys/boot/efi/fdt/Makefile Mon Nov 6 15:21:56 2017
(r325481)
+++ head/sys/boot/efi/fdt/Makefile Mon Nov 6 15:22:04 2017
(r325482)
@@ -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
-
-beforedepend ${OBJS}: machine
Modified: head/sys/boot/efi/loader/Makefile
==
--- head/sys/boot/efi/loader/Makefile Mon Nov 6 15:21:56 2017
(r325481)
+++ head/sys/boot/efi/loader/Makefile Mon Nov 6 15:22:04 2017
(r325482)
@@ -133,18 +133,3 @@ DPADD= ${LIBFICL} ${LIBEFI} ${LIBFDT}
${LIBEFI_FDT} $
LDADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBZFSBOOT}
${LIBSA}
.include
-
-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: head/sys/boot/ficl.mk
==
--- head/sys/boot/ficl.mk Mon Nov 6 15:21:56 2017(r325481)
+++ head/sys/boot/ficl.mk
svn commit: r325484 - in head/sys/boot: . efi geli i386 man uboot
Author: imp
Date: Mon Nov 6 15:22:17 2017
New Revision: 325484
URL: https://svnweb.freebsd.org/changeset/base/325484
Log:
Prefer bsd.init.mk to src.opts.mk
Final sweep to prefer bsd.init.mk to src.opts.mk everywhere as a
design pattern. The rule is that all Makefiles in this subtree should
start with .include so that we properly include
../Makefile.inc and defs.mk before anything else.
Sponsored by: Netflix
Modified:
head/sys/boot/Makefile.inc
head/sys/boot/efi/Makefile
head/sys/boot/geli/Makefile
head/sys/boot/i386/Makefile
head/sys/boot/man/Makefile
head/sys/boot/uboot/Makefile
Modified: head/sys/boot/Makefile.inc
==
--- head/sys/boot/Makefile.inc Mon Nov 6 15:22:11 2017(r325483)
+++ head/sys/boot/Makefile.inc Mon Nov 6 15:22:17 2017(r325484)
@@ -1,7 +1,5 @@
# $FreeBSD$
-.include
-
.include "defs.mk"
.if !defined(__BOOT_MAKEFILE_INC__)
Modified: head/sys/boot/efi/Makefile
==
--- head/sys/boot/efi/Makefile Mon Nov 6 15:22:11 2017(r325483)
+++ head/sys/boot/efi/Makefile Mon Nov 6 15:22:17 2017(r325484)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include
+.include
# In-tree GCC does not support __attribute__((ms_abi)), but gcc newer
# than 4.5 supports it.
Modified: head/sys/boot/geli/Makefile
==
--- head/sys/boot/geli/Makefile Mon Nov 6 15:22:11 2017(r325483)
+++ head/sys/boot/geli/Makefile Mon Nov 6 15:22:17 2017(r325484)
@@ -3,9 +3,8 @@
MAN=
-.include
-MK_SSP=no
.include
+MK_SSP=no
LIB= geliboot
INTERNALLIB=
Modified: head/sys/boot/i386/Makefile
==
--- head/sys/boot/i386/Makefile Mon Nov 6 15:22:11 2017(r325483)
+++ head/sys/boot/i386/Makefile Mon Nov 6 15:22:17 2017(r325484)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include
+.include
SUBDIR=mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
libi386 libfirewire loader
Modified: head/sys/boot/man/Makefile
==
--- head/sys/boot/man/Makefile Mon Nov 6 15:22:11 2017(r325483)
+++ head/sys/boot/man/Makefile Mon Nov 6 15:22:17 2017(r325484)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include
+.include
MAN+= loader.8
.if ${MK_ZFS} != "no"
Modified: head/sys/boot/uboot/Makefile
==
--- head/sys/boot/uboot/MakefileMon Nov 6 15:22:11 2017
(r325483)
+++ head/sys/boot/uboot/MakefileMon Nov 6 15:22:17 2017
(r325484)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include
+.include
SUBDIR=lib
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r325485 - in head/sys/boot: . fdt ficl geli i386 libsa32 ofw uboot zfs
Author: imp
Date: Mon Nov 6 15:22:24 2017
New Revision: 325485
URL: https://svnweb.freebsd.org/changeset/base/325485
Log:
Centralize all 32-bit builds on 64-bit platform stuff.
Move the addition of the -m32 and other flags to defs.mk. Remove
redunant copies of -m32 that come from multiple locations.
Sponsored by: Netflix
Modified:
head/sys/boot/defs.mk
head/sys/boot/fdt/Makefile
head/sys/boot/ficl.mk
head/sys/boot/ficl/Makefile
head/sys/boot/geli/Makefile
head/sys/boot/i386/Makefile.inc
head/sys/boot/libsa32/Makefile
head/sys/boot/ofw/Makefile.inc
head/sys/boot/uboot/Makefile.inc
head/sys/boot/zfs/Makefile
Modified: head/sys/boot/defs.mk
==
--- head/sys/boot/defs.mk Mon Nov 6 15:22:17 2017(r325484)
+++ head/sys/boot/defs.mk Mon Nov 6 15:22:24 2017(r325485)
@@ -96,6 +96,16 @@ CFLAGS+= -DLOADER_GELI_SUPPORT
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}
Modified: head/sys/boot/fdt/Makefile
==
--- head/sys/boot/fdt/Makefile Mon Nov 6 15:22:17 2017(r325484)
+++ head/sys/boot/fdt/Makefile Mon Nov 6 15:22:24 2017(r325485)
@@ -22,10 +22,6 @@ CFLAGS+= -ffreestanding
CFLAGS+= -msoft-float
.endif
-.if ${MACHINE_ARCH} == "powerpc64"
-CFLAGS+= -m32
-.endif
-
CFLAGS+= -Wformat -Wall
.include
Modified: head/sys/boot/ficl.mk
==
--- head/sys/boot/ficl.mk Mon Nov 6 15:22:17 2017(r325484)
+++ head/sys/boot/ficl.mk Mon Nov 6 15:22:24 2017(r325485)
@@ -14,16 +14,8 @@ FICL_CPUARCH=${MACHINE_CPUARCH}
.PATH: ${FICLSRC} ${FICLSRC}/${FICL_CPUARCH}
-.if ${MACHINE_CPUARCH} == "amd64"
-.if ${DO32:U0} == 1
-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}
Modified: head/sys/boot/ficl/Makefile
==
--- head/sys/boot/ficl/Makefile Mon Nov 6 15:22:17 2017(r325484)
+++ head/sys/boot/ficl/Makefile Mon Nov 6 15:22:24 2017(r325485)
@@ -9,13 +9,6 @@ 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(DO32))
-CFLAGS+= -march=i386
-.endif
-.if ${MACHINE_CPUARCH} == "amd64" && defined(DO32)
-CFLAGS+= -m32
-.endif
.if defined(HAVE_PNP)
CFLAGS+= -DHAVE_PNP
Modified: head/sys/boot/geli/Makefile
==
--- head/sys/boot/geli/Makefile Mon Nov 6 15:22:17 2017(r325484)
+++ head/sys/boot/geli/Makefile Mon Nov 6 15:22:24 2017(r325485)
@@ -14,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: head/sys/boot/i386/Makefile.inc
==
--- head/sys/boot/i386/Makefile.inc Mon Nov 6 15:22:17 2017
(r325484)
+++ head/sys/boot/i386/Makefile.inc Mon Nov 6 15:22:24 2017
(r325485)
@@ -25,11 +25,6 @@ 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
Modified: head/sys/boot/libsa32/Makefile
==
--- head/sys/boot/libsa32/Makefile Mon Nov 6 15:22:17 2017
(r325484)
+++ head/sys/boot/libsa32/Makefile Mon Nov 6 15:22:24 2017
(r325485)
@@ -5,15 +5,9 @@ DO32=1
.include
LIB=sa32
-.if ${MACHINE_CPUARCH} == "amd64"
-LIBSA_CPUARCH=i386
-.else
-LIBSA_CPUARCH=${MACHINE_CPUARCH}
-.endif
+LIBSA_CPUARCH=${MA
svn commit: r325486 - head
Author: avg Date: Mon Nov 6 15:29:33 2017 New Revision: 325486 URL: https://svnweb.freebsd.org/changeset/base/325486 Log: Add an UPDATING entry for the posix_fallocate/ZFS change, r325320 Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Mon Nov 6 15:22:24 2017(r325485) +++ head/UPDATING Mon Nov 6 15:29:33 2017(r325486) @@ -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 ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r325487 - head/sys/net
Author: shurd
Date: Mon Nov 6 16:23:21 2017
New Revision: 325487
URL: https://svnweb.freebsd.org/changeset/base/325487
Log:
Only chain non-LRO mbufs when LRO is not possible
Preserve packet order between tcp_lro_rx() and if_input() to avoid
creating extra corner cases. If no packets can be LROed, combine them
into one chain for submission via if_input(). If any packet can
potentially be LROed however, retain old behaviour and call if_input()
for each packet.
This should keep the 12% improvement for small packet forwarding intact,
but mostly avoids impacting the LRO case.
Reviewed by: cem, sbruno
Approved by: sbruno (mentor)
Sponsored by: Limelight Networks
Differential Revision:https://reviews.freebsd.org/D12876
Modified:
head/sys/net/iflib.c
Modified: head/sys/net/iflib.c
==
--- head/sys/net/iflib.cMon Nov 6 15:29:33 2017(r325486)
+++ head/sys/net/iflib.cMon Nov 6 16:23:21 2017(r325487)
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
@@ -68,6 +69,8 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
+#include
#include
#include
@@ -2463,7 +2466,48 @@ iflib_rxd_pkt_get(iflib_rxq_t rxq, if_rxd_info_t ri)
return (m);
}
+#if defined(INET6) || defined(INET)
+/*
+ * Returns true if it's possible this packet could be LROed.
+ * if it returns false, it is guaranteed that tcp_lro_rx()
+ * would not return zero.
+ */
static bool
+iflib_check_lro_possible(struct lro_ctrl *lc, struct mbuf *m)
+{
+ struct ether_header *eh;
+ uint16_t eh_type;
+
+ eh = mtod(m, struct ether_header *);
+ eh_type = ntohs(eh->ether_type);
+ switch (eh_type) {
+ case ETHERTYPE_IPV6:
+ {
+ CURVNET_SET(lc->ifp->if_vnet);
+ if (VNET(ip6_forwarding) == 0) {
+ CURVNET_RESTORE();
+ return true;
+ }
+ CURVNET_RESTORE();
+ break;
+ }
+ case ETHERTYPE_IP:
+ {
+ CURVNET_SET(lc->ifp->if_vnet);
+ if (VNET(ipforwarding) == 0) {
+ CURVNET_RESTORE();
+ return true;
+ }
+ CURVNET_RESTORE();
+ break;
+ }
+ }
+
+ return false;
+}
+#endif
+
+static bool
iflib_rxeof(iflib_rxq_t rxq, qidx_t budget)
{
if_ctx_t ctx = rxq->ifr_ctx;
@@ -2476,6 +2520,7 @@ iflib_rxeof(iflib_rxq_t rxq, qidx_t budget)
iflib_fl_t fl;
struct ifnet *ifp;
int lro_enabled;
+ bool lro_possible = false;
/*
* XXX early demux data packets so that if_input processing only handles
@@ -2555,8 +2600,6 @@ iflib_rxeof(iflib_rxq_t rxq, qidx_t budget)
mt = mf = NULL;
while (mh != NULL) {
m = mh;
- if (mf == NULL)
- mf = m;
mh = mh->m_nextpkt;
m->m_nextpkt = NULL;
#ifndef __NO_STRICT_ALIGNMENT
@@ -2566,12 +2609,27 @@ iflib_rxeof(iflib_rxq_t rxq, qidx_t budget)
rx_bytes += m->m_pkthdr.len;
rx_pkts++;
#if defined(INET6) || defined(INET)
- if (lro_enabled && tcp_lro_rx(&rxq->ifr_lc, m, 0) == 0) {
- if (mf == m)
- mf = NULL;
- continue;
+ if (lro_enabled) {
+ if (!lro_possible) {
+ lro_possible =
iflib_check_lro_possible(&rxq->ifr_lc, m);
+ if (lro_possible && mf != NULL) {
+ ifp->if_input(ifp, mf);
+ DBG_COUNTER_INC(rx_if_input);
+ mt = mf = NULL;
+ }
+ }
+ if (lro_possible && tcp_lro_rx(&rxq->ifr_lc, m, 0) == 0)
+ continue;
}
#endif
+ if (lro_possible) {
+ ifp->if_input(ifp, m);
+ DBG_COUNTER_INC(rx_if_input);
+ continue;
+ }
+
+ if (mf == NULL)
+ mf = m;
if (mt != NULL)
mt->m_nextpkt = m;
mt = m;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r325488 - head/sys/dev/bnxt
Author: shurd
Date: Mon Nov 6 16:41:29 2017
New Revision: 325488
URL: https://svnweb.freebsd.org/changeset/base/325488
Log:
bnxt: Add support for new phy_types and speeds - Part #2
Use our ifm_list of supported media types rather than nested switch
statements to find the current media type. Find a supported type that
matches the current speed.
Remove all workarounds while updating ifmr->ifm_active.
For BNXT_IFMEDIA_ADD, added Three more speeds IFM_10G_T, IFM_2500_T &
IFM_2500_KX.
Submitted by: Bhargava Chenna Marreddy
Reviewed by: shurd, sbruno
Approved by: sbruno (mentor)
Sponsored by: Broadcom Limited
Differential Revision:https://reviews.freebsd.org/D12896
Modified:
head/sys/dev/bnxt/if_bnxt.c
Modified: head/sys/dev/bnxt/if_bnxt.c
==
--- head/sys/dev/bnxt/if_bnxt.c Mon Nov 6 16:23:21 2017(r325487)
+++ head/sys/dev/bnxt/if_bnxt.c Mon Nov 6 16:41:29 2017(r325488)
@@ -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_
svn commit: r325490 - head/release
Author: gjb
Date: Mon Nov 6 17:59:04 2017
New Revision: 325490
URL: https://svnweb.freebsd.org/changeset/base/325490
Log:
Specify WITH_UNIFIED_OBJDIR in chroot_arm_build_release() to
ensure the output image is created in the correct .OBJDIR.
Sponsored by: The FreeBSD Foundation
Modified:
head/release/release.sh
Modified: head/release/release.sh
==
--- head/release/release.sh Mon Nov 6 17:27:50 2017(r325489)
+++ head/release/release.sh Mon Nov 6 17:59:04 2017(r325490)
@@ -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}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r325492 - head/sys/dev/ixgbe
Author: sbruno
Date: Mon Nov 6 18:08:59 2017
New Revision: 325492
URL: https://svnweb.freebsd.org/changeset/base/325492
Log:
Fix ixgbe(4) support for ifconfig's vlanhwtag flag. Disabling this flag
will now prevent the driver from stripping vlan tags from packets.
PR: 219390
Submitted by: Piotr Pietruszewski
Reported by: Charles Goncalves
Obtained from:1 week
Sponsored by: Intel Corporation
Differential Revision:https://reviews.freebsd.org/D12795
Modified:
head/sys/dev/ixgbe/if_ix.c
Modified: head/sys/dev/ixgbe/if_ix.c
==
--- head/sys/dev/ixgbe/if_ix.c Mon Nov 6 18:07:23 2017(r325491)
+++ head/sys/dev/ixgbe/if_ix.c Mon Nov 6 18:08:59 2017(r325492)
@@ -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)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r325493 - head/share/mk
Author: bdrewery
Date: Mon Nov 6 19:33:50 2017
New Revision: 325493
URL: https://svnweb.freebsd.org/changeset/base/325493
Log:
Reapply r295227: Stop hiding link install commands.
This was lost in the release-pkg merge in r298107.
Sponsored by: Dell EMC Isilon
Modified:
head/share/mk/bsd.incs.mk
head/share/mk/bsd.links.mk
Modified: head/share/mk/bsd.incs.mk
==
--- head/share/mk/bsd.incs.mk Mon Nov 6 18:08:59 2017(r325492)
+++ head/share/mk/bsd.incs.mk Mon Nov 6 19:33:50 2017(r325493)
@@ -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: head/share/mk/bsd.links.mk
==
--- head/share/mk/bsd.links.mk Mon Nov 6 18:08:59 2017(r325492)
+++ head/share/mk/bsd.links.mk Mon Nov 6 19:33:50 2017(r325493)
@@ -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
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r325494 - head/sys/net
Author: sbruno
Date: Mon Nov 6 19:54:25 2017
New Revision: 325494
URL: https://svnweb.freebsd.org/changeset/base/325494
Log:
Fix NOINET/NOINET6 build during compilation of iflib.
Reported by: kib
Modified:
head/sys/net/iflib.c
Modified: head/sys/net/iflib.c
==
--- head/sys/net/iflib.cMon Nov 6 19:33:50 2017(r325493)
+++ head/sys/net/iflib.cMon Nov 6 19:54:25 2017(r325494)
@@ -2481,6 +2481,7 @@ iflib_check_lro_possible(struct lro_ctrl *lc, struct m
eh = mtod(m, struct ether_header *);
eh_type = ntohs(eh->ether_type);
switch (eh_type) {
+#if defined(INET6)
case ETHERTYPE_IPV6:
{
CURVNET_SET(lc->ifp->if_vnet);
@@ -2491,6 +2492,8 @@ iflib_check_lro_possible(struct lro_ctrl *lc, struct m
CURVNET_RESTORE();
break;
}
+#endif
+#if defined (INET)
case ETHERTYPE_IP:
{
CURVNET_SET(lc->ifp->if_vnet);
@@ -2501,6 +2504,7 @@ iflib_check_lro_possible(struct lro_ctrl *lc, struct m
CURVNET_RESTORE();
break;
}
+#endif
}
return false;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r325320 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
On Thursday, November 02, 2017 10:38:49 AM Ngie Cooper wrote: > > > On Nov 2, 2017, at 06:49, Andriy Gapon wrote: > > > > Author: avg > > Date: Thu Nov 2 13:49:08 2017 > > New Revision: 325320 > > URL: https://svnweb.freebsd.org/changeset/base/325320 > > > > Log: > > Disable posix_fallocate(2) for ZFS > > > > The generic (naive) implementation of posix_fallocate cannot provide the > > standard mandated guarantee that overwrites would never fail due to the > > lack > > of free space. The fundamental reason is the copy-on-write architecture > > of ZFS. Other features like compression and deduplication can also > > increase the size difference between the (pre-)allocated dummy content > > and the future content. > > > > So, until ZFS can properly implement the feature it's better to report > > that it is unsupported rather than providing an ersatz implementation. > > Please note that EINVAL is used to report that the underlying file system > > does not support the operation (POSIX.1-2008). > > > > illumos and ZoL seem to do the same. > > > > MFC after:3 weeks > > Sponsored by:Panzura > > It’d be nice if it worked though and was reported via the file system. Posix > suggests it should be, as of 2013: http://austingroupbugs.net/view.php?id=687 > . > > Need to go poking around and see what’s in freebsd later on tonight. Bug > filed: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223383 . The austingroup link is just about adding a new pathconf() variable. posix_fallocate() would seem to be fundamentally incompatible with COW filesystems and can never work reliably for those. Even if you reserved N free blocks somehow until the first write, that doesn't allow multiple writes to the same file blocks while avoiding block allocation. fallocate only makes sense for overwriting filesystems like UFS. -- John Baldwin ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r325500 - head/lib/libclang_rt
Author: ngie
Date: Tue Nov 7 04:55:23 2017
New Revision: 325500
URL: https://svnweb.freebsd.org/changeset/base/325500
Log:
Use bsd.compiler.mk instead of src.opts.mk
- MK_PROFILE is controlled in bsd.opts.mk, which is pulled in via bsd.own.mk,
which is pulled in via bsd.init.mk . All upstream Makefiles which build off
of this one use bsd.init.mk.
- COMPILER_{TYPE,VERSION} is set via bsd.compiler.mk .
This reduces the namespace pollution/complexity somewhat.
MFC after:1 week
Modified:
head/lib/libclang_rt/Makefile.inc
Modified: head/lib/libclang_rt/Makefile.inc
==
--- head/lib/libclang_rt/Makefile.inc Tue Nov 7 04:26:57 2017
(r325499)
+++ head/lib/libclang_rt/Makefile.inc Tue Nov 7 04:55:23 2017
(r325500)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include
+.include
.if ${MACHINE} == "arm"
.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:M*soft*} == ""
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r325501 - head/lib/libclang_rt
Author: ngie
Date: Tue Nov 7 04:56:53 2017
New Revision: 325501
URL: https://svnweb.freebsd.org/changeset/base/325501
Log:
Remove unnecessary src.opts.mk .include
MK_ isn't used in lib/libcompiler_rt/Makefile at all. Remove it to reduce
namespace pollution.
MFC after:1 week
Modified:
head/lib/libclang_rt/Makefile
Modified: head/lib/libclang_rt/Makefile
==
--- head/lib/libclang_rt/Makefile Tue Nov 7 04:55:23 2017
(r325500)
+++ head/lib/libclang_rt/Makefile Tue Nov 7 04:56:53 2017
(r325501)
@@ -1,7 +1,5 @@
# $FreeBSD$
-.include
-
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
SUBDIR+= include
SUBDIR+= asan
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r325502 - head/lib/libclang_rt
Author: ngie
Date: Tue Nov 7 05:02:36 2017
New Revision: 325502
URL: https://svnweb.freebsd.org/changeset/base/325502
Log:
Handle arm/armv[67] hosted/targeted builds gracefully
CPUTYPE (apparently) isn't defined in non-cross-builds, which caused
arm/armv[67] hosted/targeted builds to fail when evaluating CPUTYPE.
Add the :U modifier to CPUTYPE so it evaluates to "". This allows armv[67] to
get past the conditional successfully.
MFC after:1 week
Reported by: bob prohaska
Modified:
head/lib/libclang_rt/Makefile.inc
Modified: head/lib/libclang_rt/Makefile.inc
==
--- head/lib/libclang_rt/Makefile.inc Tue Nov 7 04:56:53 2017
(r325501)
+++ head/lib/libclang_rt/Makefile.inc Tue Nov 7 05:02:36 2017
(r325502)
@@ -3,7 +3,7 @@
.include
.if ${MACHINE} == "arm"
-.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:M*soft*} == ""
+.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:U:M*soft*} == ""
CRTARCH= armhf
.endif
.endif
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r325504 - head/lib/libclang_rt
Author: ngie
Date: Tue Nov 7 06:26:48 2017
New Revision: 325504
URL: https://svnweb.freebsd.org/changeset/base/325504
Log:
Redo r325502
:U:Mfoo expands to :Mfoo, apparently. Explicit check for CPUTYPE being
defined, and test for it's value not containing *soft* before calling CRTARCH
armhf.
Tested, somewhat. Unfortunately recent changes appear to have affected
cross-builds where it no longer works, per my tests after universe12a being
upgraded from 07/2017 to 11/2017 sources (DESTDIR isn't being used in
WORLDTMP;
MK_SYSTEM_COMPILER might be causing issues right now).
MFC after:1 week
MFC with: r325502
Reported by: imp
Modified:
head/lib/libclang_rt/Makefile.inc
Modified: head/lib/libclang_rt/Makefile.inc
==
--- head/lib/libclang_rt/Makefile.inc Tue Nov 7 05:07:09 2017
(r325503)
+++ head/lib/libclang_rt/Makefile.inc Tue Nov 7 06:26:48 2017
(r325504)
@@ -3,7 +3,8 @@
.include
.if ${MACHINE} == "arm"
-.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:U:M*soft*} == ""
+.if ${MACHINE_ARCH:Marmv[67]*} != "" && \
+(defined(CPUTYPE) && ${CPUTYPE:M*soft*} == "")
CRTARCH= armhf
.endif
.endif
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
