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>
94 lines
3.4 KiB
Diff
94 lines
3.4 KiB
Diff
From 1c89a9e26f669bead5ebcac38fa98c20c517769c Mon Sep 17 00:00:00 2001
|
|
From: Jacob Keller <jacob.e.keller@intel.com>
|
|
Date: Thu, 25 Jan 2024 13:57:55 -0800
|
|
Subject: [PATCH 22/36] ice: stop destroying and reinitalizing Tx tracker
|
|
during reset
|
|
|
|
The ice driver currently attempts to destroy and re-initialize the Tx
|
|
timestamp tracker during the reset flow. The release of the Tx tracker
|
|
only happened during CORE reset or GLOBAL reset. The ice_ptp_rebuild()
|
|
function always calls the ice_ptp_init_tx function which will allocate
|
|
a new tracker data structure, resulting in memory leaks during PF reset.
|
|
|
|
Certainly the driver should not be allocating a new tracker without
|
|
removing the old tracker data, as this results in a memory leak.
|
|
Additionally, there's no reason to remove the tracker memory during a
|
|
reset. Remove this logic from the reset and rebuild flow. Instead of
|
|
releasing the Tx tracker, flush outstanding timestamps just before we
|
|
reset the PHY timestamp block in ice_ptp_cfg_phy_interrupt().
|
|
|
|
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 7a25fe5cd5fb2265065ac6765c53c0a1f1e874d3)
|
|
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
|
---
|
|
drivers/net/ethernet/intel/ice/ice_ptp.c | 33 +++++++++++++++---------
|
|
1 file changed, 21 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
|
|
index 780aa242c86b..48ec59fc5d87 100644
|
|
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
|
|
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
|
|
@@ -963,6 +963,22 @@ ice_ptp_mark_tx_tracker_stale(struct ice_ptp_tx *tx)
|
|
spin_unlock_irqrestore(&tx->lock, flags);
|
|
}
|
|
|
|
+/**
|
|
+ * ice_ptp_flush_all_tx_tracker - Flush all timestamp trackers on this clock
|
|
+ * @pf: Board private structure
|
|
+ *
|
|
+ * Called by the clock owner to flush all the Tx timestamp trackers associated
|
|
+ * with the clock.
|
|
+ */
|
|
+static void
|
|
+ice_ptp_flush_all_tx_tracker(struct ice_pf *pf)
|
|
+{
|
|
+ struct ice_ptp_port *port;
|
|
+
|
|
+ list_for_each_entry(port, &pf->ptp.ports_owner.ports, list_member)
|
|
+ ice_ptp_flush_tx_tracker(ptp_port_to_pf(port), &port->tx);
|
|
+}
|
|
+
|
|
/**
|
|
* ice_ptp_release_tx_tracker - Release allocated memory for Tx tracker
|
|
* @pf: Board private structure
|
|
@@ -2705,6 +2721,11 @@ static int ice_ptp_rebuild_owner(struct ice_pf *pf)
|
|
/* Release the global hardware lock */
|
|
ice_ptp_unlock(hw);
|
|
|
|
+ /* Flush software tracking of any outstanding timestamps since we're
|
|
+ * about to flush the PHY timestamp block.
|
|
+ */
|
|
+ ice_ptp_flush_all_tx_tracker(pf);
|
|
+
|
|
if (!ice_is_e810(hw)) {
|
|
/* Enable quad interrupts */
|
|
err = ice_ptp_cfg_phy_interrupt(pf, true, 1);
|
|
@@ -2741,18 +2762,6 @@ void ice_ptp_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type)
|
|
goto err;
|
|
}
|
|
|
|
- /* Init Tx structures */
|
|
- if (ice_is_e810(&pf->hw)) {
|
|
- err = ice_ptp_init_tx_e810(pf, &ptp->port.tx);
|
|
- } else {
|
|
- kthread_init_delayed_work(&ptp->port.ov_work,
|
|
- ice_ptp_wait_for_offsets);
|
|
- err = ice_ptp_init_tx_e82x(pf, &ptp->port.tx,
|
|
- ptp->port.port_num);
|
|
- }
|
|
- if (err)
|
|
- goto err;
|
|
-
|
|
ptp->state = ICE_PTP_READY;
|
|
|
|
/* Start periodic work going */
|
|
--
|
|
2.43.0
|
|
|