23/06/2021 06:46, Nithin Dabilpuram:
> --- a/drivers/net/meson.build
> +++ b/drivers/net/meson.build
> @@ -12,6 +12,7 @@ drivers = [
> 'bnx2x',
> 'bnxt',
> 'bonding',
> + 'cnxk',
> 'cxgbe',
> 'dpaa',
> 'dpaa2',
Wrong indent spotted with devtools/check-meson.py
Will fix while applying if no serious issue.
@@ -745,8 +745,11 @@ M: Kiran Kumar K <kirankumark@marvell.com>
M: Sunil Kumar Kori <skori@marvell.com>
M: Satha Rao <skoteshwar@marvell.com>
T: git://dpdk.org/next/dpdk-next-net-mrvl
-F: drivers/common/cnxk/
+F: doc/guides/nics/cnxk.rst
+F: doc/guides/nics/features/cnxk*.ini
F: doc/guides/platform/cnxk.rst
+F: drivers/common/cnxk/
+F: drivers/net/cnxk/
Marvell mvpp2
M: Liron Himi <lironh@marvell.com>
new file mode 100644
@@ -0,0 +1,29 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+ Copyright(C) 2021 Marvell.
+
+CNXK Poll Mode driver
+=====================
+
+The CNXK ETHDEV PMD (**librte_net_cnxk**) provides poll mode ethdev driver
+support for the inbuilt network device found in **Marvell OCTEON CN9K/CN10K**
+SoC family as well as for their virtual functions (VF) in SR-IOV context.
+
+More information can be found at `Marvell Official Website
+<https://www.marvell.com/embedded-processors/infrastructure-processors>`_.
+
+Features
+--------
+
+Features of the CNXK Ethdev PMD are:
+
+Prerequisites
+-------------
+
+See :doc:`../platform/cnxk` for setup information.
+
+
+Driver compilation and testing
+------------------------------
+
+Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>`
+for details.
new file mode 100644
@@ -0,0 +1,9 @@
+;
+; Supported features of the 'cnxk' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Linux = Y
+ARMv8 = Y
+Usage doc = Y
new file mode 100644
@@ -0,0 +1,9 @@
+;
+; Supported features of the 'cnxk_vec' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Linux = Y
+ARMv8 = Y
+Usage doc = Y
new file mode 100644
@@ -0,0 +1,9 @@
+;
+; Supported features of the 'cnxk_vf' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Linux = Y
+ARMv8 = Y
+Usage doc = Y
@@ -19,6 +19,7 @@ Network Interface Controller Drivers
axgbe
bnx2x
bnxt
+ cnxk
cxgbe
dpaa
dpaa2
@@ -142,6 +142,9 @@ HW Offload Drivers
This section lists dataplane H/W block(s) available in cnxk SoC.
+#. **Ethdev Driver**
+ See :doc:`../nics/cnxk` for NIX Ethdev driver information.
+
#. **Mempool Driver**
See :doc:`../mempool/cnxk` for NPA mempool driver information.
@@ -55,6 +55,11 @@ New Features
Also, make sure to start the actual text at the margin.
=======================================================
+* **Added support for Marvell CN10K SoC ethernet device.**
+
+ * Added net/cnxk driver which provides the support for the integrated ethernet
+ device.
+
Removed Items
-------------
new file mode 100644
@@ -0,0 +1,218 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+#include <cnxk_ethdev.h>
+
+/* CNXK platform independent eth dev ops */
+struct eth_dev_ops cnxk_eth_dev_ops;
+
+static int
+cnxk_eth_dev_init(struct rte_eth_dev *eth_dev)
+{
+ struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
+ struct roc_nix *nix = &dev->nix;
+ struct rte_pci_device *pci_dev;
+ int rc, max_entries;
+
+ eth_dev->dev_ops = &cnxk_eth_dev_ops;
+
+ /* For secondary processes, the primary has done all the work */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+
+ pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
+ rte_eth_copy_pci_info(eth_dev, pci_dev);
+
+ /* Initialize base roc nix */
+ nix->pci_dev = pci_dev;
+ rc = roc_nix_dev_init(nix);
+ if (rc) {
+ plt_err("Failed to initialize roc nix rc=%d", rc);
+ goto error;
+ }
+
+ dev->eth_dev = eth_dev;
+
+ /* For vfs, returned max_entries will be 0. but to keep default mac
+ * address, one entry must be allocated. so setting up to 1.
+ */
+ if (roc_nix_is_vf_or_sdp(nix))
+ max_entries = 1;
+ else
+ max_entries = roc_nix_mac_max_entries_get(nix);
+
+ if (max_entries <= 0) {
+ plt_err("Failed to get max entries for mac addr");
+ rc = -ENOTSUP;
+ goto dev_fini;
+ }
+
+ eth_dev->data->mac_addrs =
+ rte_zmalloc("mac_addr", max_entries * RTE_ETHER_ADDR_LEN, 0);
+ if (eth_dev->data->mac_addrs == NULL) {
+ plt_err("Failed to allocate memory for mac addr");
+ rc = -ENOMEM;
+ goto dev_fini;
+ }
+
+ dev->max_mac_entries = max_entries;
+
+ /* Get mac address */
+ rc = roc_nix_npc_mac_addr_get(nix, dev->mac_addr);
+ if (rc) {
+ plt_err("Failed to get mac addr, rc=%d", rc);
+ goto free_mac_addrs;
+ }
+
+ /* Update the mac address */
+ memcpy(eth_dev->data->mac_addrs, dev->mac_addr, RTE_ETHER_ADDR_LEN);
+
+ if (!roc_nix_is_vf_or_sdp(nix)) {
+ /* Sync same MAC address to CGX/RPM table */
+ rc = roc_nix_mac_addr_set(nix, dev->mac_addr);
+ if (rc) {
+ plt_err("Failed to set mac addr, rc=%d", rc);
+ goto free_mac_addrs;
+ }
+ }
+
+ /* Initialize roc npc */
+ 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:
+ rte_free(eth_dev->data->mac_addrs);
+dev_fini:
+ roc_nix_dev_fini(nix);
+error:
+ plt_err("Failed to init nix eth_dev rc=%d", rc);
+ return rc;
+}
+
+static int
+cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool mbox_close)
+{
+ struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
+ const struct eth_dev_ops *dev_ops = eth_dev->dev_ops;
+ struct roc_nix *nix = &dev->nix;
+ int rc, i;
+
+ /* Nothing to be done for secondary processes */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+
+ roc_nix_npc_rx_ena_dis(nix, false);
+
+ /* Free up SQs */
+ for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
+ dev_ops->tx_queue_release(eth_dev->data->tx_queues[i]);
+ eth_dev->data->tx_queues[i] = NULL;
+ }
+ eth_dev->data->nb_tx_queues = 0;
+
+ /* Free up RQ's and CQ's */
+ for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
+ dev_ops->rx_queue_release(eth_dev->data->rx_queues[i]);
+ eth_dev->data->rx_queues[i] = NULL;
+ }
+ eth_dev->data->nb_rx_queues = 0;
+
+ /* Free tm resources */
+ roc_nix_tm_fini(nix);
+
+ /* Unregister queue irqs */
+ roc_nix_unregister_queue_irqs(nix);
+
+ /* Unregister cq irqs */
+ if (eth_dev->data->dev_conf.intr_conf.rxq)
+ roc_nix_unregister_cq_irqs(nix);
+
+ /* Free nix lf resources */
+ rc = roc_nix_lf_free(nix);
+ if (rc)
+ plt_err("Failed to free nix lf, rc=%d", rc);
+
+ rte_free(eth_dev->data->mac_addrs);
+ eth_dev->data->mac_addrs = NULL;
+
+ /* Check if mbox close is needed */
+ if (!mbox_close)
+ return 0;
+
+ rc = roc_nix_dev_fini(nix);
+ /* Can be freed later by PMD if NPA LF is in use */
+ if (rc == -EAGAIN) {
+ eth_dev->data->dev_private = NULL;
+ return 0;
+ } else if (rc) {
+ plt_err("Failed in nix dev fini, rc=%d", rc);
+ }
+
+ return rc;
+}
+
+int
+cnxk_nix_remove(struct rte_pci_device *pci_dev)
+{
+ struct rte_eth_dev *eth_dev;
+ struct roc_nix *nix;
+ int rc = -EINVAL;
+
+ eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
+ if (eth_dev) {
+ /* Cleanup eth dev */
+ rc = cnxk_eth_dev_uninit(eth_dev, true);
+ if (rc)
+ return rc;
+
+ rte_eth_dev_release_port(eth_dev);
+ }
+
+ /* Nothing to be done for secondary processes */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+
+ /* Check if this device is hosting common resource */
+ nix = roc_idev_npa_nix_get();
+ if (nix->pci_dev != pci_dev)
+ return 0;
+
+ /* Try nix fini now */
+ rc = roc_nix_dev_fini(nix);
+ if (rc == -EAGAIN) {
+ plt_info("%s: common resource in use by other devices",
+ pci_dev->name);
+ goto exit;
+ } else if (rc) {
+ plt_err("Failed in nix dev fini, rc=%d", rc);
+ goto exit;
+ }
+
+ /* Free device pointer as rte_ethdev does not have it anymore */
+ rte_free(nix);
+exit:
+ return rc;
+}
+
+int
+cnxk_nix_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
+{
+ int rc;
+
+ RTE_SET_USED(pci_drv);
+
+ rc = rte_eth_dev_pci_generic_probe(pci_dev, sizeof(struct cnxk_eth_dev),
+ cnxk_eth_dev_init);
+
+ /* On error on secondary, recheck if port exists in primary or
+ * in mid of detach state.
+ */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY && rc)
+ if (!rte_eth_dev_allocated(pci_dev->device.name))
+ return 0;
+ return rc;
+}
new file mode 100644
@@ -0,0 +1,57 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+#ifndef __CNXK_ETHDEV_H__
+#define __CNXK_ETHDEV_H__
+
+#include <math.h>
+#include <stdint.h>
+
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
+
+#include "roc_api.h"
+
+#define CNXK_ETH_DEV_PMD_VERSION "1.0"
+
+struct cnxk_eth_dev {
+ /* ROC NIX */
+ struct roc_nix nix;
+
+ /* Max macfilter entries */
+ uint8_t max_mac_entries;
+
+ uint16_t flags;
+
+ /* Pointer back to rte */
+ struct rte_eth_dev *eth_dev;
+
+ /* HW capabilities / Limitations */
+ union {
+ uint64_t hwcap;
+ };
+
+ /* Rx and Tx offload capabilities */
+ uint64_t rx_offload_capa;
+ uint64_t tx_offload_capa;
+ uint32_t speed_capa;
+
+ /* Default mac address */
+ uint8_t mac_addr[RTE_ETHER_ADDR_LEN];
+};
+
+static inline struct cnxk_eth_dev *
+cnxk_eth_pmd_priv(struct rte_eth_dev *eth_dev)
+{
+ return eth_dev->data->dev_private;
+}
+
+/* Common ethdev ops */
+extern struct eth_dev_ops cnxk_eth_dev_ops;
+
+/* Ops */
+int cnxk_nix_probe(struct rte_pci_driver *pci_drv,
+ struct rte_pci_device *pci_dev);
+int cnxk_nix_remove(struct rte_pci_device *pci_dev);
+
+#endif /* __CNXK_ETHDEV_H__ */
new file mode 100644
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(C) 2021 Marvell.
+#
+
+if not dpdk_conf.get('RTE_ARCH_64')
+ build = false
+ reason = 'only supported on 64-bit'
+ subdir_done()
+endif
+
+sources = files('cnxk_ethdev.c')
+
+deps += ['bus_pci', 'cryptodev', 'eventdev', 'security']
+deps += ['common_cnxk', 'mempool_cnxk']
new file mode 100644
@@ -0,0 +1,3 @@
+DPDK_21 {
+ local: *;
+};
@@ -12,6 +12,7 @@ drivers = [
'bnx2x',
'bnxt',
'bonding',
+ 'cnxk',
'cxgbe',
'dpaa',
'dpaa2',