svn commit: r365332 - in head/sys: conf contrib/dev/ice modules/ice_ddp

[Eric Joyner]

Author: erj
Date: Fri Sep  4 17:37:58 2020
New Revision: 365332
URL: https://svnweb.freebsd.org/changeset/base/365332

Log:
  ice_ddp: Update package file to 1.3.16.0
  
  This package is intended to be used with ice(4) version 0.26.16. That
  update will happen in a forthcoming commit.
  
  MFC after:	3 days
  Sponsored by:	Intel Corporation

Added:
  head/sys/contrib/dev/ice/ice-1.3.16.0.pkg
     - copied, changed from r365331, head/sys/contrib/dev/ice/ice-1.3.9.0.pkg
Deleted:
  head/sys/contrib/dev/ice/ice-1.3.9.0.pkg
Modified:
  head/sys/conf/files.amd64
  head/sys/conf/files.arm64
  head/sys/contrib/dev/ice/README
  head/sys/modules/ice_ddp/Makefile

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Fri Sep  4 17:36:15 2020	(r365331)
+++ head/sys/conf/files.amd64	Fri Sep  4 17:37:58 2020	(r365332)
@@ -177,7 +177,7 @@ dev/ice/ice_sriov.c		optional	ice pci \
 dev/ice/ice_switch.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 ice_ddp.c			optional ice_ddp	\
-	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01030900 -mice_ddp -c${.TARGET}"	\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031000 -mice_ddp -c${.TARGET}"	\
 	no-implicit-rule before-depend local		\
 	clean		"ice_ddp.c"
 ice_ddp.fwo			optional ice_ddp	\
@@ -186,8 +186,8 @@ ice_ddp.fwo			optional ice_ddp	\
 	no-implicit-rule				\
 	clean		"ice_ddp.fwo"
 ice_ddp.fw			optional ice_ddp	\
-	dependency	"$S/contrib/dev/ice/ice-1.3.9.0.pkg" \
-	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.9.0.pkg ice_ddp.fw" \
+	dependency	"$S/contrib/dev/ice/ice-1.3.16.0.pkg" \
+	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.16.0.pkg ice_ddp.fw" \
 	no-obj no-implicit-rule				\
 	clean		"ice_ddp.fw"
 dev/ioat/ioat.c			optional	ioat pci

Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64	Fri Sep  4 17:36:15 2020	(r365331)
+++ head/sys/conf/files.arm64	Fri Sep  4 17:37:58 2020	(r365332)
@@ -288,7 +288,7 @@ dev/ice/ice_sriov.c		optional	ice pci \
 dev/ice/ice_switch.c		optional	ice pci \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 ice_ddp.c			optional ice_ddp	\
-	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01030900 -mice_ddp -c${.TARGET}"	\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031000 -mice_ddp -c${.TARGET}"	\
 	no-implicit-rule before-depend local		\
 	clean		"ice_ddp.c"
 ice_ddp.fwo			optional ice_ddp	\
@@ -297,8 +297,8 @@ ice_ddp.fwo			optional ice_ddp	\
 	no-implicit-rule				\
 	clean		"ice_ddp.fwo"
 ice_ddp.fw			optional ice_ddp	\
-	dependency	"$S/contrib/dev/ice/ice-1.3.9.0.pkg" \
-	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.9.0.pkg ice_ddp.fw" \
+	dependency	"$S/contrib/dev/ice/ice-1.3.16.0.pkg" \
+	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.16.0.pkg ice_ddp.fw" \
 	no-obj no-implicit-rule				\
 	clean		"ice_ddp.fw"
 dev/iicbus/sy8106a.c		optional	sy8106a fdt

Modified: head/sys/contrib/dev/ice/README
==============================================================================
--- head/sys/contrib/dev/ice/README	Fri Sep  4 17:36:15 2020	(r365331)
+++ head/sys/contrib/dev/ice/README	Fri Sep  4 17:37:58 2020	(r365332)
@@ -1,6 +1,6 @@
 Dynamic Device Personalization (DDP) Package
 ============================================
-February 21, 2020
+July 7, 2020
 
 
 Contents
@@ -59,6 +59,7 @@ The OS-default DDP package supports the following:
 - GRE
 - NVGRE
 - RoCEv2
+- MPLS (up to 5 consecutive MPLS labels in the outermost Layer 2 header group)
 
 
 Safe Mode

Copied and modified: head/sys/contrib/dev/ice/ice-1.3.16.0.pkg (from r365331, head/sys/contrib/dev/ice/ice-1.3.9.0.pkg)
==============================================================================
Binary file (source and/or target). No diff available.

Modified: head/sys/modules/ice_ddp/Makefile
==============================================================================
--- head/sys/modules/ice_ddp/Makefile	Fri Sep  4 17:36:15 2020	(r365331)
+++ head/sys/modules/ice_ddp/Makefile	Fri Sep  4 17:37:58 2020	(r365332)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 KMOD=	ice_ddp
-FIRMWS=	${SRCTOP}/sys/contrib/dev/ice/ice-1.3.9.0.pkg:ice_ddp:0x01030900
+FIRMWS=	${SRCTOP}/sys/contrib/dev/ice/ice-1.3.16.0.pkg:ice_ddp:0x01031000
 
 .include <bsd.kmod.mk>