Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131007/?format=api
{ "id": 131007, "url": "http://patches.dpdk.org/api/patches/131007/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230901023050.40893-4-caowenbo@mucse.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230901023050.40893-4-caowenbo@mucse.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230901023050.40893-4-caowenbo@mucse.com", "date": "2023-09-01T02:30:45", "name": "[v6,3/8] net/rnp: add device init and uninit", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "da323a888716a58408f8cdd931a41cb70abf1ba5", "submitter": { "id": 2142, "url": "http://patches.dpdk.org/api/people/2142/?format=api", "name": "11", "email": "caowenbo@mucse.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230901023050.40893-4-caowenbo@mucse.com/mbox/", "series": [ { "id": 29398, "url": "http://patches.dpdk.org/api/series/29398/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29398", "date": "2023-09-01T02:30:42", "name": "drivers/net Add Support mucse N10 Pmd Driver", "version": 6, "mbox": "http://patches.dpdk.org/series/29398/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/131007/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/131007/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id F163A42219;\n\tFri, 1 Sep 2023 04:31:36 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 7128F402B0;\n\tFri, 1 Sep 2023 04:31:32 +0200 (CEST)", "from smtpbg151.qq.com (smtpbg151.qq.com [18.169.211.239])\n by mails.dpdk.org (Postfix) with ESMTP id B1AC3402AB\n for <dev@dpdk.org>; Fri, 1 Sep 2023 04:31:30 +0200 (CEST)", "from steven.localdomain ( [183.81.182.182])\n by bizesmtp.qq.com (ESMTP) with\n id ; Fri, 01 Sep 2023 10:31:07 +0800 (CST)" ], "X-QQ-mid": "bizesmtp81t1693535473tne43lbx", "X-QQ-SSF": "01400000000000D0F000000A0000000", "X-QQ-FEAT": "xnbq7qFd8vqkFh/gpjp6/3OJbwTPHnRIZ+uH9S2tg8DebKp4kSijzsszI9R7K\n UBBCcAujlyD7lv8F7MJMtY/aMQOgI4voF0hYQKhEowIXZ8S5okuR6Xmo6ifqMv8Y5kxc9pE\n 2bHf+1TvepxSxVYjmpgaEGoe5W5bA6glrdt+BoaMzb/OGqsWo089fPZ4xuG66yYt/RlIv98\n dg5UIe+oq+gEI3W05JtOPAnt7fYEyqpoz1nt7ZRT55VKXgOP8Hmuf+Kq0QcPes7wW2P1/Ox\n MBEf02XkCi6eV/v/bkiPN5WYse/7N6n9l2TyYIKMrTLlpRygnTorvmi0CK6DUTZpQLxSe73\n LGm2/plbQSC31+VLSzo0sIga83QSpa5Xf6lLTimZz3u4od95v333u7gt74JAR0pDPpLM9sN\n vrbaUI5ADe58lubYVaoFuA==", "X-QQ-GoodBg": "2", "X-BIZMAIL-ID": "7649474810757941472", "From": "Wenbo Cao <caowenbo@mucse.com>", "To": "Wenbo Cao <caowenbo@mucse.com>,\n Anatoly Burakov <anatoly.burakov@intel.com>", "Cc": "dev@dpdk.org, ferruh.yigit@amd.com, thomas@monjalon.net,\n andrew.rybchenko@oktetlabs.ru, yaojun@mucse.com", "Subject": "[PATCH v6 3/8] net/rnp: add device init and uninit", "Date": "Fri, 1 Sep 2023 02:30:45 +0000", "Message-Id": "<20230901023050.40893-4-caowenbo@mucse.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20230901023050.40893-1-caowenbo@mucse.com>", "References": "<20230901023050.40893-1-caowenbo@mucse.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-QQ-SENDSIZE": "520", "Feedback-ID": "bizesmtp:mucse.com:qybglogicsvrgz:qybglogicsvrgz5a-0", "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>,\n <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>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Add basic init and uninit function\n\nSigned-off-by: Wenbo Cao <caowenbo@mucse.com>\n---\n drivers/net/rnp/base/rnp_hw.h | 19 ++++\n drivers/net/rnp/meson.build | 1 +\n drivers/net/rnp/rnp.h | 25 +++++\n drivers/net/rnp/rnp_ethdev.c | 196 +++++++++++++++++++++++++++++++++-\n drivers/net/rnp/rnp_logs.h | 34 ++++++\n drivers/net/rnp/rnp_osdep.h | 30 ++++++\n 6 files changed, 300 insertions(+), 5 deletions(-)\n create mode 100644 drivers/net/rnp/base/rnp_hw.h\n create mode 100644 drivers/net/rnp/rnp_logs.h\n create mode 100644 drivers/net/rnp/rnp_osdep.h", "diff": "diff --git a/drivers/net/rnp/base/rnp_hw.h b/drivers/net/rnp/base/rnp_hw.h\nnew file mode 100644\nindex 0000000000..d80d23f4b4\n--- /dev/null\n+++ b/drivers/net/rnp/base/rnp_hw.h\n@@ -0,0 +1,19 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(C) 2023 Mucse IC Design Ltd.\n+ */\n+#ifndef __RNP_HW_H__\n+#define __RNP_HW_H__\n+\n+struct rnp_eth_adapter;\n+struct rnp_hw {\n+\tstruct rnp_eth_adapter *back;\n+\tvoid *iobar0;\n+\tuint32_t iobar0_len;\n+\tvoid *iobar4;\n+\tuint32_t iobar4_len;\n+\n+\tuint16_t device_id;\n+\tuint16_t vendor_id;\n+} __rte_cache_aligned;\n+\n+#endif /* __RNP_H__*/\ndiff --git a/drivers/net/rnp/meson.build b/drivers/net/rnp/meson.build\nindex 4f37c6b456..f85d597e68 100644\n--- a/drivers/net/rnp/meson.build\n+++ b/drivers/net/rnp/meson.build\n@@ -9,3 +9,4 @@ endif\n sources = files(\n \t\t'rnp_ethdev.c',\n )\n+includes += include_directories('base')\ndiff --git a/drivers/net/rnp/rnp.h b/drivers/net/rnp/rnp.h\nindex 76d281cc0a..cab1b8e85d 100644\n--- a/drivers/net/rnp/rnp.h\n+++ b/drivers/net/rnp/rnp.h\n@@ -4,10 +4,35 @@\n #ifndef __RNP_H__\n #define __RNP_H__\n \n+#include \"base/rnp_hw.h\"\n+\n #define PCI_VENDOR_ID_MUCSE\t(0x8848)\n #define RNP_DEV_ID_N10G\t\t(0x1000)\n+#define RNP_MAX_PORT_OF_PF\t(4)\n+#define RNP_CFG_BAR\t\t(4)\n+#define RNP_PF_INFO_BAR\t\t(0)\n \n struct rnp_eth_port {\n+\tstruct rnp_eth_adapter *adapt;\n+\tstruct rte_eth_dev *eth_dev;\n+} __rte_cache_aligned;\n+\n+struct rnp_share_ops {\n } __rte_cache_aligned;\n \n+struct rnp_eth_adapter {\n+\tstruct rnp_hw hw;\n+\tstruct rte_pci_device *pdev;\n+\tstruct rte_eth_dev *eth_dev; /* primary eth_dev */\n+\tstruct rnp_eth_port *ports[RNP_MAX_PORT_OF_PF];\n+\tstruct rnp_share_ops *share_priv;\n+\n+\tuint8_t num_ports; /* Cur Pf Has physical Port Num */\n+} __rte_cache_aligned;\n+\n+#define RNP_DEV_TO_PORT(eth_dev) \\\n+\t(((struct rnp_eth_port *)((eth_dev)->data->dev_private)))\n+#define RNP_DEV_TO_ADAPTER(eth_dev) \\\n+\t((struct rnp_eth_adapter *)(RNP_DEV_TO_PORT(eth_dev)->adapt))\n+\n #endif /* __RNP_H__ */\ndiff --git a/drivers/net/rnp/rnp_ethdev.c b/drivers/net/rnp/rnp_ethdev.c\nindex 390f2e7743..ae737643a7 100644\n--- a/drivers/net/rnp/rnp_ethdev.c\n+++ b/drivers/net/rnp/rnp_ethdev.c\n@@ -5,23 +5,198 @@\n #include <ethdev_pci.h>\n #include <rte_io.h>\n #include <rte_malloc.h>\n+#include <ethdev_driver.h>\n \n #include \"rnp.h\"\n+#include \"rnp_logs.h\"\n \n static int\n-rnp_eth_dev_init(struct rte_eth_dev *eth_dev)\n+rnp_mac_rx_disable(struct rte_eth_dev *dev)\n {\n-\tRTE_SET_USED(eth_dev);\n+\tRTE_SET_USED(dev);\n \n-\treturn -ENODEV;\n+\treturn 0;\n+}\n+\n+static int\n+rnp_mac_tx_disable(struct rte_eth_dev *dev)\n+{\n+\tRTE_SET_USED(dev);\n+\n+\treturn 0;\n+}\n+\n+static int rnp_dev_close(struct rte_eth_dev *dev)\n+{\n+\tRTE_SET_USED(dev);\n+\n+\treturn 0;\n+}\n+\n+/* Features supported by this driver */\n+static const struct eth_dev_ops rnp_eth_dev_ops = {\n+};\n+\n+static int\n+rnp_init_port_resource(struct rnp_eth_adapter *adapter,\n+\t\t struct rte_eth_dev *dev,\n+\t\t char *name,\n+\t\t uint8_t p_id)\n+{\n+\tstruct rnp_eth_port *port = RNP_DEV_TO_PORT(dev);\n+\n+\tport->eth_dev = dev;\n+\tadapter->ports[p_id] = port;\n+\tdev->dev_ops = &rnp_eth_dev_ops;\n+\tRTE_SET_USED(name);\n+\n+\treturn 0;\n+}\n+\n+static struct rte_eth_dev *\n+rnp_alloc_eth_port(struct rte_pci_device *primary_pci, char *name)\n+{\n+\tstruct rnp_eth_port *port;\n+\tstruct rte_eth_dev *eth_dev;\n+\n+\teth_dev = rte_eth_dev_allocate(name);\n+\tif (!eth_dev) {\n+\t\tRNP_PMD_DRV_LOG(ERR, \"Could not allocate \"\n+\t\t\t\t\"eth_dev for %s\\n\", name);\n+\t\treturn NULL;\n+\t}\n+\tport = rte_zmalloc_socket(name,\n+\t\t\tsizeof(*port),\n+\t\t\tRTE_CACHE_LINE_SIZE,\n+\t\t\tprimary_pci->device.numa_node);\n+\tif (!port) {\n+\t\tRNP_PMD_DRV_LOG(ERR, \"Could not allocate \"\n+\t\t\t\t\"rnp_eth_port for %s\\n\", name);\n+\t\treturn NULL;\n+\t}\n+\teth_dev->data->dev_private = port;\n+\teth_dev->process_private = calloc(1, sizeof(struct rnp_share_ops));\n+\tif (!eth_dev->process_private) {\n+\t\tRNP_PMD_DRV_LOG(ERR, \"Could not calloc \"\n+\t\t\t\t\"for Process_priv\\n\");\n+\t\tgoto fail_calloc;\n+\t}\n+\treturn eth_dev;\n+fail_calloc:\n+\trte_free(port);\n+\trte_eth_dev_release_port(eth_dev);\n+\n+\treturn NULL;\n+}\n+\n+static int\n+rnp_eth_dev_init(struct rte_eth_dev *dev)\n+{\n+\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n+\tstruct rnp_eth_adapter *adapter = NULL;\n+\tchar name[RTE_ETH_NAME_MAX_LEN] = \" \";\n+\tstruct rnp_eth_port *port = NULL;\n+\tstruct rte_eth_dev *eth_dev;\n+\tstruct rnp_hw *hw = NULL;\n+\tint32_t p_id;\n+\tint ret;\n+\n+\tPMD_INIT_FUNC_TRACE();\n+\n+\tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n+\t\treturn 0;\n+\tmemset(name, 0, sizeof(name));\n+\tsnprintf(name, sizeof(name), \"rnp_adapter_%d\", dev->data->port_id);\n+\tadapter = rte_zmalloc(name, sizeof(struct rnp_eth_adapter), 0);\n+\tif (!adapter) {\n+\t\tRNP_PMD_DRV_LOG(ERR, \"zmalloc for adapter failed\\n\");\n+\t\treturn -ENOMEM;\n+\t}\n+\thw = &adapter->hw;\n+\tadapter->pdev = pci_dev;\n+\tadapter->eth_dev = dev;\n+\tadapter->num_ports = 1;\n+\thw->back = adapter;\n+\thw->iobar4 = pci_dev->mem_resource[RNP_CFG_BAR].addr;\n+\thw->iobar0 = pci_dev->mem_resource[RNP_PF_INFO_BAR].addr;\n+\thw->iobar4_len = pci_dev->mem_resource[RNP_CFG_BAR].len;\n+\thw->iobar0_len = pci_dev->mem_resource[RNP_PF_INFO_BAR].len;\n+\thw->device_id = pci_dev->id.device_id;\n+\thw->vendor_id = pci_dev->id.vendor_id;\n+\thw->device_id = pci_dev->id.device_id;\n+\tfor (p_id = 0; p_id < adapter->num_ports; p_id++) {\n+\t\t/* port 0 resource has been allocated When Probe */\n+\t\tif (!p_id) {\n+\t\t\teth_dev = dev;\n+\t\t} else {\n+\t\t\tsnprintf(name, sizeof(name), \"%s_%d\",\n+\t\t\t\t\tadapter->pdev->device.name,\n+\t\t\t\t\tp_id);\n+\t\t\teth_dev = rnp_alloc_eth_port(pci_dev, name);\n+\t\t\tif (eth_dev)\n+\t\t\t\trte_memcpy(eth_dev->process_private,\n+\t\t\t\t\t\tadapter->share_priv,\n+\t\t\t\t\t\tsizeof(*adapter->share_priv));\n+\t\t\tif (!eth_dev) {\n+\t\t\t\tret = -ENOMEM;\n+\t\t\t\tgoto eth_alloc_error;\n+\t\t\t}\n+\t\t}\n+\t\tret = rnp_init_port_resource(adapter, eth_dev, name, p_id);\n+\t\tif (ret)\n+\t\t\tgoto eth_alloc_error;\n+\n+\t\trnp_mac_rx_disable(eth_dev);\n+\t\trnp_mac_tx_disable(eth_dev);\n+\t}\n+\n+\treturn 0;\n+eth_alloc_error:\n+\tfor (p_id = 0; p_id < adapter->num_ports; p_id++) {\n+\t\tport = adapter->ports[p_id];\n+\t\tif (!port)\n+\t\t\tcontinue;\n+\t\tif (port->eth_dev) {\n+\t\t\trnp_dev_close(port->eth_dev);\n+\t\t\trte_eth_dev_release_port(port->eth_dev);\n+\t\t\tif (port->eth_dev->process_private)\n+\t\t\t\tfree(port->eth_dev->process_private);\n+\t\t}\n+\t\trte_free(port);\n+\t}\n+\trte_free(adapter);\n+\n+\treturn 0;\n }\n \n static int\n rnp_eth_dev_uninit(struct rte_eth_dev *eth_dev)\n {\n-\tRTE_SET_USED(eth_dev);\n+\tstruct rnp_eth_adapter *adapter = RNP_DEV_TO_ADAPTER(eth_dev);\n+\tstruct rnp_eth_port *port = NULL;\n+\tuint8_t p_id;\n+\n+\tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n+\t\treturn 0;\n \n-\treturn -ENODEV;\n+\tif (adapter->eth_dev != eth_dev) {\n+\t\tRNP_PMD_DRV_LOG(ERR, \"Input Argument ethdev \"\n+\t\t\t \"Isn't Primary Ethdev\\n\");\n+\t\treturn -EINVAL;\n+\t}\n+\tfor (p_id = 0; p_id < adapter->num_ports; p_id++) {\n+\t\tport = adapter->ports[p_id];\n+\t\tif (!port)\n+\t\t\tcontinue;\n+\t\tif (port->eth_dev) {\n+\t\t\trnp_dev_close(port->eth_dev);\n+\t\t\t/* Just Release Not Primary Port Allocated By PMD */\n+\t\t\tif (p_id)\n+\t\t\t\trte_eth_dev_release_port(port->eth_dev);\n+\t\t}\n+\t}\n+\n+\treturn 0;\n }\n \n static int\n@@ -84,3 +259,14 @@ static struct rte_pci_driver rte_rnp_pmd = {\n RTE_PMD_REGISTER_PCI(net_rnp, rte_rnp_pmd);\n RTE_PMD_REGISTER_PCI_TABLE(net_rnp, pci_id_rnp_map);\n RTE_PMD_REGISTER_KMOD_DEP(net_rnp, \"igb_uio | uio_pci_generic | vfio-pci\");\n+\n+RTE_LOG_REGISTER_SUFFIX(rnp_init_logtype, init, NOTICE);\n+RTE_LOG_REGISTER_SUFFIX(rnp_drv_logtype, driver, NOTICE);\n+\n+#ifdef RTE_LIBRTE_RNP_DEBUG_RX\n+\tRTE_LOG_REGISTER_SUFFIX(rnp_rx_logtype, rx, DEBUG);\n+#endif\n+\n+#ifdef RTE_LIBRTE_RNP_DEBUG_TX\n+\tRTE_LOG_REGISTER_SUFFIX(rnp_tx_logtype, tx, DEBUG);\n+#endif\ndiff --git a/drivers/net/rnp/rnp_logs.h b/drivers/net/rnp/rnp_logs.h\nnew file mode 100644\nindex 0000000000..1b3ee33745\n--- /dev/null\n+++ b/drivers/net/rnp/rnp_logs.h\n@@ -0,0 +1,34 @@\n+#ifndef __RNP_LOGS_H__\n+#define __RNP_LOGS_H__\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(C) 2023 Mucse IC Design Ltd.\n+ */\n+extern int rnp_init_logtype;\n+\n+#define RNP_PMD_INIT_LOG(level, fmt, args...) \\\n+\trte_log(RTE_LOG_##level, rnp_init_logtype, \\\n+\t\t\"%s() \" fmt, __func__, ##args)\n+#define PMD_INIT_FUNC_TRACE() RNP_PMD_INIT_LOG(DEBUG, \" >>\")\n+extern int rnp_drv_logtype;\n+#define RNP_PMD_DRV_LOG(level, fmt, args...) \\\n+\trte_log(RTE_LOG_##level, rnp_drv_logtype, \\\n+\t\t\"%s() \" fmt, __func__, ##args)\n+#ifdef RTE_LIBRTE_RNP_DEBUG_RX\n+extern int rnp_rx_logtype;\n+#define RNP_PMD_RX_LOG(level, fmt, args...) \\\n+\trte_log(RTE_LOG_ ## level, rnp_rx_logtype, \\\n+\t\t\"%s(): \" fmt \"\\n\", __func__, ##args)\n+#else\n+#define RNP_PMD_RX_LOG(level, fmt, args...) do { } while (0)\n+#endif\n+\n+#ifdef RTE_LIBRTE_RNP_DEBUG_TX\n+extern int rnp_tx_logtype;\n+#define PMD_TX_LOG(level, fmt, args...) \\\n+\trte_log(RTE_LOG_ ## level, rnp_tx_logtype, \\\n+\t\t\"%s(): \" fmt \"\\n\", __func__, ##args)\n+#else\n+#define PMD_TX_LOG(level, fmt, args...) do { } while (0)\n+#endif\n+\n+#endif /* __RNP_LOGS_H__ */\ndiff --git a/drivers/net/rnp/rnp_osdep.h b/drivers/net/rnp/rnp_osdep.h\nnew file mode 100644\nindex 0000000000..5685dd2404\n--- /dev/null\n+++ b/drivers/net/rnp/rnp_osdep.h\n@@ -0,0 +1,30 @@\n+#ifndef __RNP_OSDEP_H__\n+#define __RNP_OSDEP_H__\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(C) 2023 Mucse IC Design Ltd.\n+ */\n+#include <stdint.h>\n+\n+#include <rte_byteorder.h>\n+\n+#define __iomem\n+#define _RING_(off) ((off) + 0x000000)\n+#define _DMA_(off) ((off))\n+#define _GLB_(off) ((off) + 0x000000)\n+#define _NIC_(off) ((off) + 0x000000)\n+#define _ETH_(off) ((off))\n+#define _MAC_(off) ((off))\n+#define BIT(n) (1UL << (n))\n+#define BIT64(n) (1ULL << (n))\n+#define BITS_PER_LONG (__SIZEOF_LONG__ * 8)\n+#define GENMASK(h, l) \\\n+\t(((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h))))\n+\n+typedef uint8_t u8;\n+typedef uint16_t u16;\n+typedef uint32_t u32;\n+typedef uint64_t u64;\n+typedef int32_t s32;\n+typedef int16_t s16;\n+typedef int8_t s8;\n+#endif /* __RNP_OSDEP_H__ */\n", "prefixes": [ "v6", "3/8" ] }