e1164656fb
This upgrades the intel driver versions to the ones listed in Intel driver bundle 29.1. The list can be found here: https://cdrdv2.intel.com/v1/dl/getContent/822537?fileName=Intel +Ethernet+Controller+Products_Release+Notes_29.1.pdf The new versions are: ice-1.14.9.2 (Add automatic VF reset on Tx MDD events, please refer to https://github.com/intel/ethernet-linux-ice/releases) i40e-2.25.7 iavf-4.11.1 Verification: - installs from iso succeed on servers with ice(Intel Ethernet Controller E810-XXVDA4T Westport Channel) and i40e hw(Intel Ethernet Controller X710) for rt and std. - interfaces are up and pass packets for rt and std. - create vfs, ensure that they are picked up by the new iavf driver and that the interface can come up and pass packets on rt and std system. - Check dmesg to see DDP package is loaded successfully and the version is 1.3.36.0 for rt and std. Story: 2011056 Task: 50798 Change-Id: I3acf66e6404c993f4ae56fd45916f24e0b7ec400 Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
52 lines
2.2 KiB
Diff
52 lines
2.2 KiB
Diff
From 0db610ecf34e07fe4ccc1309418b601ed2a5ae05 Mon Sep 17 00:00:00 2001
|
|
From: Li Zhou <li.zhou@windriver.com>
|
|
Date: Thu, 7 Apr 2022 11:42:47 +0800
|
|
Subject: [PATCH] intel-ice: pass linux common header to check_aux_bus
|
|
|
|
For debian, there are two header pkgs, e.g. linux-headers-5.10.0-6-amd64
|
|
and linux-headers-5.10.0-6-common. linux-headers-5.10.0-6-amd64 is
|
|
enough before check_aux_bus is added. But check_aux_bus need files
|
|
in linux-headers-5.10.0-6-common. So pass linux-headers-5.10.0-6-common
|
|
path as the KSRC for check_aux_bus when KSRC_COMMON is exported in
|
|
debian rules.
|
|
|
|
Signed-off-by: Li Zhou <li.zhou@windriver.com>
|
|
[jpm: Refresh patch for ice v1.9.11)]
|
|
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
|
---
|
|
src/common.mk | 9 +++++++--
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/common.mk b/src/common.mk
|
|
index beb9d3f..90d318f 100644
|
|
--- a/src/common.mk
|
|
+++ b/src/common.mk
|
|
@@ -320,7 +320,7 @@ minimum_kver_check = $(eval $(call _minimum_kver_check,${1},${2},${3}))
|
|
# call script that populates defines automatically
|
|
$(if $(shell \
|
|
$(if $(findstring 1,${V}),,QUIET_COMPAT=1) \
|
|
- KSRC=${KSRC} OUT=${src}/kcompat_generated_defs.h CONFIG_FILE=${CONFIG_FILE} \
|
|
+ KSRC=${KSRC_COMMON} OUT=${src}/kcompat_generated_defs.h CONFIG_FILE=${CONFIG_FILE} \
|
|
bash ${src}/kcompat-generator.sh && echo ok), , $(error kcompat-generator.sh failed))
|
|
|
|
################
|
|
@@ -387,9 +387,14 @@ export INSTALL_MOD_DIR ?= updates/drivers/net/ethernet/intel/${DRIVER}
|
|
# If the check_aux_bus script exists, then this driver depends on the
|
|
# auxiliary module. Run the script to determine if we need to include
|
|
# auxiliary files with this build.
|
|
+ifeq (${KSRC_COMMON},)
|
|
+KSRC_AUX := ${KSRC}
|
|
+else
|
|
+KSRC_AUX := ${KSRC_COMMON}
|
|
+endif
|
|
CHECK_AUX_BUS ?= ../scripts/check_aux_bus
|
|
ifneq ($(call test_file,${CHECK_AUX_BUS}),)
|
|
-NEED_AUX_BUS := $(shell ${CHECK_AUX_BUS} --ksrc="${KSRC}" --build-kernel="${BUILD_KERNEL}" >/dev/null 2>&1; echo $$?)
|
|
+NEED_AUX_BUS := $(shell ${CHECK_AUX_BUS} --ksrc="${KSRC_AUX}" --build-kernel="${BUILD_KERNEL}" >/dev/null 2>&1; echo $$?)
|
|
endif # check_aux_bus exists
|
|
|
|
# The out-of-tree auxiliary module we ship should be moved into this
|
|
--
|
|
2.43.0
|
|
|