From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 627474660E; Wed, 23 Apr 2025 18:04:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 062AA40DF8; Wed, 23 Apr 2025 18:00:48 +0200 (CEST) Received: from agw.arknetworks.am (agw.arknetworks.am [79.141.165.80]) by mails.dpdk.org (Postfix) with ESMTP id 07C8840BA6 for ; Wed, 23 Apr 2025 18:00:38 +0200 (CEST) Received: from localhost.localdomain (unknown [78.109.72.186]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by agw.arknetworks.am (Postfix) with ESMTPSA id 5172BE0159; Wed, 23 Apr 2025 20:00:37 +0400 (+04) DKIM-Filter: OpenDKIM Filter v2.11.0 agw.arknetworks.am 5172BE0159 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arknetworks.am; s=default; t=1745424037; bh=JiYs3+k4+v68rVM8YtcF4bu/0fc8A+LY5CVI/b50TAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FSWv/rkKliEtLFIrmdYqE9sFE7F/ahq3jGwyBnDkTG42iD3SZi/wfRuBZVQ/RoR7Y TfOBktrfxAL+WHmX14kDuAulOeT/MlRLmzvxBowAYlemYl5QKW/4SkdaRNScvG5AxI 4niFOFXSwnuk2MoMWRltiy6baDAv1IBOnenh4yW/f6hfc+8AEo2rzvHW2JfMvvpsCU 93goaZkvRZwaI7+du6fN0EUqoPIIAxo20D72UiZ75zUPCyh2R3q28VnWFKmMZ5swHq woOpfDaLVpHgRWkVX7OzQ2raP0+e++VCktlNgGNWEsaEj+bm5/vLWLCxDrH9+/vkPf ITuBUdtwytf2g== From: Ivan Malov To: dev@dpdk.org Cc: Stephen Hemminger , Andrew Rybchenko , Andy Moreton , Pieter Jansen Van Vuuren , Viacheslav Galaktionov Subject: [PATCH v2 31/45] common/sfc_efx/base: add MAC reconfigure method for Medford4 Date: Wed, 23 Apr 2025 19:59:48 +0400 Message-Id: <20250423160002.35706-32-ivan.malov@arknetworks.am> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250423160002.35706-1-ivan.malov@arknetworks.am> References: <20250416140016.36127-1-ivan.malov@arknetworks.am> <20250423160002.35706-1-ivan.malov@arknetworks.am> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org That leverages MAC control functionality of new netport MCDI. Signed-off-by: Ivan Malov Reviewed-by: Andy Moreton Reviewed-by: Pieter Jansen Van Vuuren --- 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 | 38 +++++++++++ 5 files changed, 130 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 26abc82dbf..aa5bb76af7 100644 --- a/drivers/common/sfc_efx/base/efx_np.c +++ b/drivers/common/sfc_efx/base/efx_np.c @@ -903,6 +903,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..ade4379a19 100644 --- a/drivers/common/sfc_efx/base/medford4_mac.c +++ b/drivers/common/sfc_efx/base/medford4_mac.c @@ -47,6 +47,44 @@ 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); + if (rc != 0) + goto fail2; + + return (0); + +fail2: + EFSYS_PROBE(fail2); + fail1: EFSYS_PROBE1(fail1, efx_rc_t, rc); return (rc); -- 2.39.5