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>
81 lines
2.9 KiB
Diff
81 lines
2.9 KiB
Diff
From cd12b5c8239993e395436ff9a01b524103aa0641 Mon Sep 17 00:00:00 2001
|
|
From: Jacob Keller <jacob.e.keller@intel.com>
|
|
Date: Tue, 28 May 2024 16:03:56 -0700
|
|
Subject: [PATCH] ice: Introduce ice_get_base_incval() helper
|
|
|
|
Add a new helper for getting base clock increment value for specific HW.
|
|
|
|
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
|
|
Reviewed-by: Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
|
|
Signed-off-by: Karol Kolacinski <karol.kolacinski@intel.com>
|
|
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com>
|
|
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
|
|
Link: https://lore.kernel.org/r/20240528-next-2024-05-28-ptp-refactors-v1-6-c082739bb6f6@intel.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
(cherry picked from commit 1f374d57c39386520586539641cafc999d0f3ef5)
|
|
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
|
---
|
|
drivers/net/ethernet/intel/ice/ice_ptp.c | 9 +--------
|
|
drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 18 ++++++++++++++++++
|
|
2 files changed, 19 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
|
|
index bb1572a353d0..44b8fc8021cd 100644
|
|
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
|
|
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
|
|
@@ -7,8 +7,6 @@
|
|
|
|
#define E810_OUT_PROP_DELAY_NS 1
|
|
|
|
-#define UNKNOWN_INCVAL_E82X 0x100000000ULL
|
|
-
|
|
static const struct ptp_pin_desc ice_pin_desc_e810t[] = {
|
|
/* name idx func chan */
|
|
{ "GNSS", GNSS, PTP_PF_EXTTS, 0, { 0, } },
|
|
@@ -1229,12 +1227,7 @@ static u64 ice_base_incval(struct ice_pf *pf)
|
|
struct ice_hw *hw = &pf->hw;
|
|
u64 incval;
|
|
|
|
- if (ice_is_e810(hw))
|
|
- incval = ICE_PTP_NOMINAL_INCVAL_E810;
|
|
- else if (ice_e82x_time_ref(hw) < NUM_ICE_TIME_REF_FREQ)
|
|
- incval = ice_e82x_nominal_incval(ice_e82x_time_ref(hw));
|
|
- else
|
|
- incval = UNKNOWN_INCVAL_E82X;
|
|
+ incval = ice_get_base_incval(hw);
|
|
|
|
dev_dbg(ice_pf_to_dev(pf), "PTP: using base increment value of 0x%016llx\n",
|
|
incval);
|
|
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp_hw.h b/drivers/net/ethernet/intel/ice/ice_ptp_hw.h
|
|
index d788221eba57..749a3f2d8293 100644
|
|
--- a/drivers/net/ethernet/intel/ice/ice_ptp_hw.h
|
|
+++ b/drivers/net/ethernet/intel/ice/ice_ptp_hw.h
|
|
@@ -283,6 +283,24 @@ int ice_get_cgu_rclk_pin_info(struct ice_hw *hw, u8 *base_idx, u8 *pin_num);
|
|
int ice_cgu_get_output_pin_state_caps(struct ice_hw *hw, u8 pin_id,
|
|
unsigned long *caps);
|
|
|
|
+/**
|
|
+ * ice_get_base_incval - Get base clock increment value
|
|
+ * @hw: pointer to the HW struct
|
|
+ *
|
|
+ * Return: base clock increment value for supported PHYs, 0 otherwise
|
|
+ */
|
|
+static inline u64 ice_get_base_incval(struct ice_hw *hw)
|
|
+{
|
|
+ switch (hw->ptp.phy_model) {
|
|
+ case ICE_PHY_E810:
|
|
+ return ICE_PTP_NOMINAL_INCVAL_E810;
|
|
+ case ICE_PHY_E82X:
|
|
+ return ice_e82x_nominal_incval(ice_e82x_time_ref(hw));
|
|
+ default:
|
|
+ return 0;
|
|
+ }
|
|
+}
|
|
+
|
|
#define PFTSYN_SEM_BYTES 4
|
|
|
|
#define ICE_PTP_CLOCK_INDEX_0 0x00
|
|
--
|
|
2.43.0
|
|
|