Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Mar 2022 00:21:39 GMT
From:      Eric Joyner <erj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: c185d44f1c5f - stable/13 - ice_ddp: Update to 1.3.27.0
Message-ID:  <202203080021.2280Ld8X072743@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by erj:

URL: https://cgit.FreeBSD.org/src/commit/?id=c185d44f1c5fb1305a560a90c75d186886d0687e

commit c185d44f1c5fb1305a560a90c75d186886d0687e
Author:     Eric Joyner <erj@FreeBSD.org>
AuthorDate: 2021-12-01 20:48:36 +0000
Commit:     Eric Joyner <erj@FreeBSD.org>
CommitDate: 2022-03-08 00:10:48 +0000

    ice_ddp: Update to 1.3.27.0
    
    This is intended to be used with forthcoming ice(4) driver version 1.34.2.
    
    Signed-off-by: Eric Joyner <erj@FreeBSD.org>
    
    Sponsored by:   Intel Corporation
    
    (cherry picked from commit e438f0a97538bf5cf6f3ff70a65c4d1f96b766aa)
---
 sys/conf/files.amd64                               |   6 +--
 sys/conf/files.arm64                               |   6 +--
 sys/conf/files.powerpc                             |   6 +--
 sys/contrib/dev/ice/README                         |  47 ++++++++++-----------
 .../dev/ice/{ice-1.3.24.0.pkg => ice-1.3.27.0.pkg} | Bin 622852 -> 676216 bytes
 sys/modules/ice_ddp/Makefile                       |   2 +-
 6 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index cf9548d50418..36ed2bb88737 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -222,7 +222,7 @@ dev/ice/ice_switch.c		optional	ice pci \
 dev/ice/ice_vlan_mode.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:0x01031800 -mice_ddp -c${.TARGET}"	\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031b00 -mice_ddp -c${.TARGET}"	\
 	no-ctfconvert no-implicit-rule before-depend local	\
 	clean		"ice_ddp.c"
 ice_ddp.fwo			optional ice_ddp	\
@@ -231,8 +231,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.24.0.pkg" \
-	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.24.0.pkg ice_ddp.fw" \
+	dependency	"$S/contrib/dev/ice/ice-1.3.27.0.pkg" \
+	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.27.0.pkg ice_ddp.fw" \
 	no-obj no-implicit-rule				\
 	clean		"ice_ddp.fw"
 dev/ioat/ioat.c			optional	ioat pci
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index c8b2f86a3794..ba43f2647cfd 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -210,7 +210,7 @@ dev/ice/ice_switch.c				optional ice pci \
 dev/ice/ice_vlan_mode.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:0x01031800 -mice_ddp -c${.TARGET}"	\
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031b00 -mice_ddp -c${.TARGET}"	\
 	no-ctfconvert no-implicit-rule before-depend local	\
 	clean		"ice_ddp.c"
 ice_ddp.fwo					optional ice_ddp	\
@@ -219,8 +219,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.24.0.pkg" \
-	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.24.0.pkg ice_ddp.fw" \
+	dependency	"$S/contrib/dev/ice/ice-1.3.27.0.pkg" \
+	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.27.0.pkg ice_ddp.fw" \
 	no-obj no-implicit-rule				\
 	clean		"ice_ddp.fw"
 
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index f0f59940b1f4..233ee5f89743 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -73,7 +73,7 @@ dev/ice/ice_switch.c		optional	ice pci powerpc64 \
 dev/ice/ice_vlan_mode.c		optional	ice pci powerpc64 \
 	compile-with "${NORMAL_C} -I$S/dev/ice"
 ice_ddp.c			optional	ice_ddp powerpc64 \
-	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031800 -mice_ddp -c${.TARGET}"   \
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01031b00 -mice_ddp -c${.TARGET}"	\
 	no-ctfconvert no-implicit-rule before-depend local  \
 	clean		"ice_ddp.c"
 ice_ddp.fwo			optional	ice_ddp powerpc64 \
@@ -82,8 +82,8 @@ ice_ddp.fwo			optional	ice_ddp powerpc64 \
 	no-implicit-rule				\
 	clean		"ice_ddp.fwo"
 ice_ddp.fw			optional	ice_ddp powerpc64 \
-	dependency	"$S/contrib/dev/ice/ice-1.3.24.0.pkg" \
-	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.24.0.pkg ice_ddp.fw" \
+	dependency	"$S/contrib/dev/ice/ice-1.3.27.0.pkg" \
+	compile-with	"${CP} $S/contrib/dev/ice/ice-1.3.27.0.pkg ice_ddp.fw" \
 	no-obj no-implicit-rule				\
 	clean		"ice_ddp.fw"
 dev/ixl/if_ixl.c		optional	ixl pci powerpc64 \
diff --git a/sys/contrib/dev/ice/README b/sys/contrib/dev/ice/README
index 7565aed6f811..e6d126d62877 100644
--- a/sys/contrib/dev/ice/README
+++ b/sys/contrib/dev/ice/README
@@ -1,5 +1,5 @@
-Dynamic Device Personalization (DDP) Package
-============================================
+OS Default Dynamic Device Personalization (DDP) Package
+======================================================================
 July 7, 2020
 
 
@@ -8,15 +8,15 @@ Contents
 - Overview
 - Safe Mode
 - Notes
