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 122DD43C06;
Tue, 27 Feb 2024 20:18:26 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id D3CD942F61;
Tue, 27 Feb 2024 20:17:20 +0100 (CET)
Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com
[67.231.148.174])
by mails.dpdk.org (Postfix) with ESMTP id A846E42EFA
for <dev@dpdk.org>; Tue, 27 Feb 2024 20:17:06 +0100 (CET)
Received: from pps.filterd (m0045849.ppops.net [127.0.0.1])
by mx0a-0016f401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id
41RHStli010790 for <dev@dpdk.org>; Tue, 27 Feb 2024 11:17:05 -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=eIEE0z2U/95uRTVgoCbxS
5PtRT1VnLw/deql400o7wY=; b=JBuFL78Vxq7T5kJlLgOTCbITM/ZubCgyHi+X9
sTd8u7OHVX0OymKZfwLKho7yqSbb0sdTSs5fyhP2ekJUcIBubpO5wWzpw4AfhD5v
KCPD540+ov1RZEwZlSK1Rvft3SpLe1l2sk77fGc9DGiYwRjfA7YqEtvEumXCaofH
Tqgj3+7sESCIGqv0pkWR0OXvgDlMkplnKi1xHgZFfoFv1kKMKsiu1F3/skEHEeB1
/JHVwme82tQvoQTEPYr/UZHkF9FFQC0mkEWSRZv3Xth6Tg5F8b76Sv/Do6Yal1R7
tw0luk8mzrR3xX68NlPEGQqXNn8xuZKJJylLvkaYkcoW2QYvg==
Received: from dc5-exch05.marvell.com ([199.233.59.128])
by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3whjwdh16y-2
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT)
for <dev@dpdk.org>; Tue, 27 Feb 2024 11:17:05 -0800 (PST)
Received: from DC5-EXCH05.marvell.com (10.69.176.209) by
DC5-EXCH05.marvell.com (10.69.176.209) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.2.1258.12; Tue, 27 Feb 2024 11:16:55 -0800
Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH05.marvell.com
(10.69.176.209) with Microsoft SMTP Server id 15.2.1258.12 via Frontend
Transport; Tue, 27 Feb 2024 11:16:55 -0800
Received: from localhost.localdomain (unknown [10.29.52.211])
by maili.marvell.com (Postfix) with ESMTP id D1C713F71A7;
Tue, 27 Feb 2024 11:16:52 -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 v4 17/23] net/cnxk: eswitch VF as ethernet device
Date: Wed, 28 Feb 2024 00:45:44 +0530
Message-ID: <20240227191550.137687-18-hkalra@marvell.com>
X-Mailer: git-send-email 2.18.0
In-Reply-To: <20240227191550.137687-1-hkalra@marvell.com>
References: <20230811163419.165790-1-hkalra@marvell.com>
<20240227191550.137687-1-hkalra@marvell.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Proofpoint-GUID: jspOQeOm9eyIHwUF1gxuUHox2f3rTvLD
X-Proofpoint-ORIG-GUID: jspOQeOm9eyIHwUF1gxuUHox2f3rTvLD
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-02-27_06,2024-02-27_01,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
Adding support for eswitch VF to probe as normal cnxk ethernet device
Signed-off-by: Harman Kalra <hkalra@marvell.com>
---
drivers/net/cnxk/cn10k_ethdev.c | 3 +++
drivers/net/cnxk/cnxk_ethdev.c | 41 +++++++++++++++++++++---------
drivers/net/cnxk/cnxk_ethdev.h | 3 +++
drivers/net/cnxk/cnxk_ethdev_ops.c | 4 +++
drivers/net/cnxk/cnxk_link.c | 3 ++-
5 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/drivers/net/cnxk/cn10k_ethdev.c b/drivers/net/cnxk/cn10k_ethdev.c
index 78d1dca3c1..9ee23fa538 100644
--- a/drivers/net/cnxk/cn10k_ethdev.c
+++ b/drivers/net/cnxk/cn10k_ethdev.c
@@ -967,6 +967,9 @@ static const struct rte_pci_id cn10k_pci_nix_map[] = {
CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KB, PCI_DEVID_CNXK_RVU_PF),
CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KB, PCI_DEVID_CNXK_RVU_PF),
CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_VF),
+ CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_ESWITCH_VF),
+ CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KB, PCI_DEVID_CNXK_RVU_ESWITCH_VF),
+ CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_ESWITCH_VF),
CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_VF),
CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_VF),
CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KB, PCI_DEVID_CNXK_RVU_VF),
diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c
index 2372a4e793..ec43de6221 100644
--- a/drivers/net/cnxk/cnxk_ethdev.c
+++ b/drivers/net/cnxk/cnxk_ethdev.c
@@ -390,7 +390,7 @@ nix_update_flow_ctrl_config(struct rte_eth_dev *eth_dev)
struct cnxk_fc_cfg *fc = &dev->fc_cfg;
struct rte_eth_fc_conf fc_cfg = {0};
- if (roc_nix_is_sdp(&dev->nix))
+ if (roc_nix_is_sdp(&dev->nix) || roc_nix_is_esw(&dev->nix))
return 0;
/* Don't do anything if PFC is enabled */
@@ -1449,12 +1449,14 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev)
goto cq_fini;
/* Init flow control configuration */
- fc_cfg.type = ROC_NIX_FC_RXCHAN_CFG;
- fc_cfg.rxchan_cfg.enable = true;
- rc = roc_nix_fc_config_set(nix, &fc_cfg);
- if (rc) {
- plt_err("Failed to initialize flow control rc=%d", rc);
- goto cq_fini;
+ if (!roc_nix_is_esw(nix)) {
+ fc_cfg.type = ROC_NIX_FC_RXCHAN_CFG;
+ fc_cfg.rxchan_cfg.enable = true;
+ rc = roc_nix_fc_config_set(nix, &fc_cfg);
+ if (rc) {
+ plt_err("Failed to initialize flow control rc=%d", rc);
+ goto cq_fini;
+ }
}
/* Update flow control configuration to PMD */
@@ -1976,11 +1978,21 @@ cnxk_eth_dev_init(struct rte_eth_dev *eth_dev)
TAILQ_INIT(&dev->mcs_list);
}
- plt_nix_dbg("Port=%d pf=%d vf=%d ver=%s hwcap=0x%" PRIx64
- " rxoffload_capa=0x%" PRIx64 " txoffload_capa=0x%" PRIx64,
- eth_dev->data->port_id, roc_nix_get_pf(nix),
- roc_nix_get_vf(nix), CNXK_ETH_DEV_PMD_VERSION, dev->hwcap,
- dev->rx_offload_capa, dev->tx_offload_capa);
+ /* Reserve a switch domain for eswitch device */
+ if (pci_dev->id.device_id == PCI_DEVID_CNXK_RVU_ESWITCH_VF) {
+ eth_dev->data->dev_flags |= RTE_ETH_DEV_REPRESENTOR;
+ rc = rte_eth_switch_domain_alloc(&dev->switch_domain_id);
+ if (rc) {
+ plt_err("Failed to alloc switch domain: %d", rc);
+ goto free_mac_addrs;
+ }
+ }
+
+ plt_nix_dbg("Port=%d pf=%d vf=%d ver=%s hwcap=0x%" PRIx64 " rxoffload_capa=0x%" PRIx64
+ " txoffload_capa=0x%" PRIx64,
+ eth_dev->data->port_id, roc_nix_get_pf(nix), roc_nix_get_vf(nix),
+ CNXK_ETH_DEV_PMD_VERSION, dev->hwcap, dev->rx_offload_capa,
+ dev->tx_offload_capa);
return 0;
free_mac_addrs:
@@ -2046,6 +2058,11 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool reset)
}
}
+ /* Free switch domain ID reserved for eswitch device */
+ if ((eth_dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) &&
+ rte_eth_switch_domain_free(dev->switch_domain_id))
+ plt_err("Failed to free switch domain");
+
/* Disable and free rte_meter entries */
nix_meter_fini(dev);
diff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h
index cc77aefe15..b00478a315 100644
--- a/drivers/net/cnxk/cnxk_ethdev.h
+++ b/drivers/net/cnxk/cnxk_ethdev.h
@@ -427,6 +427,9 @@ struct cnxk_eth_dev {
/* Inject packets */
struct cnxk_ethdev_inj_cfg inj_cfg;
+
+ /* Eswitch domain ID */
+ uint16_t switch_domain_id;
};
struct cnxk_eth_rxq_sp {
diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c b/drivers/net/cnxk/cnxk_ethdev_ops.c
index 5de2919047..67fbf7c269 100644
--- a/drivers/net/cnxk/cnxk_ethdev_ops.c
+++ b/drivers/net/cnxk/cnxk_ethdev_ops.c
@@ -71,6 +71,10 @@ cnxk_nix_info_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *devinfo)
RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP;
devinfo->max_rx_mempools = CNXK_NIX_NUM_POOLS_MAX;
+ if (eth_dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) {
+ devinfo->switch_info.name = eth_dev->device->name;
+ devinfo->switch_info.domain_id = dev->switch_domain_id;
+ }
return 0;
}
diff --git a/drivers/net/cnxk/cnxk_link.c b/drivers/net/cnxk/cnxk_link.c
index 127c9e72e7..903b44de2c 100644
--- a/drivers/net/cnxk/cnxk_link.c
+++ b/drivers/net/cnxk/cnxk_link.c
@@ -13,7 +13,8 @@ cnxk_nix_toggle_flag_link_cfg(struct cnxk_eth_dev *dev, bool set)
dev->flags &= ~CNXK_LINK_CFG_IN_PROGRESS_F;
/* Update link info for LBK */
- if (!set && (roc_nix_is_lbk(&dev->nix) || roc_nix_is_sdp(&dev->nix))) {
+ if (!set &&
+ (roc_nix_is_lbk(&dev->nix) || roc_nix_is_sdp(&dev->nix) || roc_nix_is_esw(&dev->nix))) {
struct rte_eth_link link;
link.link_status = RTE_ETH_LINK_UP;
--
2.18.0