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

pgkdep/git: Bump ICE version and adjust the devlink-set-features.patch 



Needed under latest kernel 6.4. Remove use of devlink_set_features()
completely instead of driving it with a kernel version.

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


Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
parent d91fd042

test/common/config/pkgdep/git

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ function install_sources() { 


GIT_VERSION=2.25.1

IRDMA_VERSION=1.11.16.6

ICE_VERSION=1.11.14

ICE_VERSION=1.11.17.1



BPFTRACE_VERSION=${BPFTRACE_VERSION:-42d55a0}

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

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

+39 −15
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/kcompat_std_defs.h | 5 +++++

 1 file changed, 5 insertions(+)

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

 1 file changed, 7 deletions(-)



diff --git a/src/kcompat_std_defs.h b/src/kcompat_std_defs.h

index 00f3e4d..eea3b0b 100644

--- a/src/kcompat_std_defs.h

+++ b/src/kcompat_std_defs.h

@@ -372,4 +372,9 @@

 #undef HAVE_NDO_GET_DEVLINK_PORT

 #endif /* 6.2.0 */

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);

 

+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6,3,0))

+#else

+#undef HAVE_DEVLINK_SET_FEATURES

+#endif

+

 #endif /* _KCOMPAT_STD_DEFS_H_ */

-#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);

--