From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id BFFA843C0F;
Fri, 1 Mar 2024 20:15:19 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 9AC2443411;
Fri, 1 Mar 2024 20:15:09 +0100 (CET)
Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com
[67.231.156.173])
by mails.dpdk.org (Postfix) with ESMTP id 4EC7E433DC
for <dev@dpdk.org>; Fri, 1 Mar 2024 20:15:07 +0100 (CET)
Received: from pps.filterd (m0045851.ppops.net [127.0.0.1])
by mx0b-0016f401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id
421H7QQr016607 for <dev@dpdk.org>; Fri, 1 Mar 2024 11:15:06 -0800
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=
from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-type; s=pfpt0220; bh=NiJDiXOcGiWMssIXP1hyX
+tV6hiJGPvOeUnxxbI9dW4=; b=fJH02RI6dl0SKJdGYGYQBOxXKtP2Ico/fC7tH
4Kc/NsXUmyaze29oE0Asxq09W4BaGH60Qu5PePT9GiJac2DMmRnB9o5w8lCUsoaV
BIg7cQDuwFxoMoEMySzhVHaPAscpo1ny5PzGsv3UYmVYNOV98dExxjbCfcb/DRtB
gqH055Wo/vKB2f3h/SRaEVUdHfQHC87AQH2f1u4RahaLS+xlLQlolnH+xw4l3rHB
UzOrBnFxoLFYFfQMsF67xP1Cpa8a3RmTH7GXsMiCIMcsDCJFMEd2NrtzIPD1SF8r
N1SP2XOBywkqHB23g1OYrgMC+Whe7T3HeltCE+AXmHIWOdoBQ==
Received: from dc6wp-exch02.marvell.com ([4.21.29.225])
by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3wjfay8sad-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT)
for <dev@dpdk.org>; Fri, 01 Mar 2024 11:15:06 -0800 (PST)
Received: from DC6WP-EXCH02.marvell.com (10.76.176.209) by
DC6WP-EXCH02.marvell.com (10.76.176.209) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.2.1258.12; Fri, 1 Mar 2024 11:15:05 -0800
Received: from maili.marvell.com (10.69.176.80) by DC6WP-EXCH02.marvell.com
(10.76.176.209) with Microsoft SMTP Server id 15.2.1258.12 via Frontend
Transport; Fri, 1 Mar 2024 11:15:05 -0800
Received: from localhost.localdomain (unknown [10.29.52.211])
by maili.marvell.com (Postfix) with ESMTP id 6FAE93F71F0;
Fri, 1 Mar 2024 11:15:03 -0800 (PST)
From: Harman Kalra <hkalra@marvell.com>
To: Nithin Dabilpuram <ndabilpuram@marvell.com>, Kiran Kumar K
<kirankumark@marvell.com>, Sunil Kumar Kori <skori@marvell.com>, Satha Rao
<skoteshwar@marvell.com>, Harman Kalra <hkalra@marvell.com>
CC: <dev@dpdk.org>
Subject: [PATCH v5 03/23] net/cnxk: eswitch HW resource configuration
Date: Sat, 2 Mar 2024 00:44:30 +0530
Message-ID: <20240301191451.57168-4-hkalra@marvell.com>
X-Mailer: git-send-email 2.18.0
In-Reply-To: <20240301191451.57168-1-hkalra@marvell.com>
References: <20230811163419.165790-1-hkalra@marvell.com>
<20240301191451.57168-1-hkalra@marvell.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Proofpoint-ORIG-GUID: Oe4hWW76rqYi0b8ntfmsZjV1DkG362vn
X-Proofpoint-GUID: Oe4hWW76rqYi0b8ntfmsZjV1DkG362vn
X-Proofpoint-Virus-Version: vendor=baseguard
engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
definitions=2024-03-01_20,2024-03-01_03,2023-05-22_02
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Configuring the hardware resources used by the eswitch device.
Signed-off-by: Harman Kalra <hkalra@marvell.com>
---
drivers/net/cnxk/cnxk_eswitch.c | 217 +++++++++++++++++++++++++++++++-
1 file changed, 216 insertions(+), 1 deletion(-)
diff --git a/drivers/net/cnxk/cnxk_eswitch.c b/drivers/net/cnxk/cnxk_eswitch.c
index 8f216d7c88..810e7c9c25 100644
--- a/drivers/net/cnxk/cnxk_eswitch.c
+++ b/drivers/net/cnxk/cnxk_eswitch.c
@@ -6,13 +6,53 @@
#define CNXK_NIX_DEF_SQ_COUNT 512
+static int
+eswitch_hw_rsrc_cleanup(struct cnxk_eswitch_dev *eswitch_dev, struct rte_pci_device *pci_dev)
+{
+ struct roc_nix *nix;
+ int rc = 0;
+
+ nix = &eswitch_dev->nix;
+
+ roc_nix_unregister_queue_irqs(nix);
+ roc_nix_tm_fini(nix);
+ rc = roc_nix_lf_free(nix);
+ if (rc) {
+ plt_err("Failed to cleanup sq, rc %d", rc);
+ goto exit;
+ }
+
+ /* Check if this device is hosting common resource */
+ nix = roc_idev_npa_nix_get();
+ if (!nix || nix->pci_dev != pci_dev) {
+ rc = 0;
+ goto exit;
+ }
+
+ /* Try nix fini now */
+ rc = roc_nix_dev_fini(nix);
+ if (rc == -EAGAIN) {
+ plt_info("Common resource in use by other devices %s", pci_dev->name);
+ goto exit;
+ } else if (rc) {
+ plt_err("Failed in nix dev fini, rc=%d", rc);
+ goto exit;
+ }
+
+ rte_free(eswitch_dev->txq);
+ rte_free(eswitch_dev->rxq);
+ rte_free(eswitch_dev->cxq);
+
+exit:
+ return rc;
+}
+
static int
cnxk_eswitch_dev_remove(struct rte_pci_device *pci_dev)
{
struct cnxk_eswitch_dev *eswitch_dev;
int rc = 0;
- PLT_SET_USED(pci_dev);
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
@@ -22,6 +62,9 @@ cnxk_eswitch_dev_remove(struct rte_pci_device *pci_dev)
goto exit;
}
+ /* Cleanup HW resources */
+ eswitch_hw_rsrc_cleanup(eswitch_dev, pci_dev);
+
rte_free(eswitch_dev);
exit:
return rc;
@@ -318,6 +361,170 @@ cnxk_eswitch_txq_setup(struct cnxk_eswitch_dev *eswitch_dev, uint16_t qid, uint1
return rc;
}
+static int
+nix_lf_setup(struct cnxk_eswitch_dev *eswitch_dev)
+{
+ uint16_t nb_rxq, nb_txq, nb_cq;
+ struct roc_nix_fc_cfg fc_cfg;
+ struct roc_nix *nix;
+ uint64_t rx_cfg;
+ void *qs;
+ int rc;
+
+ /* Initialize base roc nix */
+ nix = &eswitch_dev->nix;
+ nix->pci_dev = eswitch_dev->pci_dev;
+ nix->hw_vlan_ins = true;
+ nix->reta_sz = ROC_NIX_RSS_RETA_SZ_256;
+ rc = roc_nix_dev_init(nix);
+ if (rc) {
+ plt_err("Failed to init nix eswitch device, rc=%d(%s)", rc, roc_error_msg_get(rc));
+ goto fail;
+ }
+
+ /* Get the representors count */
+ rc = roc_nix_max_rep_count(&eswitch_dev->nix);
+ if (rc) {
+ plt_err("Failed to get rep cnt, rc=%d(%s)", rc, roc_error_msg_get(rc));
+ goto free_cqs;
+ }
+
+ /* Allocating an NIX LF */
+ nb_rxq = CNXK_ESWITCH_MAX_RXQ;
+ nb_txq = CNXK_ESWITCH_MAX_TXQ;
+ nb_cq = CNXK_ESWITCH_MAX_RXQ;
+ rx_cfg = ROC_NIX_LF_RX_CFG_DIS_APAD;
+ rc = roc_nix_lf_alloc(nix, nb_rxq, nb_txq, rx_cfg);
+ if (rc) {
+ plt_err("lf alloc failed = %s(%d)", roc_error_msg_get(rc), rc);
+ goto dev_fini;
+ }
+
+ if (nb_rxq) {
+ /* Allocate memory for eswitch rq's and cq's */
+ qs = plt_zmalloc(sizeof(struct cnxk_eswitch_rxq) * nb_rxq, 0);
+ if (!qs) {
+ plt_err("Failed to alloc eswitch rxq");
+ goto lf_free;
+ }
+ eswitch_dev->rxq = qs;
+ }
+
+ if (nb_txq) {
+ /* Allocate memory for roc sq's */
+ qs = plt_zmalloc(sizeof(struct cnxk_eswitch_txq) * nb_txq, 0);
+ if (!qs) {
+ plt_err("Failed to alloc eswitch txq");
+ goto free_rqs;
+ }
+ eswitch_dev->txq = qs;
+ }
+
+ if (nb_cq) {
+ qs = plt_zmalloc(sizeof(struct cnxk_eswitch_cxq) * nb_cq, 0);
+ if (!qs) {
+ plt_err("Failed to alloc eswitch cxq");
+ goto free_sqs;
+ }
+ eswitch_dev->cxq = qs;
+ }
+
+ eswitch_dev->nb_rxq = nb_rxq;
+ eswitch_dev->nb_txq = nb_txq;
+
+ /* Re-enable NIX LF error interrupts */
+ roc_nix_err_intr_ena_dis(nix, true);
+ roc_nix_ras_intr_ena_dis(nix, true);
+
+ rc = roc_nix_lso_fmt_setup(nix);
+ if (rc) {
+ plt_err("lso setup failed = %s(%d)", roc_error_msg_get(rc), rc);
+ goto free_cqs;
+ }
+
+ rc = roc_nix_switch_hdr_set(nix, 0, 0, 0, 0);
+ if (rc) {
+ plt_err("switch hdr set failed = %s(%d)", roc_error_msg_get(rc), rc);
+ goto free_cqs;
+ }
+
+ rc = roc_nix_tm_init(nix);
+ if (rc) {
+ plt_err("tm failed = %s(%d)", roc_error_msg_get(rc), rc);
+ goto free_cqs;
+ }
+
+ /* Register queue IRQs */
+ rc = roc_nix_register_queue_irqs(nix);
+ if (rc) {
+ plt_err("Failed to register queue interrupts rc=%d", rc);
+ goto tm_fini;
+ }
+
+ /* Enable default tree */
+ rc = roc_nix_tm_hierarchy_enable(nix, ROC_NIX_TM_DEFAULT, false);
+ if (rc) {
+ plt_err("tm default hierarchy enable failed = %s(%d)", roc_error_msg_get(rc), rc);
+ goto q_irq_fini;
+ }
+
+ memset(&fc_cfg, 0, sizeof(struct roc_nix_fc_cfg));
+ fc_cfg.rxchan_cfg.enable = false;
+ rc = roc_nix_fc_config_set(nix, &fc_cfg);
+ if (rc) {
+ plt_err("Failed to setup flow control, rc=%d(%s)", rc, roc_error_msg_get(rc));
+ goto q_irq_fini;
+ }
+
+ roc_nix_fc_mode_get(nix);
+
+ return rc;
+q_irq_fini:
+ roc_nix_unregister_queue_irqs(nix);
+tm_fini:
+ roc_nix_tm_fini(nix);
+free_cqs:
+ rte_free(eswitch_dev->cxq);
+free_sqs:
+ rte_free(eswitch_dev->txq);
+free_rqs:
+ rte_free(eswitch_dev->rxq);
+lf_free:
+ roc_nix_lf_free(nix);
+dev_fini:
+ roc_nix_dev_fini(nix);
+fail:
+ return rc;
+}
+
+static int
+eswitch_hw_rsrc_setup(struct cnxk_eswitch_dev *eswitch_dev, struct rte_pci_device *pci_dev)
+{
+ struct roc_nix *nix;
+ int rc;
+
+ nix = &eswitch_dev->nix;
+ rc = nix_lf_setup(eswitch_dev);
+ if (rc) {
+ plt_err("Failed to setup hw rsrc, rc=%d(%s)", rc, roc_error_msg_get(rc));
+ goto fail;
+ }
+
+ /* Initialize roc npc */
+ eswitch_dev->npc.roc_nix = nix;
+ eswitch_dev->npc.flow_max_priority = 3;
+ eswitch_dev->npc.flow_prealloc_size = 1;
+ rc = roc_npc_init(&eswitch_dev->npc);
+ if (rc)
+ goto rsrc_cleanup;
+
+ return rc;
+rsrc_cleanup:
+ eswitch_hw_rsrc_cleanup(eswitch_dev, pci_dev);
+fail:
+ return rc;
+}
+
static int
cnxk_eswitch_dev_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
{
@@ -347,6 +554,12 @@ cnxk_eswitch_dev_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pc
eswitch_dev = mz->addr;
eswitch_dev->pci_dev = pci_dev;
+
+ rc = eswitch_hw_rsrc_setup(eswitch_dev, pci_dev);
+ if (rc) {
+ plt_err("Failed to setup hw rsrc, rc=%d(%s)", rc, roc_error_msg_get(rc));
+ goto free_mem;
+ }
}
/* Spinlock for synchronization between representors traffic and control
@@ -355,6 +568,8 @@ cnxk_eswitch_dev_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pc
rte_spinlock_init(&eswitch_dev->rep_lock);
return rc;
+free_mem:
+ rte_memzone_free(mz);
fail:
return rc;
}
--
2.18.0