Indicate support for some of the loopback modes known to EFX.
Such have been technology-dependent, but, on netport capable
NICs, they are backed by new generic modes, that are tied to
the stages in the processing chain where loopback can happen.
Signed-off-by: Ivan Malov <ivan.ma...@arknetworks.am>
Reviewed-by: Andy Moreton <andy.more...@amd.com>
Reviewed-by: Pieter Jansen Van Vuuren <pieter.jansen-van-vuu...@amd.com>
---
drivers/common/sfc_efx/base/efx.h | 1 +
drivers/common/sfc_efx/base/efx_impl.h | 2 +
drivers/common/sfc_efx/base/efx_np.c | 159 ++++++++++++++++++++++++-
3 files changed, 160 insertions(+), 2 deletions(-)
diff --git a/drivers/common/sfc_efx/base/efx.h
b/drivers/common/sfc_efx/base/efx.h
index 2c6af5f6b5..7ffa1f4cbd 100644
--- a/drivers/common/sfc_efx/base/efx.h
+++ b/drivers/common/sfc_efx/base/efx.h
@@ -655,6 +655,7 @@ typedef enum efx_link_mode_e {
EFX_LINK_25000FDX,
EFX_LINK_50000FDX,
EFX_LINK_100000FDX,
+ EFX_LINK_200000FDX,
EFX_LINK_NMODES
} efx_link_mode_t;
diff --git a/drivers/common/sfc_efx/base/efx_impl.h
b/drivers/common/sfc_efx/base/efx_impl.h
index a3e60fd19b..3a9c6fe3fd 100644
--- a/drivers/common/sfc_efx/base/efx_impl.h
+++ b/drivers/common/sfc_efx/base/efx_impl.h
@@ -382,6 +382,8 @@ typedef struct efx_port_s {
const efx_phy_ops_t *ep_epop;
efx_np_handle_t ep_np_handle;
+ efx_qword_t ep_np_loopback_cap_mask;
+ uint8_t ep_np_cap_data_raw[MC_CMD_ETH_AN_FIELDS_LEN];
} efx_port_t;
typedef struct efx_mon_ops_s {
diff --git a/drivers/common/sfc_efx/base/efx_np.c
b/drivers/common/sfc_efx/base/efx_np.c
index 4d69e620d9..2e4cdcf863 100644
--- a/drivers/common/sfc_efx/base/efx_np.c
+++ b/drivers/common/sfc_efx/base/efx_np.c
@@ -232,7 +232,9 @@ static __checkReturn efx_rc_t
efx_np_get_fixed_port_props(
__in efx_nic_t *enp,
__in efx_np_handle_t nph,
- __out_opt uint32_t *sup_cap_maskp)
+ __out_opt uint8_t *sup_cap_rawp,
+ __out_opt uint32_t *sup_cap_maskp,
+ __out_opt efx_qword_t *loopback_cap_maskp)
{
EFX_MCDI_DECLARE_BUF(payload,
MC_CMD_GET_FIXED_PORT_PROPERTIES_IN_LEN,
@@ -268,6 +270,18 @@ efx_np_get_fixed_port_props(
if (sup_cap_maskp != NULL)
efx_np_cap_hw_data_to_sw_mask(cap_data, sup_cap_maskp);
+ if (sup_cap_rawp != NULL) {
+ memcpy(sup_cap_rawp,
+ MCDI_OUT2(req, const uint8_t,
+ GET_FIXED_PORT_PROPERTIES_OUT_ABILITIES),
+ MC_CMD_GET_FIXED_PORT_PROPERTIES_OUT_ABILITIES_LEN);
+ }
+
+ if (loopback_cap_maskp != NULL) {
+ *loopback_cap_maskp = *MCDI_OUT2(req, efx_qword_t,
+ GET_FIXED_PORT_PROPERTIES_OUT_V2_LOOPBACK_MODES_MASK_V2);
+ }
+
return (0);
fail2:
@@ -333,6 +347,141 @@ efx_np_link_state(
return (rc);
}
+#if EFSYS_OPT_LOOPBACK
+static __checkReturn efx_rc_t
+efx_np_sw_link_mode_to_cap(
+ __in efx_link_mode_t link_mode,
+ __out uint16_t *capp)
+{
+ switch (link_mode) {
+ case EFX_LINK_1000FDX:
+ *capp = EFX_PHY_CAP_1000FDX;
+ break;
+ case EFX_LINK_10000FDX:
+ *capp = EFX_PHY_CAP_10000FDX;
+ break;
+ case EFX_LINK_40000FDX:
+ *capp = EFX_PHY_CAP_40000FDX;
+ break;
+ case EFX_LINK_25000FDX:
+ *capp = EFX_PHY_CAP_25000FDX;
+ break;
+ case EFX_LINK_50000FDX:
+ *capp = EFX_PHY_CAP_50000FDX;
+ break;
+ case EFX_LINK_100000FDX:
+ *capp = EFX_PHY_CAP_100000FDX;
+ break;
+ case EFX_LINK_200000FDX:
+ *capp = EFX_PHY_CAP_200000FDX;
+ break;
+ default:
+ return (EINVAL);
+ }
+
+ return (0);
+}
+
+static void
+efx_np_cap_enum_sw_to_hw(
+ __in_ecount(hw_sw_map_nentries) const struct efx_np_cap_map *hw_sw_map,
+ __in unsigned int hw_sw_map_nentries,
+ __in_bcount(hw_cap_data_nbytes) const uint8_t *hw_cap_data,
+ __in size_t hw_cap_data_nbytes,
+ __in uint16_t enum_sw,
+ __out boolean_t *supportedp,
+ __out_opt uint16_t *enum_hwp)
+{
+ FOREACH_SUP_CAP(hw_sw_map, hw_sw_map_nentries,
+ hw_cap_data, hw_cap_data_nbytes) {
+ if (hw_sw_map->encm_sw != enum_sw)
+ continue;
+
+ if (enum_hwp != NULL)
+ *enum_hwp = hw_sw_map->encm_hw;
+
+ *supportedp = B_TRUE;
+ return;
+ }
+
+ *supportedp = B_FALSE;
+}
+
+/*
+ * Convert the given EFX PHY capability enum value to the HW counterpart,
+ * provided that the capability is supported by the HW, where the latter
+ * is detected from the given fraction of raw HW netport capability data.
+ *
+ * As the mapping of a capability from EFX to HW can be one to many, use
+ * the first supported HW capability bit, in accordance with the HW data.
+ */
+#define EFX_NP_CAP_ENUM_SW_TO_HW(
\
+ _hw_sw_cap_map, _hw_cap_section, _hw_cap_data, \
+ _enum_sw, _supportedp, _enum_hwp) \
+ efx_np_cap_enum_sw_to_hw((_hw_sw_cap_map), \
+ EFX_ARRAY_SIZE(_hw_sw_cap_map), \
+ MCDI_STRUCT_MEMBER((_hw_cap_data), const uint8_t, \
+ MC_CMD_##_hw_cap_section), \
+ MC_CMD_##_hw_cap_section##_LEN, (_enum_sw), \
+ (_supportedp), (_enum_hwp))
+
+static void
+efx_np_assign_loopback_props(
+ __in efx_nic_t *enp)
+{
+ efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
+ efx_port_t *epp = &(enp->en_port);
+ efx_qword_t lbm_off;
+ efx_qword_t lbm_sup;
+ unsigned int i;
+
+ EFX_ZERO_QWORD(lbm_off);
+ EFX_SET_QWORD_BIT(lbm_off, EFX_LOOPBACK_OFF);
+
+ /*
+ * Netport MCDI capable NICs support loopback modes which are
+ * generalisations of the existing modes that specify roughly
+ * where in the processing chain the loopback occurs, without
+ * the need to refer to the specific technology. Provide some
+ * to users under the guise of older technology-specific ones.
+ *
+ * FIXME: correct this if need be and augment with more modes.
+ */
+ EFX_ZERO_QWORD(lbm_sup);
+ EFX_SET_QWORD_BIT(lbm_sup, EFX_LOOPBACK_OFF);
+
+ if (EFX_TEST_QWORD_BIT(epp->ep_np_loopback_cap_mask,
+ MC_CMD_LOOPBACK_V2_AUTO))
+ EFX_SET_QWORD_BIT(lbm_sup, EFX_LOOPBACK_DATA);
+
+ if (EFX_TEST_QWORD_BIT(epp->ep_np_loopback_cap_mask,
+ MC_CMD_LOOPBACK_V2_POST_PCS))
+ EFX_SET_QWORD_BIT(lbm_sup, EFX_LOOPBACK_PCS);
+
+ for (i = 0; i < EFX_ARRAY_SIZE(encp->enc_loopback_types); ++i) {
+ boolean_t supported = B_FALSE;
+ uint16_t cap_enum_sw;
+ efx_rc_t rc;
+
+ rc = efx_np_sw_link_mode_to_cap(i, &cap_enum_sw);
+ if (rc != 0) {
+ /* No support for this link mode => no loopbacks. */
+ encp->enc_loopback_types[i] = lbm_off;
+ continue;
+ }
+
+ EFX_NP_CAP_ENUM_SW_TO_HW(efx_np_cap_map_tech,
+ ETH_AN_FIELDS_TECH_MASK, epp->ep_np_cap_data_raw,
+ cap_enum_sw, &supported, NULL);
+
+ if (supported != B_FALSE)
+ encp->enc_loopback_types[i] = lbm_sup;
+ else
+ encp->enc_loopback_types[i] = lbm_off;
+ }
+}
+#endif /* EFSYS_OPT_LOOPBACK */
+
__checkReturn efx_rc_t
efx_np_attach(
__in efx_nic_t *enp)
@@ -367,7 +516,8 @@ efx_np_attach(
* don't necessarily have access to these details.
*/
rc = efx_np_get_fixed_port_props(enp, epp->ep_np_handle,
- &epp->ep_phy_cap_mask);
+ epp->ep_np_cap_data_raw, &epp->ep_phy_cap_mask,
+ &epp->ep_np_loopback_cap_mask);
if (rc != 0)
goto fail2;
@@ -379,6 +529,11 @@ efx_np_attach(
epp->ep_phy_cap_mask |= 1U << EFX_PHY_CAP_AN;
epp->ep_adv_cap_mask = ls.enls_adv_cap_mask;
+
+#if EFSYS_OPT_LOOPBACK
+ efx_np_assign_loopback_props(enp);
+#endif /* EFSYS_OPT_LOOPBACK */
+
return (0);
fail3:
--
2.39.5
