Commit 90562600 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

pkgdep/git: Bump ICE version to the latest release 1.12.7 



Required to smoothly build the driver under 6.5 kernels builds (e.g.
provided by fedora). This also allows us to get rid of our interim
patches.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent e127233b

test/common/config/pkgdep/git

+1 −12
Original line number Diff line number Diff line
@@ -381,17 +381,6 @@ function install_ice() { 


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



	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"



	if ge "$kernel_ver" 6.3.0; then

		patch --dir="$GIT_REPOS/ice-$ICE_VERSION" -p1 \

			 < "$rootdir/test/common/config/pkgdep/patches/ice/0001-devlink-set-features.patch"

		patch --dir="$GIT_REPOS/ice-$ICE_VERSION" -p1 \

			 < "$rootdir/test/common/config/pkgdep/patches/ice/0001-stats-fetch_irq.patch"

	fi



	(

		cd "$GIT_REPOS/ice-$ICE_VERSION/src"

		sudo make -j"$(nproc)" install
@@ -507,7 +496,7 @@ function install_sources() { 


GIT_VERSION=2.25.1

IRDMA_VERSION=1.11.16.6

ICE_VERSION=1.11.17.1

ICE_VERSION=1.12.7



BPFTRACE_VERSION=${BPFTRACE_VERSION:-42d55a0}

VFIO_QEMU_BRANCH=${VFIO_QEMU_BRANCH:-vfio-user-p3.0}

test/common/config/pkgdep/patches/ice/0001-devlink-info-driver.patch

deleted100644 → 0
+0 −24
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);

--

test/common/config/pkgdep/patches/ice/0001-devlink-set-features.patch

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
devlink_set_features() was completely removed in 6.3, see:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fb8421a94c5613fee86e192bab0892ecb1d56e4c

---

 src/ice_devlink.c | 7 -------

 1 file changed, 7 deletions(-)



diff --git a/src/ice_devlink.c b/src/ice_devlink.c

index 1fd2ab3..5acbf3b 100644

--- a/src/ice_devlink.c

+++ b/src/ice_devlink.c

@@ -1322,9 +1322,6 @@ void ice_devlink_register(struct ice_pf *pf)

 {

 	struct devlink *devlink = priv_to_devlink(pf);

 

-#ifdef HAVE_DEVLINK_SET_FEATURES

-	devlink_set_features(devlink, DEVLINK_F_RELOAD);

-#endif /* HAVE_DEVLINK_SET_FEATURES */

 #ifdef HAVE_DEVLINK_REGISTER_SETS_DEV

 	devlink_register(devlink, ice_pf_to_dev(pf));

 #else

@@ -1332,11 +1329,9 @@ void ice_devlink_register(struct ice_pf *pf)

 #endif

 

 #ifdef HAVE_DEVLINK_RELOAD_ACTION_AND_LIMIT

-#ifndef HAVE_DEVLINK_SET_FEATURES

 #ifdef HAVE_DEVLINK_RELOAD_ENABLE_DISABLE

 	devlink_reload_enable(devlink);

 #endif /* HAVE_DEVLINK_RELOAD_ENABLE_DISABLE */

-#endif /* !HAVE_DEVLINK_SET_FEATURES */

 #endif /* HAVE_DEVLINK_RELOAD_ACTION_AND_LIMIT */

 }

 

@@ -1351,11 +1346,9 @@ void ice_devlink_unregister(struct ice_pf *pf)

 	struct devlink *devlink = priv_to_devlink(pf);

 

 #ifdef HAVE_DEVLINK_RELOAD_ACTION_AND_LIMIT

-#ifndef HAVE_DEVLINK_SET_FEATURES

 #ifdef HAVE_DEVLINK_RELOAD_ENABLE_DISABLE

 	devlink_reload_disable(devlink);

 #endif /* HAVE_DEVLINK_RELOAD_ENABLE_DISABLE */

-#endif /* !HAVE_DEVLINK_SET_FEATURES */

 #endif /* HAVE_DEVLINK_RELOAD_ACTION_AND_LIMIT */

 

 	devlink_unregister(devlink);

--

test/common/config/pkgdep/patches/ice/0001-stats-fetch_irq.patch

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
u64_stats_fetch_*_irq() variants were recently removed and are not

available anymore in fedora's 6.3 builds. See:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=068c38ad88ccb09e5e966d4db5cedab0e02b3b95

---

 src/ice_main.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)



diff --git a/src/ice_main.c b/src/ice_main.c

index 7bdd417..88b11fc 100644

--- a/src/ice_main.c

+++ b/src/ice_main.c

@@ -8555,10 +8555,10 @@ ice_fetch_u64_stats_per_ring(struct ice_ring_stats *ring_stat, u64 *pkts,

 	if (!ring_stat)

 		return;

 	do {

-		start = u64_stats_fetch_begin_irq(&ring_stat->syncp);

+		start = u64_stats_fetch_begin(&ring_stat->syncp);

 		*pkts = ring_stat->stats.pkts;

 		*bytes = ring_stat->stats.bytes;

-	} while (u64_stats_fetch_retry_irq(&ring_stat->syncp, start));

+	} while (u64_stats_fetch_retry(&ring_stat->syncp, start));

 }

 

 /**

--