That leverages MAC control functionality of new netport MCDI.
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_impl.h | 13 ++++
drivers/common/sfc_efx/base/efx_mac.c | 2 +-
drivers/common/sfc_efx/base/efx_np.c | 73 +++++++++++++++++++++
drivers/common/sfc_efx/base/medford4_impl.h | 5 ++
drivers/common/sfc_efx/base/medford4_mac.c | 32 +++++++++
5 files changed, 124 insertions(+), 1 deletion(-)
diff --git a/drivers/common/sfc_efx/base/efx_impl.h
b/drivers/common/sfc_efx/base/efx_impl.h
index 15cf62506e..ac1cd5292b 100644
--- a/drivers/common/sfc_efx/base/efx_impl.h
+++ b/drivers/common/sfc_efx/base/efx_impl.h
@@ -1947,6 +1947,19 @@ efx_np_link_ctrl(
__in uint32_t cap_mask_sw,
__in boolean_t fcntl_an);
+typedef struct efx_np_mac_ctrl_s {
+ boolean_t enmc_fcntl_autoneg;
+ boolean_t enmc_include_fcs;
+ uint32_t enmc_fcntl;
+} efx_np_mac_ctrl_t;
+
+LIBEFX_INTERNAL
+extern __checkReturn efx_rc_t
+efx_np_mac_ctrl(
+ __in efx_nic_t *enp,
+ __in efx_np_handle_t nph,
+ __in const efx_np_mac_ctrl_t *mc);
+
#ifdef __cplusplus
}
#endif
diff --git a/drivers/common/sfc_efx/base/efx_mac.c
b/drivers/common/sfc_efx/base/efx_mac.c
index dde0e5ab87..3c29db0016 100644
--- a/drivers/common/sfc_efx/base/efx_mac.c
+++ b/drivers/common/sfc_efx/base/efx_mac.c
@@ -96,7 +96,7 @@ static const efx_mac_ops_t __efx_mac_medford4_ops = {
ef10_mac_addr_set, /* emo_addr_set */
ef10_mac_pdu_set, /* emo_pdu_set */
ef10_mac_pdu_get, /* emo_pdu_get */
- ef10_mac_reconfigure, /* emo_reconfigure */
+ medford4_mac_reconfigure, /* emo_reconfigure */
ef10_mac_multicast_list_set, /* emo_multicast_list_set */
ef10_mac_filter_default_rxq_set, /* emo_filter_default_rxq_set */
ef10_mac_filter_default_rxq_clear,
diff --git a/drivers/common/sfc_efx/base/efx_np.c
b/drivers/common/sfc_efx/base/efx_np.c
index 03d49b9c78..826ee93f0f 100644
--- a/drivers/common/sfc_efx/base/efx_np.c
+++ b/drivers/common/sfc_efx/base/efx_np.c
@@ -923,6 +923,79 @@ efx_np_link_ctrl(
fail2:
EFSYS_PROBE(fail2);
+fail1:
+ EFSYS_PROBE1(fail1, efx_rc_t, rc);
+ return (rc);
+}
+
+ __checkReturn efx_rc_t
+efx_np_mac_ctrl(
+ __in efx_nic_t *enp,
+ __in efx_np_handle_t nph,
+ __in const efx_np_mac_ctrl_t *mc)
+{
+ EFX_MCDI_DECLARE_BUF(payload,
+ MC_CMD_MAC_CTRL_IN_LEN,
+ MC_CMD_MAC_CTRL_OUT_LEN);
+ efx_mcdi_req_t req;
+ uint32_t flags = 0;
+ uint32_t cfg = 0;
+ uint32_t fcntl;
+ efx_rc_t rc;
+
+ req.emr_out_length = MC_CMD_MAC_CTRL_OUT_LEN;
+ req.emr_in_length = MC_CMD_MAC_CTRL_IN_LEN;
+ req.emr_cmd = MC_CMD_MAC_CTRL;
+ req.emr_out_buf = payload;
+ req.emr_in_buf = payload;
+
+ MCDI_IN_SET_DWORD(req, MAC_CTRL_IN_PORT_HANDLE, nph);
+
+ cfg |= 1U << MC_CMD_MAC_CONFIG_OPTIONS_CFG_INCLUDE_FCS;
+ if (mc->enmc_include_fcs != B_FALSE)
+ flags |= 1U << MC_CMD_MAC_FLAGS_FLAG_INCLUDE_FCS;
+
+ MCDI_IN_SET_DWORD(req, MAC_CTRL_IN_FLAGS, flags);
+
+ if (mc->enmc_fcntl_autoneg != B_FALSE) {
+ fcntl = MC_CMD_FCNTL_AUTO;
+ } else {
+ switch (mc->enmc_fcntl) {
+ case 0:
+ fcntl = MC_CMD_FCNTL_OFF;
+ break;
+ case EFX_FCNTL_RESPOND:
+ fcntl = MC_CMD_FCNTL_RESPOND;
+ break;
+ case EFX_FCNTL_GENERATE:
+ fcntl = MC_CMD_FCNTL_GENERATE;
+ break;
+ case EFX_FCNTL_RESPOND | EFX_FCNTL_GENERATE:
+ fcntl = MC_CMD_FCNTL_BIDIR;
+ break;
+ default:
+ rc = EINVAL;
+ goto fail1;
+ }
+ }
+
+ cfg |= 1U << MC_CMD_MAC_CONFIG_OPTIONS_CFG_FCNTL;
+ MCDI_IN_SET_DWORD(req, MAC_CTRL_IN_FCNTL, fcntl);
+
+ MCDI_IN_SET_DWORD(req, MAC_CTRL_IN_V2_CONTROL_FLAGS, cfg);
+
+ efx_mcdi_execute(enp, &req);
+
+ if (req.emr_rc != 0) {
+ rc = req.emr_rc;
+ goto fail2;
+ }
+
+ return (0);
+
+fail2:
+ EFSYS_PROBE(fail2);
+
fail1:
EFSYS_PROBE1(fail1, efx_rc_t, rc);
return (rc);
diff --git a/drivers/common/sfc_efx/base/medford4_impl.h
b/drivers/common/sfc_efx/base/medford4_impl.h
index 6aa065c730..8b232c516a 100644
--- a/drivers/common/sfc_efx/base/medford4_impl.h
+++ b/drivers/common/sfc_efx/base/medford4_impl.h
@@ -51,6 +51,11 @@ medford4_mac_up(
__in efx_nic_t *enp,
__out boolean_t *mac_upp);
+LIBEFX_INTERNAL
+extern __checkReturn efx_rc_t
+medford4_mac_reconfigure(
+ __in efx_nic_t *enp);
+
#ifdef __cplusplus
}
#endif
diff --git a/drivers/common/sfc_efx/base/medford4_mac.c
b/drivers/common/sfc_efx/base/medford4_mac.c
index 57ddbecfaa..c037c29b92 100644
--- a/drivers/common/sfc_efx/base/medford4_mac.c
+++ b/drivers/common/sfc_efx/base/medford4_mac.c
@@ -47,6 +47,38 @@ medford4_mac_up(
*mac_upp = els.els_mac_up;
return (0);
+fail1:
+ EFSYS_PROBE1(fail1, efx_rc_t, rc);
+ return (rc);
+}
+
+ __checkReturn efx_rc_t
+medford4_mac_reconfigure(
+ __in efx_nic_t *enp)
+{
+ efx_port_t *epp = &(enp->en_port);
+ efx_np_mac_ctrl_t mc = {0};
+ efx_rc_t rc;
+
+ mc.enmc_fcntl_autoneg = epp->ep_fcntl_autoneg;
+ mc.enmc_include_fcs = epp->ep_include_fcs;
+ mc.enmc_fcntl = epp->ep_fcntl;
+
+ rc = efx_np_mac_ctrl(enp, epp->ep_np_handle, &mc);
+ if (rc != 0)
+ goto fail1;
+
+ /*
+ * Apply the filters for the MAC configuration. If the NIC isn't ready
+ * to accept filters, this may return success without setting anything.
+ */
+ rc = efx_filter_reconfigure(enp, epp->ep_mac_addr,
+ epp->ep_all_unicst, epp->ep_mulcst,
+ epp->ep_all_mulcst, epp->ep_brdcst,
+ epp->ep_mulcst_addr_list,
+ epp->ep_mulcst_addr_count);
