5be9ba03ba
Intel listed total 28 commits that need us to back port. There are
9 commits that are already included in our code base. The commit
"ice: Add support for E825-C TS PLL handling" will not be back
ported since we're not dealing with E825 for 24.09. So we need
back port 18 commits. These commits were introduced in linux-6.9.y
and linux-6.10.y.
To back port these 18 commits successfully, we totally back ported
37 upstream commits.
1) The patches 1-15 are cherry picked to fix the conflicts for patch
16 ("ice: introduce PTP state machine") and patch 36 "ice:
Introduce ice_ptp_hw struct". Also will be helpful for the
subsequent commits back porting.
2) The patches 24-27 are cherry picked to fix the conflicts for patch
28 ("ice: Fix debugfs with devlink reload")
3) The minor adjust was done for the patches 17, 21, 23 and 33 to
fit with the context change.
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: 50950
Change-Id: I9aef0378ea01451684341093a167eaead3edc458
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
33 lines
910 B
Diff
33 lines
910 B
Diff
From 437206483113743a4ef40c2f7e14f09705049672 Mon Sep 17 00:00:00 2001
|
|
From: Jiping Ma <jiping.ma2@windriver.com>
|
|
Date: Mon, 2 Sep 2024 03:18:08 +0000
|
|
Subject: [PATCH] ice:modify the ice driver version to stx.4
|
|
|
|
Change the ice driver min version to stx.4 because we back ported
|
|
the upstream 36 commits to our code base to support the customer's
|
|
requirement.
|
|
|
|
The ice driver version should be ice-6.6.40-stx.4.
|
|
|
|
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
|
---
|
|
Makefile | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 5807b310bdca..7163d25405f8 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1227,7 +1227,7 @@ uapi-asm-generic:
|
|
|
|
# KERNELRELEASE can change from a few different places, meaning version.h
|
|
# needs to be updated, so this check is forced on all builds
|
|
-ICE_STX = "-stx.3"
|
|
+ICE_STX = "-stx.4"
|
|
I40E_STX = "-stx.0"
|
|
IAVF_STX = "-stx.0"
|
|
|
|
--
|
|
2.43.0
|
|
|