Commit 240177af authored by Michal Berger's avatar Michal Berger Committed by Konrad Sztyber
Browse files

pkgdep/git: Update ICE driver to latest version



Needed for the recent changes in the 6.2 kernel.

Also, add an extra patch to address changes in the net/core not
available in the out-of-tree driver.

Change-Id: I2e279a7728bbb462da99b79fad6a91ebd97ecae7
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17337


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKamil Godzwon <kamilx.godzwon@intel.com>
parent f0606142
Loading
Loading
Loading
Loading
+4 −7
Original line number Diff line number Diff line
@@ -337,12 +337,9 @@ function install_ice() {

	curl -L -o- "$ICE_DRIVER" | tar -C "$GIT_REPOS" -xzf -

	if ge "$kernel_ver" 6.1.0; then
		patch --dir="$GIT_REPOS/ice-$ICE_VERSION" -p1 \
			< "$rootdir/test/common/config/pkgdep/patches/ice/0001-ktermios-const.patch"
		patch --dir="$GIT_REPOS/ice-$ICE_VERSION" -p1 \
			< "$rootdir/test/common/config/pkgdep/patches/ice/0001-netif-napi-weight.patch"
	fi
	if ge "$kernel_ver" 6.2.0; then
		patch --dir="$GIT_REPOS/ice-$ICE_VERSION" -p1
	fi < "$rootdir/test/common/config/pkgdep/patches/ice/0001-devlink-info-driver.patch"

	(
		cd "$GIT_REPOS/ice-$ICE_VERSION/src"
@@ -420,7 +417,7 @@ function install_sources() {

GIT_VERSION=2.25.1
IRDMA_VERSION=1.11.16.6
ICE_VERSION=1.10.1.2.2
ICE_VERSION=1.11.14

BPFTRACE_VERSION=${BPFTRACE_VERSION:-36414d9}
VFIO_QEMU_BRANCH=${VFIO_QEMU_BRANCH:-vfio-user-patch1-noreq}
+24 −0
Original line number Diff line number Diff line
See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=226bf980550627c88549b112ac6c8fb40873afb4
---
 src/ice_devlink.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/ice_devlink.c b/src/ice_devlink.c
index 8fbdcef..1fd2ab3 100644
--- a/src/ice_devlink.c
+++ b/src/ice_devlink.c
@@ -357,12 +357,6 @@ static int ice_devlink_info_get(struct devlink *devlink,
 		}
 	}
 
-	err = devlink_info_driver_name_put(req, KBUILD_MODNAME);
-	if (err) {
-		NL_SET_ERR_MSG_MOD(extack, "Unable to set driver name");
-		goto out_free_ctx;
-	}
-
 	ice_info_get_dsn(pf, ctx);
 
 	err = devlink_info_serial_number_put(req, ctx->buf);
-- 
+0 −21
Original line number Diff line number Diff line
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a8c11c1520347

---
 src/ice_gnss.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ice_gnss.c b/src/ice_gnss.c
index f38cbe8..4031f9a 100644
--- a/src/ice_gnss.c
+++ b/src/ice_gnss.c
@@ -414,7 +414,7 @@ static int ice_gnss_tty_write_room(struct tty_struct *tty)
  * @new_termios: pointer to the new termios parameters
  */
 static void
-ice_gnss_tty_set_termios(struct tty_struct *tty, struct ktermios *new_termios)
+ice_gnss_tty_set_termios(struct tty_struct *tty, const struct ktermios *new_termios)
 {
 	/**
 	 * Some 3rd party tools (ex. ubxtool) want to change the TTY parameters.
-- 
+0 −51
Original line number Diff line number Diff line
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b48b89f9c189d24eb5e2b4a0ac067da5a24ee86d

---
 src/ice_base.c    | 3 +--
 src/ice_eswitch.c | 3 +--
 src/ice_main.c    | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/ice_base.c b/src/ice_base.c
index f3cd8dc..1d0115d 100644
--- a/src/ice_base.c
+++ b/src/ice_base.c
@@ -127,8 +127,7 @@ static int ice_vsi_alloc_q_vector(struct ice_vsi *vsi, u16 v_idx)
 	 * handler here (i.e. resume, reset/rebuild, etc.)
 	 */
 	if (vsi->netdev)
-		netif_napi_add(vsi->netdev, &q_vector->napi, ice_napi_poll,
-			       NAPI_POLL_WEIGHT);
+		netif_napi_add(vsi->netdev, &q_vector->napi, ice_napi_poll);
 
 out:
 	/* tie q_vector and VSI together */
diff --git a/src/ice_eswitch.c b/src/ice_eswitch.c
index 06fce56..077804b 100644
--- a/src/ice_eswitch.c
+++ b/src/ice_eswitch.c
@@ -331,8 +331,7 @@ static int ice_eswitch_setup_reprs(struct ice_pf *pf)
 		if (max_vsi_num < vsi->vsi_num)
 			max_vsi_num = vsi->vsi_num;
 
-		netif_napi_add(vf->repr->netdev, &vf->repr->q_vector->napi, ice_napi_poll,
-			       NAPI_POLL_WEIGHT);
+		netif_napi_add(vf->repr->netdev, &vf->repr->q_vector->napi, ice_napi_poll);
 
 		netif_keep_dst(vf->repr->netdev);
 	}
diff --git a/src/ice_main.c b/src/ice_main.c
index bc6e6fa..b805ef3 100644
--- a/src/ice_main.c
+++ b/src/ice_main.c
@@ -4391,7 +4391,7 @@ static void ice_napi_add(struct ice_vsi *vsi)
 
 	ice_for_each_q_vector(vsi, v_idx)
 		netif_napi_add(vsi->netdev, &vsi->q_vectors[v_idx]->napi,
-			       ice_napi_poll, NAPI_POLL_WEIGHT);
+			       ice_napi_poll);
 }
 
 /**
--