-- Installation & Troubleshooting
+- Installation & Troubleshooting
 - Legal
 
 
 Overview
 ========
-Adapters based on the Intel(R) Ethernet Controller 800 Series require a Dynamic
-Device Personalization (DDP) package file to enable advanced features (such as
-dynamic tunneling, Flow Director, RSS, and ADQ).
+Devices based on the Intel(R) Ethernet 800 Series require a Dynamic Device
+Personalization (DDP) package file to enable advanced features (such as dynamic
+tunneling, Intel(R) Ethernet Flow Director, RSS, and ADQ).
 
 DDP allows you to change the packet processing pipeline of a device by applying
 a profile package to the device at runtime. Profiles can be used to, for
@@ -28,18 +28,15 @@ The DDP package loads during device initialization. The driver checks to see if
 the DDP package is present and compatible. If this file exists, the driver will
 load it into the device. If the DDP package file is missing or incompatible
 with the driver, the driver will go into Safe Mode where it will use the
-configuration contained in the device's NVM. See "Safe Mode" later in this
-README for more information.
-
-A general purpose, OS-default DDP package is automatically installed with all
-supported Intel Ethernet Controller 800 Series drivers on Microsoft* Windows*,
-ESX*, FreeBSD*, and Linux* operating systems. Additional DDP packages are
-available to address needs for specific market segments. For example, a
-telecommunications (Comms) DDP package is available to support certain
-market-specific protocols in addition to the protocols in the OS-default
-package.
+configuration contained in the device's NVM. Refer to the Intel(R) Ethernet
+Adapters and Devices User Guide for more information on Safe Mode.
+
+A general-purpose, default DDP package is automatically installed with all
+supported Intel Ethernet 800 Series drivers on supported operating systems.
+Additional DDP packages are available to address needs for specific market
+segments or targeted solutions.
 
-The OS-default DDP package supports the following:
+The default DDP package supports the following:
 - MAC
 - EtherType
 - VLAN
@@ -68,8 +65,8 @@ Safe Mode disables advanced and performance features, and supports only basic
 traffic and minimal functionality, such as updating the NVM or downloading a
 new driver or DDP package.
 
-See the Intel(R) Ethernet Adapters and Devices User Guide for more details on
-DDP and Safe Mode.
+Refer to the Intel(R) Ethernet Adapters and Devices User Guide for more details
+on DDP and Safe Mode.
 
 
 Notes
@@ -109,7 +106,7 @@ If you encounter issues with the DDP package file, download the latest driver.
 FreeBSD
 -------
 The FreeBSD driver automatically installs the default DDP package file during
-driver installation. See the ice driver README for general installation and
+driver installation. See the base driver README for general installation and
 building instructions.
 
 The DDP package loads during device initialization. The driver looks for the
@@ -125,18 +122,18 @@ installation so that the driver loads the DDP package automatically.
 Linux
 -----
 The Linux driver automatically installs the default DDP package file during
-driver installation. See the ice driver README for general installation and
+driver installation. Read the base driver README for general installation and
 building instructions.
 
 The DDP package loads during device initialization. The driver looks for
 intel/ice/ddp/ice.pkg in your firmware root (typically /lib/firmware/ or
 /lib/firmware/updates/) and checks that it contains a valid DDP package file.
 The ice.pkg file is a symbolic link to the default DDP package file installed
-by the linux-firmware software package or the ice out-of-tree driver
-installation.
+by the linux-firmware software package or the out-of-tree driver installation.
 
 If you encounter issues with the DDP package file, you may need to download an
-updated driver or DDP package file. See the log messages for more information.
+updated driver or DDP package file. Refer to the log messages for more
+information.
 
 You can install specific DDP package files for different physical devices in
 the same system. To install a specific DDP package:
@@ -177,7 +174,7 @@ If the directory does not yet exist, create it before copying the file.
 5. Reload the driver with the new package.
 
 NOTE: The presence of a device-specific DDP package file overrides the loading
-of the default DDP package file (ice.pkg).
+of the default DDP package file.
 
 
 Legal / Disclaimers
diff --git a/sys/contrib/dev/ice/ice-1.3.24.0.pkg b/sys/contrib/dev/ice/ice-1.3.27.0.pkg
similarity index 76%
rename from sys/contrib/dev/ice/ice-1.3.24.0.pkg
rename to sys/contrib/dev/ice/ice-1.3.27.0.pkg
index db2520cbe9aa..2fcc57d47d5f 100644
Binary files a/sys/contrib/dev/ice/ice-1.3.24.0.pkg and b/sys/contrib/dev/ice/ice-1.3.27.0.pkg differ
diff --git a/sys/modules/ice_ddp/Makefile b/sys/modules/ice_ddp/Makefile
index 563655349bb8..ef0b064503bb 100644
--- a/sys/modules/ice_ddp/Makefile
+++ b/sys/modules/ice_ddp/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 KMOD=	ice_ddp
-FIRMWS=	${SRCTOP}/sys/contrib/dev/ice/ice-1.3.24.0.pkg:ice_ddp:0x01031800
+FIRMWS=	${SRCTOP}/sys/contrib/dev/ice/ice-1.3.27.0.pkg:ice_ddp:0x01031b00
 
 .include <bsd.kmod.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203080021.2280Ld8X072743>