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>
79 lines
2.9 KiB
Diff
79 lines
2.9 KiB
Diff
From 861015cbb4cf4cb258a1da9e80550fe991be7808 Mon Sep 17 00:00:00 2001
|
|
From: Jacob Keller <jacob.e.keller@intel.com>
|
|
Date: Fri, 16 Feb 2024 14:06:38 -0800
|
|
Subject: [PATCH 29/36] ice: remove vf->lan_vsi_num field
|
|
|
|
The lan_vsi_num field of the VF structure is no longer used for any
|
|
purpose. Remove it.
|
|
|
|
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
|
|
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
|
|
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
|
|
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
|
|
(cherry picked from commit 1cf94cbfc61bac89cddeb075fbc100ebd3aea81b)
|
|
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
|
---
|
|
drivers/net/ethernet/intel/ice/ice_sriov.c | 1 -
|
|
drivers/net/ethernet/intel/ice/ice_vf_lib.c | 4 +---
|
|
drivers/net/ethernet/intel/ice/ice_vf_lib.h | 5 -----
|
|
3 files changed, 1 insertion(+), 9 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/intel/ice/ice_sriov.c b/drivers/net/ethernet/intel/ice/ice_sriov.c
|
|
index 442162be23ea..3366ac976c44 100644
|
|
--- a/drivers/net/ethernet/intel/ice/ice_sriov.c
|
|
+++ b/drivers/net/ethernet/intel/ice/ice_sriov.c
|
|
@@ -239,7 +239,6 @@ static struct ice_vsi *ice_vf_vsi_setup(struct ice_vf *vf)
|
|
}
|
|
|
|
vf->lan_vsi_idx = vsi->idx;
|
|
- vf->lan_vsi_num = vsi->vsi_num;
|
|
|
|
return vsi;
|
|
}
|
|
diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.c b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
|
|
index 03b9d7d74851..303fdf8555cf 100644
|
|
--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.c
|
|
+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.c
|
|
@@ -298,7 +298,6 @@ static int ice_vf_rebuild_vsi(struct ice_vf *vf)
|
|
* vf->lan_vsi_idx
|
|
*/
|
|
vsi->vsi_num = ice_get_hw_vsi_num(&pf->hw, vsi->idx);
|
|
- vf->lan_vsi_num = vsi->vsi_num;
|
|
|
|
return 0;
|
|
}
|
|
@@ -1299,13 +1298,12 @@ int ice_vf_init_host_cfg(struct ice_vf *vf, struct ice_vsi *vsi)
|
|
}
|
|
|
|
/**
|
|
- * ice_vf_invalidate_vsi - invalidate vsi_idx/vsi_num to remove VSI access
|
|
+ * ice_vf_invalidate_vsi - invalidate vsi_idx to remove VSI access
|
|
* @vf: VF to remove access to VSI for
|
|
*/
|
|
void ice_vf_invalidate_vsi(struct ice_vf *vf)
|
|
{
|
|
vf->lan_vsi_idx = ICE_NO_VSI;
|
|
- vf->lan_vsi_num = ICE_NO_VSI;
|
|
}
|
|
|
|
/**
|
|
diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.h b/drivers/net/ethernet/intel/ice/ice_vf_lib.h
|
|
index 48fea6fa0362..1de07accbc5c 100644
|
|
--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.h
|
|
+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.h
|
|
@@ -110,11 +110,6 @@ struct ice_vf {
|
|
u8 spoofchk:1;
|
|
u8 link_forced:1;
|
|
u8 link_up:1; /* only valid if VF link is forced */
|
|
- /* VSI indices - actual VSI pointers are maintained in the PF structure
|
|
- * When assigned, these will be non-zero, because VSI 0 is always
|
|
- * the main LAN VSI for the PF.
|
|
- */
|
|
- u16 lan_vsi_num; /* ID as used by firmware */
|
|
unsigned int min_tx_rate; /* Minimum Tx bandwidth limit in Mbps */
|
|
unsigned int max_tx_rate; /* Maximum Tx bandwidth limit in Mbps */
|
|
DECLARE_BITMAP(vf_states, ICE_VF_STATES_NBITS); /* VF runtime states */
|
|
--
|
|
2.43.0
|
|
|