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

pkgdep/git: Add patches to ICE driver for changes in >= 6.11 kernels 



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


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent b8390354

test/common/config/pkgdep/git

+7 −0
Original line number Diff line number Diff line
@@ -440,6 +440,13 @@ function install_ice() { 
			< "$rootdir/test/common/config/pkgdep/patches/ice/0001-xsk_buff_dma.patch"

	fi



	if ge "$kernel_ver" 6.11; then

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

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

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

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

	fi



	(

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

		sudo make -j"$(nproc)" install

test/common/config/pkgdep/patches/ice/0001-kernel_ethtool_ts_info.patch

0 → 100644
+20 −0
Original line number Diff line number Diff line 
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2111375b85ad1

---

 src/ice_ethtool.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



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

index e8aadaa..ceef806 100644

--- a/src/ice_ethtool.c

+++ b/src/ice_ethtool.c

@@ -5330,7 +5330,7 @@ ice_set_rxfh(struct net_device *netdev, const u32 *indir, const u8 *key)

 #endif /* ETHTOOL_GRSSH && ETHTOOL_SRSSH */

 

 static int

-ice_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info)

+ice_get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *info)

 {

 	struct ice_pf *pf = ice_netdev_to_pf(dev);

 

--

test/common/config/pkgdep/patches/ice/0001-ptp.patch

0 → 100644
+31 −0
Original line number Diff line number Diff line 
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d4bea547ebb577a4b4c545a4a81d495cec7eefe1

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

---

 src/ice_ptp.c | 5 +++--

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



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

index b04ea4b..fbc7180 100644

--- a/src/ice_ptp.c

+++ b/src/ice_ptp.c

@@ -4479,7 +4479,8 @@ ice_ptp_get_syncdevicetime(ktime_t *device,

 			hh_ts_lo = rd32(hw, GLHH_ART_TIME_L);

 			hh_ts_hi = rd32(hw, GLHH_ART_TIME_H);

 			hh_ts = ((u64)hh_ts_hi << 32) | hh_ts_lo;

-			*system = convert_art_ns_to_tsc(hh_ts);

+			system->cycles = hh_ts;

+			system->cs_id = CSID_X86_ART;

 			/* Read Device source clock time */

 			hh_ts_lo = rd32(hw, GLTSYN_HHTIME_L(tmr_idx));

 			hh_ts_hi = rd32(hw, GLTSYN_HHTIME_H(tmr_idx));

@@ -5476,7 +5477,7 @@ static struct ice_pf *

 ice_ptp_aux_dev_to_owner_pf(struct auxiliary_device *aux_dev)

 {

 	struct ice_ptp_port_owner *ports_owner;

-	struct auxiliary_driver *aux_drv;

+	const struct auxiliary_driver *aux_drv;

 	struct ice_ptp *owner_ptp;

 

 	if (!aux_dev->dev.driver)

--