From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f99.google.com (mail-oo1-f99.google.com [209.85.161.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 31C4138B150 for ; Mon, 4 May 2026 23:59:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.99 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777939168; cv=none; b=YOl4F7vuZhUNCvshYzwo+BP5cGyBMUO7SV/TXbiZ92KgdPMvIV0DDffkRDzEvx7h/Wufxym5xFYZJNgV6IXQLkqSuBlFJ6pS2LUbzvLunWA2BhVC0oa65rup1TUZWb6Pze2pp6WsTV+UGZBhIjZJmYHm7reye5rr93pJx5IgHGM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777939168; c=relaxed/simple; bh=kh/+WWd9Hh6gII19YrG3NKLxdrM1OfdQmN/aUi8ho+0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h1q57owMSCBE7OtgYlz46RkyAW4oHODGG3o4FA7cr8JwgKT6oSgfUGp2fDM8HWZ3o+TBtEjV/owb7u/6t4iaKIbND4T8JUWVlhLaYWgqW2sQN7249z3s4Ybr3Gpiq99YNiLTflKDozLe9eaWX21U8/MHdHe5W2YzgWLAofPdIRo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=U1ujiEnk; arc=none smtp.client-ip=209.85.161.99 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="U1ujiEnk" Received: by mail-oo1-f99.google.com with SMTP id 006d021491bc7-694891f8f62so2635697eaf.2 for ; Mon, 04 May 2026 16:59:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777939166; x=1778543966; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ozp2k+BHxQoTYlYoaydd8bqaphRn1OFCAs5JpGdLq8Q=; b=UrLiaQEeTenEn4Mfn0002e02wqLu58azGjWPex4CYMe8fi+7t1yw7wOh9VsVZKB89R mB0DcJTFgguEj2cnSmbwyTklB1QFUUc2yfilycCDNDoQwNDkLjTl0kwW/OefdVXisuww rbWN5dgTB8CrEJpGmZuwDaUvLARYwnt1M5yAZvKzuUUoYXNtCIyQB5byDkRxTVpDEP2Q 3OMAkhw/EnWiJBdEtD4ydvGdCFWHlX8/kOJZIZNvnyGwEf4C5HoNkNJMTK9jXISrEdse 6l9A6p5NJrjzTXTNOSCvQic4slphlPUpG7ll+iW0ySzNluLXS38Je34qw5ussVAb8We8 uWIA== X-Gm-Message-State: AOJu0YxzSUUVXIoLaIRCNVdc4t3CclwG2+qzcHKmHG3CGRkoNKUaW/wu FVsvLIjyM1WMR1vxmekVUz6DBrWKiqJ2r9mPfVJnmUrFDX+XQUEgCLwNg4oOkGJQ4ABlsZCq7vE dkRp83mMnwNB97685qdg/mW6URPrdvJiOSDzgjdQX0dOAa78rkGqVNAOGycU8vCrKyweWsQxeut AR9b7+mtRjmYyeHnKNoRZGlaTHFI0toqe12iMBxY0X9F9L9i009jB0sW9YSb76XOeNxZI/XMusA PJmQRqfVZ8= X-Gm-Gg: AeBDieubuE3dbVsS4DvQiUG9JPtHA2kiv5sX5vAtvdLf/Gj4BIeCFKZ5eFCktqfUN1A jlYHhmNEZdZsWuRHyibk0zd5qvdg7SXnp2Z5x/aXLsawDJhkd2+beUcg4IOTNDYf7KcPn07wYrF 0XXRNG6nnwhauTS+c+/64xkxX+kXFPKf3Vv/qjzsQoQBPoChQFwYftkfx3Z+vbtIivF6RNAvRYY B+hZMr8QNjHv4syf9sf7r3Ku/XvmQm5nO73fRO7BBZ5kUFZ1BdXQQqmubaGrdng88lxiLXFLx4G cHKdN7ucLLGQUPr22KGcpYprQ88Cq54aKtCpNzFKPG4eV/t5G/G8JPMcE5UVhNYo2L3dfvvsP8k juE2DZZhQ9LWKHtxpt2lTqphUK8eWW4K9FdKYuciOJDRSpYjawcxXVLDBLhSqqJrQO4xNLgI/Ke EmyOnkJt+NAk+ZGQWYQlDuOGVPM8qW+dJckTJxqYI8zqkb+8BnM+Oww0vJiNl2pNTOUms= X-Received: by 2002:a05:6820:1c9a:b0:694:a14b:c71a with SMTP id 006d021491bc7-69697c40791mr5348875eaf.29.1777939166104; Mon, 04 May 2026 16:59:26 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-21.dlp.protect.broadcom.com. [144.49.247.21]) by smtp-relay.gmail.com with ESMTPS id 006d021491bc7-69689515bc7sm790724eaf.20.2026.05.04.16.59.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 May 2026 16:59:26 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-8b5ceedb5c1so75947456d6.0 for ; Mon, 04 May 2026 16:59:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1777939164; x=1778543964; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ozp2k+BHxQoTYlYoaydd8bqaphRn1OFCAs5JpGdLq8Q=; b=U1ujiEnk0dxnfHrO7x7TsYB1x0HDDNlQQi23bN9C7EEjxsg/wePV7yrcbleRusat+W Ge90USUvf38SY40RKDbU0taYAjxAqFDTWSEkiWqDOhxiY8Fn3is455UsPD5+kxgez1AO oCc+owxqK92QccTGbbfRFs+rbAOeOcHz2BiZk= X-Received: by 2002:a05:6214:6014:b0:8b3:f59d:e6a4 with SMTP id 6a1803df08f44-8b6665f1d8emr196182466d6.17.1777939164355; Mon, 04 May 2026 16:59:24 -0700 (PDT) X-Received: by 2002:a05:6214:6014:b0:8b3:f59d:e6a4 with SMTP id 6a1803df08f44-8b6665f1d8emr196182146d6.17.1777939163831; Mon, 04 May 2026 16:59:23 -0700 (PDT) Received: from lvnvda3289.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8b5396c4b7dsm132298246d6.18.2026.05.04.16.59.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 16:59:23 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, andrew+netdev@lunn.ch, pavan.chebbi@broadcom.com, andrew.gospodarek@broadcom.com, Ajit Khaparde Subject: [PATCH net-next 06/15] bnxt_en: Allocate and free MPC channels from firmware Date: Mon, 4 May 2026 16:58:27 -0700 Message-ID: <20260504235836.3019499-7-michael.chan@broadcom.com> X-Mailer: git-send-email 2.45.4 In-Reply-To: <20260504235836.3019499-1-michael.chan@broadcom.com> References: <20260504235836.3019499-1-michael.chan@broadcom.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Allocate and free the reserved MPC TX rings and completion rings from firmware. MPC backing store memory also needs to be configured in order to successfully allocate the MPC TX rings. Reviewed-by: Ajit Khaparde Reviewed-by: Pavan Chebbi Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 30 ++++-- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 6 ++ drivers/net/ethernet/broadcom/bnxt/bnxt_mpc.c | 92 +++++++++++++++++++ drivers/net/ethernet/broadcom/bnxt/bnxt_mpc.h | 16 ++++ 4 files changed, 135 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 54f7672eeba0..d81f96e7894d 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -7470,8 +7470,7 @@ static int bnxt_hwrm_rx_agg_ring_alloc(struct bnxt *bp, return 0; } -static int bnxt_hwrm_cp_ring_alloc_p5(struct bnxt *bp, - struct bnxt_cp_ring_info *cpr) +int bnxt_hwrm_cp_ring_alloc_p5(struct bnxt *bp, struct bnxt_cp_ring_info *cpr) { const u32 type = HWRM_RING_ALLOC_CMPL; struct bnxt_napi *bnapi = cpr->bnapi; @@ -7489,8 +7488,8 @@ static int bnxt_hwrm_cp_ring_alloc_p5(struct bnxt *bp, return 0; } -static int bnxt_hwrm_tx_ring_alloc(struct bnxt *bp, - struct bnxt_tx_ring_info *txr, u32 tx_idx) +int bnxt_hwrm_tx_ring_alloc(struct bnxt *bp, struct bnxt_tx_ring_info *txr, + u32 tx_idx) { struct bnxt_ring_struct *ring = &txr->tx_ring_struct; const u32 type = HWRM_RING_ALLOC_TX; @@ -7575,6 +7574,9 @@ static int bnxt_hwrm_ring_alloc(struct bnxt *bp) goto err_out; } } + + rc = bnxt_hwrm_mpc_ring_alloc(bp); + err_out: return rc; } @@ -7632,9 +7634,8 @@ static int hwrm_ring_free_send_msg(struct bnxt *bp, return 0; } -static void bnxt_hwrm_tx_ring_free(struct bnxt *bp, - struct bnxt_tx_ring_info *txr, - bool close_path) +void bnxt_hwrm_tx_ring_free(struct bnxt *bp, struct bnxt_tx_ring_info *txr, + bool close_path) { struct bnxt_ring_struct *ring = &txr->tx_ring_struct; u32 cmpl_ring_id; @@ -7693,8 +7694,7 @@ static void bnxt_hwrm_rx_agg_ring_free(struct bnxt *bp, bp->grp_info[grp_idx].agg_fw_ring_id = INVALID_HW_RING_ID; } -static void bnxt_hwrm_cp_ring_free(struct bnxt *bp, - struct bnxt_cp_ring_info *cpr) +void bnxt_hwrm_cp_ring_free(struct bnxt *bp, struct bnxt_cp_ring_info *cpr) { struct bnxt_ring_struct *ring; @@ -7728,6 +7728,8 @@ static void bnxt_hwrm_ring_free(struct bnxt *bp, bool close_path) if (!bp->bnapi) return; + bnxt_hwrm_mpc_ring_free(bp, close_path); + for (i = 0; i < bp->tx_nr_rings; i++) bnxt_hwrm_tx_ring_free(bp, &bp->tx_ring[i], close_path); @@ -9365,12 +9367,21 @@ static int bnxt_hwrm_func_backing_store_cfg_v2(struct bnxt *bp, static int bnxt_backing_store_cfg_v2(struct bnxt *bp) { + struct bnxt_mpc_info *mpc = bp->mpc_info; struct bnxt_ctx_mem_info *ctx = bp->ctx; struct bnxt_ctx_mem_type *ctxm; u16 last_type = BNXT_CTX_INV; int rc = 0; u16 type; + if (mpc && mpc->mpc_chnls_cap) { + ctxm = &ctx->ctx_arr[BNXT_CTX_MTQM]; + rc = bnxt_setup_ctxm_pg_tbls(bp, ctxm, ctxm->max_entries, 1); + if (rc) + return rc; + last_type = BNXT_CTX_MTQM; + } + for (type = BNXT_CTX_SRT; type <= BNXT_CTX_QPC; type++) { ctxm = &ctx->ctx_arr[type]; if (!bnxt_bs_trace_avail(bp, type)) @@ -11317,6 +11328,7 @@ static int bnxt_init_nic(struct bnxt *bp, bool irq_re_init) bnxt_init_cp_rings(bp); bnxt_init_rx_rings(bp); bnxt_init_tx_rings(bp); + bnxt_init_mpc_rings(bp); bnxt_init_ring_grps(bp, irq_re_init); bnxt_init_vnics(bp); diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index 253c0739f680..72a0b511b7e9 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -2999,6 +2999,12 @@ int bnxt_hwrm_vnic_cfg(struct bnxt *bp, struct bnxt_vnic_info *vnic); int bnxt_hwrm_vnic_alloc(struct bnxt *bp, struct bnxt_vnic_info *vnic, unsigned int start_rx_ring_idx, unsigned int nr_rings); +int bnxt_hwrm_cp_ring_alloc_p5(struct bnxt *bp, struct bnxt_cp_ring_info *cpr); +int bnxt_hwrm_tx_ring_alloc(struct bnxt *bp, struct bnxt_tx_ring_info *txr, + u32 tx_idx); +void bnxt_hwrm_tx_ring_free(struct bnxt *bp, struct bnxt_tx_ring_info *txr, + bool close_path); +void bnxt_hwrm_cp_ring_free(struct bnxt *bp, struct bnxt_cp_ring_info *cpr); int bnxt_total_tx_rings(struct bnxt *bp); int __bnxt_hwrm_get_tx_rings(struct bnxt *bp, u16 fid, int *tx_rings); int bnxt_nq_rings_in_use(struct bnxt *bp); diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_mpc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_mpc.c index 9ffc62bf771f..e9d92b01438a 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_mpc.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_mpc.c @@ -311,3 +311,95 @@ void bnxt_free_mpc_rings(struct bnxt *bp) } } } + +void bnxt_init_mpc_rings(struct bnxt *bp) +{ + struct bnxt_mpc_info *mpc = bp->mpc_info; + int i, j; + + if (!mpc) + return; + + for (i = 0; i < BNXT_MPC_TYPE_MAX; i++) { + int num = mpc->mpc_ring_count[i]; + + for (j = 0; j < num; j++) { + struct bnxt_tx_ring_info *txr = &mpc->mpc_rings[i][j]; + struct bnxt_ring_struct *ring = &txr->tx_ring_struct; + + txr->tx_prod = 0; + txr->tx_cons = 0; + txr->tx_hw_cons = 0; + ring->fw_ring_id = INVALID_HW_RING_ID; + } + } +} + +static int bnxt_hwrm_one_mpc_ring_alloc(struct bnxt *bp, + struct bnxt_tx_ring_info *txr) +{ + struct bnxt_cp_ring_info *cpr = txr->tx_cpr; + struct bnxt_ring_struct *ring; + int rc; + + ring = &cpr->cp_ring_struct; + if (ring->fw_ring_id == INVALID_HW_RING_ID) { + rc = bnxt_hwrm_cp_ring_alloc_p5(bp, cpr); + if (rc) + return rc; + } + /* tx_idx not used on P5_PLUS, so set it to 0 */ + return bnxt_hwrm_tx_ring_alloc(bp, txr, 0); +} + +int bnxt_hwrm_mpc_ring_alloc(struct bnxt *bp) +{ + struct bnxt_mpc_info *mpc = bp->mpc_info; + int i, j, rc = 0; + + if (!mpc) + return 0; + + for (i = 0; i < BNXT_MPC_TYPE_MAX; i++) { + int num = mpc->mpc_ring_count[i]; + + for (j = 0; j < num; j++) { + struct bnxt_tx_ring_info *txr = &mpc->mpc_rings[i][j]; + + rc = bnxt_hwrm_one_mpc_ring_alloc(bp, txr); + if (rc) + goto mpc_ring_alloc_exit; + } + } +mpc_ring_alloc_exit: + if (rc) + bnxt_hwrm_mpc_ring_free(bp, false); + return rc; +} + +void bnxt_hwrm_mpc_ring_free(struct bnxt *bp, bool close_path) +{ + struct bnxt_mpc_info *mpc = bp->mpc_info; + struct bnxt_cp_ring_info *cpr; + int i, j; + + if (!mpc) + return; + + for (i = 0; i < BNXT_MPC_TYPE_MAX; i++) { + for (j = 0; j < mpc->mpc_ring_count[i]; j++) + bnxt_hwrm_tx_ring_free(bp, &mpc->mpc_rings[i][j], + close_path); + } + /* CP rings must be freed at the end to guarantee that the HWRM_DONE + * responses for HWRM_RING_FREE can still be seen on the CP rings. + */ + for (i = 0; i < BNXT_MPC_TYPE_MAX; i++) { + for (j = 0; j < mpc->mpc_ring_count[i]; j++) { + cpr = mpc->mpc_rings[i][j].tx_cpr; + if (cpr && cpr->cp_ring_struct.fw_ring_id != + INVALID_HW_RING_ID) + bnxt_hwrm_cp_ring_free(bp, cpr); + } + } +} diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_mpc.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_mpc.h index b54daf4ddd2f..cdc03a074963 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_mpc.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_mpc.h @@ -58,6 +58,9 @@ int bnxt_alloc_mpcs(struct bnxt *bp); void bnxt_free_mpcs(struct bnxt *bp); int bnxt_alloc_mpc_rings(struct bnxt *bp); void bnxt_free_mpc_rings(struct bnxt *bp); +void bnxt_init_mpc_rings(struct bnxt *bp); +int bnxt_hwrm_mpc_ring_alloc(struct bnxt *bp); +void bnxt_hwrm_mpc_ring_free(struct bnxt *bp, bool close_path); #else static inline void bnxt_alloc_mpc_info(struct bnxt *bp, u8 mpc_chnls_cap) { @@ -116,5 +119,18 @@ static inline int bnxt_alloc_mpc_rings(struct bnxt *bp) static inline void bnxt_free_mpc_rings(struct bnxt *bp) { } + +static inline void bnxt_init_mpc_rings(struct bnxt *bp) +{ +} + +static inline int bnxt_hwrm_mpc_ring_alloc(struct bnxt *bp) +{ + return 0; +} + +static inline void bnxt_hwrm_mpc_ring_free(struct bnxt *bp, bool close_path) +{ +} #endif /* CONFIG_BNXT_TLS */ #endif /* BNXT_MPC_H */ -- 2.51.0