From: Karol Kolacinski <karol.kolacinski@intel.com>
To: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org,
Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>,
Karol Kolacinski <karol.kolacinski@intel.com>,
anthony.l.nguyen@intel.com
Subject: [Intel-wired-lan] [PATCH v10 iwl-next 12/12] ice: Adjust PTP init for 2x50G E825C devices
Date: Wed, 24 Apr 2024 15:30:20 +0200 [thread overview]
Message-ID: <20240424133542.113933-27-karol.kolacinski@intel.com> (raw)
In-Reply-To: <20240424133542.113933-16-karol.kolacinski@intel.com>
From: Grzegorz Nitka <grzegorz.nitka@intel.com>
From FW/HW perspective, 2 port topology in E825C devices requires
merging of 2 port mapping internally and breakout mapping externally.
As a consequence, it requires different port numbering from PTP code
perspective.
For that topology, pf_id can not be used to index PTP ports. Even if
the 2nd port is identified as port with pf_id = 1, all PHY operations
need to be performed as it was port 2. Thus, special mapping is needed
for the 2nd port.
This change adds detection of 2x50G topology and applies 'custom'
mapping on the 2nd port.
Signed-off-by: Grzegorz Nitka <grzegorz.nitka@intel.com>
Reviewed-by: Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
Signed-off-by: Karol Kolacinski <karol.kolacinski@intel.com>
---
V4 -> V5: - reworded commit mesage
- renamed GLGEN_SWITCH_MODE_CONFIG_SELECT_25X4_ON_SINGLE_QUAD_M to
GLGEN_SWITCH_MODE_CONFIG_25X4_QUAD_M
.../net/ethernet/intel/ice/ice_hw_autogen.h | 4 ++++
drivers/net/ethernet/intel/ice/ice_ptp.c | 5 +++++
drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 22 +++++++++++++++++++
drivers/net/ethernet/intel/ice/ice_type.h | 9 ++++++++
4 files changed, 40 insertions(+)
diff --git a/drivers/net/ethernet/intel/ice/ice_hw_autogen.h b/drivers/net/ethernet/intel/ice/ice_hw_autogen.h
index cfac1d432c15..91cbae1eec89 100644
--- a/drivers/net/ethernet/intel/ice/ice_hw_autogen.h
+++ b/drivers/net/ethernet/intel/ice/ice_hw_autogen.h
@@ -157,6 +157,8 @@
#define GLGEN_RTRIG_CORER_M BIT(0)
#define GLGEN_RTRIG_GLOBR_M BIT(1)
#define GLGEN_STAT 0x000B612C
+#define GLGEN_SWITCH_MODE_CONFIG 0x000B81E0
+#define GLGEN_SWITCH_MODE_CONFIG_25X4_QUAD_M BIT(2)
#define GLGEN_VFLRSTAT(_i) (0x00093A04 + ((_i) * 4))
#define PFGEN_CTRL 0x00091000
#define PFGEN_CTRL_PFSWR_M BIT(0)
@@ -177,6 +179,8 @@
#define GLINT_CTL_ITR_GRAN_50_M ICE_M(0xF, 24)
#define GLINT_CTL_ITR_GRAN_25_S 28
#define GLINT_CTL_ITR_GRAN_25_M ICE_M(0xF, 28)
+#define GLGEN_MAC_LINK_TOPO 0x000B81DC
+#define GLGEN_MAC_LINK_TOPO_LINK_TOPO_M GENMASK(1, 0)
#define GLINT_DYN_CTL(_INT) (0x00160000 + ((_INT) * 4))
#define GLINT_DYN_CTL_INTENA_M BIT(0)
#define GLINT_DYN_CTL_CLEARPBA_M BIT(1)
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
index 7a838f5c952d..3c802984c955 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -1472,6 +1472,8 @@ void ice_ptp_link_change(struct ice_pf *pf, u8 port, bool linkup)
return;
ptp_port = &pf->ptp.port;
+ if (ice_is_e825c(hw) && hw->ptp.is_2x50g_muxed_topo)
+ port *= 2;
if (WARN_ON_ONCE(ptp_port->port_num != port))
return;
@@ -3334,6 +3336,9 @@ void ice_ptp_init(struct ice_pf *pf)
}
ptp->port.port_num = hw->pf_id;
+ if (ice_is_e825c(hw) && hw->ptp.is_2x50g_muxed_topo)
+ ptp->port.port_num = hw->pf_id * 2;
+
err = ice_ptp_init_port(pf, &ptp->port);
if (err)
goto err;
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
index 982114d120c8..86947c8aa0c5 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp_hw.c
@@ -2660,6 +2660,26 @@ static int ice_get_phy_tx_tstamp_ready_eth56g(struct ice_hw *hw, u8 port,
return 0;
}
+/**
+ * ice_is_muxed_topo - detect breakout 2x50G topology for E825C
+ * @hw: pointer to the HW struct
+ *
+ * Return: true if it's 2x50 breakout topology, false otherwise
+ */
+static bool ice_is_muxed_topo(struct ice_hw *hw)
+{
+ u8 link_topo;
+ bool mux;
+ u32 val;
+
+ val = rd32(hw, GLGEN_SWITCH_MODE_CONFIG);
+ mux = FIELD_GET(GLGEN_SWITCH_MODE_CONFIG_25X4_QUAD_M, val);
+ val = rd32(hw, GLGEN_MAC_LINK_TOPO);
+ link_topo = FIELD_GET(GLGEN_MAC_LINK_TOPO_LINK_TOPO_M, val);
+
+ return (mux && link_topo == ICE_LINK_TOPO_UP_TO_2_LINKS);
+}
+
/**
* ice_ptp_init_phy_e825c - initialize PHY parameters
* @hw: pointer to the HW struct
@@ -2692,6 +2712,8 @@ static void ice_ptp_init_phy_e825c(struct ice_hw *hw)
return;
}
}
+
+ ptp->is_2x50g_muxed_topo = ice_is_muxed_topo(hw);
}
/* E822 family functions
diff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h
index a3557284036a..89a5aed7ee20 100644
--- a/drivers/net/ethernet/intel/ice/ice_type.h
+++ b/drivers/net/ethernet/intel/ice/ice_type.h
@@ -852,6 +852,14 @@ enum ice_phy_model {
ICE_PHY_ETH56G,
};
+/* Global Link Topology */
+enum ice_global_link_topo {
+ ICE_LINK_TOPO_UP_TO_2_LINKS,
+ ICE_LINK_TOPO_UP_TO_4_LINKS,
+ ICE_LINK_TOPO_UP_TO_8_LINKS,
+ ICE_LINK_TOPO_RESERVED,
+};
+
struct ice_ptp_hw {
enum ice_phy_model phy_model;
union ice_phy_params phy;
@@ -859,6 +867,7 @@ struct ice_ptp_hw {
u8 ports_per_phy;
bool primary_nac;
struct ice_hw *primary_hw;
+ bool is_2x50g_muxed_topo;
};
/* Port hardware description */
--
2.43.0
next prev parent reply other threads:[~2024-04-24 13:38 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 13:30 [Intel-wired-lan] [PATCH v10 iwl-next 01/12] ice: Introduce ice_ptp_hw struct Karol Kolacinski
2024-04-24 13:30 ` [Intel-wired-lan] [PATCH v10 iwl-next 02/12] ice: Introduce helper to get tmr_cmd_reg values Karol Kolacinski
2024-05-17 7:30 ` Pucha, HimasekharX Reddy
2024-04-24 13:30 ` [Intel-wired-lan] [PATCH v10 iwl-next 03/12] ice: Implement Tx interrupt enablement functions Karol Kolacinski
2024-05-17 7:33 ` Pucha, HimasekharX Reddy
2024-04-24 13:30 ` [Intel-wired-lan] [PATCH v10 iwl-next 04/12] ice: Add PHY OFFSET_READY register clearing Karol Kolacinski
2024-05-27 7:53 ` Pucha, HimasekharX Reddy
2024-04-24 13:30 ` [Intel-wired-lan] [PATCH v10 iwl-next 05/12] ice: Move CGU block Karol Kolacinski
2024-05-27 7:55 ` Pucha, HimasekharX Reddy
2024-04-24 13:30 ` [Intel-wired-lan] [PATCH v10 iwl-next 06/12] ice: Introduce ice_get_base_incval() helper Karol Kolacinski
2024-05-17 7:35 ` Pucha, HimasekharX Reddy
2024-04-24 13:30 ` [Intel-wired-lan] [PATCH v10 iwl-next 07/12] ice: Introduce ETH56G PHY model for E825C products Karol Kolacinski
2024-05-17 7:38 ` Pucha, HimasekharX Reddy
2024-04-24 13:30 ` [Intel-wired-lan] [PATCH v10 iwl-next 08/12] ice: Change CGU regs struct to anonymous Karol Kolacinski
2024-05-27 7:59 ` Pucha, HimasekharX Reddy
2024-04-24 13:30 ` [Intel-wired-lan] [PATCH v10 iwl-next 09/12] ice: Add support for E825-C TS PLL handling Karol Kolacinski
2024-05-27 7:57 ` Pucha, HimasekharX Reddy
2024-04-24 13:30 ` [Intel-wired-lan] [PATCH v10 iwl-next 10/12] ice: Add NAC Topology device capability parser Karol Kolacinski
2024-05-17 7:26 ` Pucha, HimasekharX Reddy
2024-04-24 13:30 ` [Intel-wired-lan] [PATCH v10 iwl-next 11/12] ice: Support 2XNAC configuration using auxbus Karol Kolacinski
2024-04-24 13:30 ` Karol Kolacinski [this message]
2024-05-17 7:25 ` [Intel-wired-lan] [PATCH v10 iwl-next 12/12] ice: Adjust PTP init for 2x50G E825C devices Pucha, HimasekharX Reddy
2024-05-17 7:28 ` [Intel-wired-lan] [PATCH v10 iwl-next 01/12] ice: Introduce ice_ptp_hw struct Pucha, HimasekharX Reddy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240424133542.113933-27-karol.kolacinski@intel.com \
--to=karol.kolacinski@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=arkadiusz.kubalewski@intel.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).