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>
89 lines
3.2 KiB
Diff
89 lines
3.2 KiB
Diff
From a5318a3a04ed9535ab18ef0f0537b3d33862bee9 Mon Sep 17 00:00:00 2001
|
|
From: Jacob Keller <jacob.e.keller@intel.com>
|
|
Date: Thu, 25 Jan 2024 13:57:53 -0800
|
|
Subject: [PATCH 20/36] ice: rename ice_ptp_tx_cfg_intr
|
|
|
|
The ice_ptp_tx_cfg_intr() function sends a control queue message to
|
|
configure the PHY timestamp interrupt block. This is a very similar name
|
|
to a function which is used to configure the MAC Other Interrupt Cause
|
|
Enable register.
|
|
|
|
Rename this function to ice_ptp_cfg_phy_interrupt in order to make it
|
|
more obvious to the reader what action it performs, and distinguish it
|
|
from other similarly named functions.
|
|
|
|
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
|
|
Signed-off-by: Karol Kolacinski <karol.kolacinski@intel.com>
|
|
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
|
|
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
(cherry picked from commit 1abefdca85e8664374f53c7bc80d5f5f827ce711)
|
|
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
|
---
|
|
drivers/net/ethernet/intel/ice/ice_ptp.c | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
|
|
index ddc2dd0b2a28..c6e9d77fc59b 100644
|
|
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
|
|
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
|
|
@@ -1455,14 +1455,14 @@ void ice_ptp_link_change(struct ice_pf *pf, u8 port, bool linkup)
|
|
}
|
|
|
|
/**
|
|
- * ice_ptp_tx_ena_intr - Enable or disable the Tx timestamp interrupt
|
|
+ * ice_ptp_cfg_phy_interrupt - Configure PHY interrupt settings
|
|
* @pf: PF private structure
|
|
* @ena: bool value to enable or disable interrupt
|
|
* @threshold: Minimum number of packets at which intr is triggered
|
|
*
|
|
* Utility function to enable or disable Tx timestamp interrupt and threshold
|
|
*/
|
|
-static int ice_ptp_tx_ena_intr(struct ice_pf *pf, bool ena, u32 threshold)
|
|
+static int ice_ptp_cfg_phy_interrupt(struct ice_pf *pf, bool ena, u32 threshold)
|
|
{
|
|
struct ice_hw *hw = &pf->hw;
|
|
int err = 0;
|
|
@@ -2664,8 +2664,8 @@ void ice_ptp_reset(struct ice_pf *pf, enum ice_reset_req reset_type)
|
|
struct ice_ptp *ptp = &pf->ptp;
|
|
struct ice_hw *hw = &pf->hw;
|
|
struct timespec64 ts;
|
|
- int err, itr = 1;
|
|
u64 time_diff;
|
|
+ int err;
|
|
|
|
if (ptp->state == ICE_PTP_READY) {
|
|
ice_ptp_prepare_for_reset(pf, reset_type);
|
|
@@ -2716,7 +2716,7 @@ void ice_ptp_reset(struct ice_pf *pf, enum ice_reset_req reset_type)
|
|
|
|
if (!ice_is_e810(hw)) {
|
|
/* Enable quad interrupts */
|
|
- err = ice_ptp_tx_ena_intr(pf, true, itr);
|
|
+ err = ice_ptp_cfg_phy_interrupt(pf, true, 1);
|
|
if (err)
|
|
goto err;
|
|
}
|
|
@@ -2967,7 +2967,7 @@ static int ice_ptp_init_owner(struct ice_pf *pf)
|
|
{
|
|
struct ice_hw *hw = &pf->hw;
|
|
struct timespec64 ts;
|
|
- int err, itr = 1;
|
|
+ int err;
|
|
|
|
err = ice_ptp_init_phc(hw);
|
|
if (err) {
|
|
@@ -3002,7 +3002,7 @@ static int ice_ptp_init_owner(struct ice_pf *pf)
|
|
|
|
if (!ice_is_e810(hw)) {
|
|
/* Enable quad interrupts */
|
|
- err = ice_ptp_tx_ena_intr(pf, true, itr);
|
|
+ err = ice_ptp_cfg_phy_interrupt(pf, true, 1);
|
|
if (err)
|
|
goto err_exit;
|
|
}
|
|
--
|
|
2.43.0
|
|
|