Commit 4409ea17 authored by Grzegorz Nitka's avatar Grzegorz Nitka Committed by Jakub Kicinski

ice: Adjust PTP init for 2x50G E825C devices

>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: default avatarGrzegorz Nitka <grzegorz.nitka@intel.com>
Reviewed-by: default avatarArkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
Signed-off-by: default avatarKarol Kolacinski <karol.kolacinski@intel.com>
Tested-by: default avatarPucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com>
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20240528-next-2024-05-28-ptp-refactors-v1-11-c082739bb6f6@intel.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5f847eed
...@@ -157,6 +157,8 @@ ...@@ -157,6 +157,8 @@
#define GLGEN_RTRIG_CORER_M BIT(0) #define GLGEN_RTRIG_CORER_M BIT(0)
#define GLGEN_RTRIG_GLOBR_M BIT(1) #define GLGEN_RTRIG_GLOBR_M BIT(1)
#define GLGEN_STAT 0x000B612C #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 GLGEN_VFLRSTAT(_i) (0x00093A04 + ((_i) * 4))
#define PFGEN_CTRL 0x00091000 #define PFGEN_CTRL 0x00091000
#define PFGEN_CTRL_PFSWR_M BIT(0) #define PFGEN_CTRL_PFSWR_M BIT(0)
...@@ -177,6 +179,8 @@ ...@@ -177,6 +179,8 @@
#define GLINT_CTL_ITR_GRAN_50_M ICE_M(0xF, 24) #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_S 28
#define GLINT_CTL_ITR_GRAN_25_M ICE_M(0xF, 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(_INT) (0x00160000 + ((_INT) * 4))
#define GLINT_DYN_CTL_INTENA_M BIT(0) #define GLINT_DYN_CTL_INTENA_M BIT(0)
#define GLINT_DYN_CTL_CLEARPBA_M BIT(1) #define GLINT_DYN_CTL_CLEARPBA_M BIT(1)
......
...@@ -1469,6 +1469,8 @@ void ice_ptp_link_change(struct ice_pf *pf, u8 port, bool linkup) ...@@ -1469,6 +1469,8 @@ void ice_ptp_link_change(struct ice_pf *pf, u8 port, bool linkup)
return; return;
ptp_port = &pf->ptp.port; 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)) if (WARN_ON_ONCE(ptp_port->port_num != port))
return; return;
...@@ -3282,6 +3284,9 @@ void ice_ptp_init(struct ice_pf *pf) ...@@ -3282,6 +3284,9 @@ void ice_ptp_init(struct ice_pf *pf)
} }
ptp->port.port_num = hw->pf_id; 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); err = ice_ptp_init_port(pf, &ptp->port);
if (err) if (err)
goto err; goto err;
......
...@@ -2644,6 +2644,26 @@ static int ice_get_phy_tx_tstamp_ready_eth56g(struct ice_hw *hw, u8 port, ...@@ -2644,6 +2644,26 @@ static int ice_get_phy_tx_tstamp_ready_eth56g(struct ice_hw *hw, u8 port,
return 0; 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 * ice_ptp_init_phy_e825c - initialize PHY parameters
* @hw: pointer to the HW struct * @hw: pointer to the HW struct
...@@ -2676,6 +2696,8 @@ static void ice_ptp_init_phy_e825c(struct ice_hw *hw) ...@@ -2676,6 +2696,8 @@ static void ice_ptp_init_phy_e825c(struct ice_hw *hw)
return; return;
} }
} }
ptp->is_2x50g_muxed_topo = ice_is_muxed_topo(hw);
} }
/* E822 family functions /* E822 family functions
......
...@@ -853,11 +853,20 @@ enum ice_phy_model { ...@@ -853,11 +853,20 @@ enum ice_phy_model {
ICE_PHY_ETH56G, 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 { struct ice_ptp_hw {
enum ice_phy_model phy_model; enum ice_phy_model phy_model;
union ice_phy_params phy; union ice_phy_params phy;
u8 num_lports; u8 num_lports;
u8 ports_per_phy; u8 ports_per_phy;
bool is_2x50g_muxed_topo;
}; };
/* Port hardware description */ /* Port hardware description */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment