Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 94327,
    "url": "http://patches.dpdk.org/api/patches/94327/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210617110005.4132926-3-jiawenwu@trustnetic.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": "<20210617110005.4132926-3-jiawenwu@trustnetic.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20210617110005.4132926-3-jiawenwu@trustnetic.com",
    "date": "2021-06-17T10:59:48",
    "name": "[v6,02/19] net/ngbe: support probe and remove",
    "commit_ref": null,
    "pull_url": null,
    "state": "changes-requested",
    "archived": true,
    "hash": "f2a13ada207a0317856d56ce836b31518d5d150e",
    "submitter": {
        "id": 1932,
        "url": "http://patches.dpdk.org/api/people/1932/?format=api",
        "name": "Jiawen Wu",
        "email": "jiawenwu@trustnetic.com"
    },
    "delegate": {
        "id": 3961,
        "url": "http://patches.dpdk.org/api/users/3961/?format=api",
        "username": "arybchenko",
        "first_name": "Andrew",
        "last_name": "Rybchenko",
        "email": "andrew.rybchenko@oktetlabs.ru"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210617110005.4132926-3-jiawenwu@trustnetic.com/mbox/",
    "series": [
        {
            "id": 17372,
            "url": "http://patches.dpdk.org/api/series/17372/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=17372",
            "date": "2021-06-17T10:59:46",
            "name": "net: ngbe PMD",
            "version": 6,
            "mbox": "http://patches.dpdk.org/series/17372/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/94327/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/94327/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 53B92A0C4D;\n\tThu, 17 Jun 2021 12:58:24 +0200 (CEST)",
            "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 6EE43410EF;\n\tThu, 17 Jun 2021 12:58:16 +0200 (CEST)",
            "from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166])\n by mails.dpdk.org (Postfix) with ESMTP id D095740150\n for <dev@dpdk.org>; Thu, 17 Jun 2021 12:58:12 +0200 (CEST)",
            "from wxdbg.localdomain.com (unknown [183.129.236.74])\n by esmtp6.qq.com (ESMTP) with\n id ; Thu, 17 Jun 2021 18:58:06 +0800 (CST)"
        ],
        "X-QQ-mid": "bizesmtp46t1623927486tmnck5nk",
        "X-QQ-SSF": "01400000000000D0E000B00A0000000",
        "X-QQ-FEAT": "YKCDl5A3/arQbc4jGmmEoxO/ILVazIaivF3YH6Ar+7gcJvyo65JBoBrkZM5xA\n +4rFIFHqRsxniWrNZfE0yIAYAN4GaGE0IJsgPZ/AvKW0wZ41h3y7mUYH+5LVTGeTMOSF/cC\n 0IxS+KJNWou++wKGySABtEKHBkOTJOo/q0iaZtDpCbMMsk/DusT2goFeRkrZBzSwsrpA2QH\n fR4eCoX0oVE0KfVnNIrOvX8z0/3vw40xNaS948rDHILOYDHWg4BS/fqqQM/JbvqfudeWhEw\n 1bg61/MTne6zSeQibXkoFrEXWAAYY9WXUbmscsAMYUywME5iT42pFJs0zXOmJ+K7CpawHS0\n TTmbSE663mcPdCfsabp03+t/Vjg4A==",
        "X-QQ-GoodBg": "2",
        "From": "Jiawen Wu <jiawenwu@trustnetic.com>",
        "To": "dev@dpdk.org",
        "Cc": "Jiawen Wu <jiawenwu@trustnetic.com>",
        "Date": "Thu, 17 Jun 2021 18:59:48 +0800",
        "Message-Id": "<20210617110005.4132926-3-jiawenwu@trustnetic.com>",
        "X-Mailer": "git-send-email 2.27.0",
        "In-Reply-To": "<20210617110005.4132926-1-jiawenwu@trustnetic.com>",
        "References": "<20210617110005.4132926-1-jiawenwu@trustnetic.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "X-QQ-SENDSIZE": "520",
        "Feedback-ID": "bizesmtp:trustnetic.com:qybgforeign:qybgforeign1",
        "X-QQ-Bgrelay": "1",
        "Subject": "[dpdk-dev] [PATCH v6 02/19] net/ngbe: support probe and remove",
        "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",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "Add device IDs for Wangxun 1Gb NICs, map device IDs to register ngbe\nPMD. Add basic PCIe ethdev probe and remove.\n\nSigned-off-by: Jiawen Wu <jiawenwu@trustnetic.com>\n---\n doc/guides/nics/features/ngbe.ini   |  1 +\n drivers/net/ngbe/base/meson.build   | 18 +++++++\n drivers/net/ngbe/base/ngbe_devids.h | 83 +++++++++++++++++++++++++++++\n drivers/net/ngbe/meson.build        |  6 +++\n drivers/net/ngbe/ngbe_ethdev.c      | 66 +++++++++++++++++++++--\n drivers/net/ngbe/ngbe_ethdev.h      | 16 ++++++\n 6 files changed, 186 insertions(+), 4 deletions(-)\n create mode 100644 drivers/net/ngbe/base/meson.build\n create mode 100644 drivers/net/ngbe/base/ngbe_devids.h\n create mode 100644 drivers/net/ngbe/ngbe_ethdev.h",
    "diff": "diff --git a/doc/guides/nics/features/ngbe.ini b/doc/guides/nics/features/ngbe.ini\nindex a7a524defc..977286ac04 100644\n--- a/doc/guides/nics/features/ngbe.ini\n+++ b/doc/guides/nics/features/ngbe.ini\n@@ -4,6 +4,7 @@\n ; Refer to default.ini for the full list of available PMD features.\n ;\n [Features]\n+Multiprocess aware   = Y\n Linux                = Y\n ARMv8                = Y\n x86-32               = Y\ndiff --git a/drivers/net/ngbe/base/meson.build b/drivers/net/ngbe/base/meson.build\nnew file mode 100644\nindex 0000000000..c5f6467743\n--- /dev/null\n+++ b/drivers/net/ngbe/base/meson.build\n@@ -0,0 +1,18 @@\n+# SPDX-License-Identifier: BSD-3-Clause\n+# Copyright(c) 2018-2020 Beijing WangXun Technology Co., Ltd.\n+\n+sources = []\n+\n+error_cflags = []\n+\n+c_args = cflags\n+foreach flag: error_cflags\n+\tif cc.has_argument(flag)\n+\t\tc_args += flag\n+\tendif\n+endforeach\n+\n+base_lib = static_library('ngbe_base', sources,\n+\tdependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci],\n+\tc_args: c_args)\n+base_objs = base_lib.extract_all_objects()\ndiff --git a/drivers/net/ngbe/base/ngbe_devids.h b/drivers/net/ngbe/base/ngbe_devids.h\nnew file mode 100644\nindex 0000000000..eb9a0b231e\n--- /dev/null\n+++ b/drivers/net/ngbe/base/ngbe_devids.h\n@@ -0,0 +1,83 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2018-2020 Beijing WangXun Technology Co., Ltd.\n+ */\n+\n+#ifndef _NGBE_DEVIDS_H_\n+#define _NGBE_DEVIDS_H_\n+\n+/*\n+ * Vendor ID\n+ */\n+#ifndef PCI_VENDOR_ID_WANGXUN\n+#define PCI_VENDOR_ID_WANGXUN                   0x8088\n+#endif\n+\n+/*\n+ * Device IDs\n+ */\n+#define NGBE_DEV_ID_EM_VF\t\t\t0x0110\n+#define   NGBE_SUB_DEV_ID_EM_VF\t\t\t0x0110\n+#define NGBE_DEV_ID_EM\t\t\t\t0x0100\n+#define   NGBE_SUB_DEV_ID_EM_MVL_RGMII\t\t0x0200\n+#define   NGBE_SUB_DEV_ID_EM_MVL_SFP\t\t0x0403\n+#define   NGBE_SUB_DEV_ID_EM_RTL_SGMII\t\t0x0410\n+#define   NGBE_SUB_DEV_ID_EM_YT8521S_SFP\t0x0460\n+\n+#define NGBE_DEV_ID_EM_WX1860AL_W\t\t0x0100\n+#define NGBE_DEV_ID_EM_WX1860AL_W_VF\t\t0x0110\n+#define NGBE_DEV_ID_EM_WX1860A2\t\t\t0x0101\n+#define NGBE_DEV_ID_EM_WX1860A2_VF\t\t0x0111\n+#define NGBE_DEV_ID_EM_WX1860A2S\t\t0x0102\n+#define NGBE_DEV_ID_EM_WX1860A2S_VF\t\t0x0112\n+#define NGBE_DEV_ID_EM_WX1860A4\t\t\t0x0103\n+#define NGBE_DEV_ID_EM_WX1860A4_VF\t\t0x0113\n+#define NGBE_DEV_ID_EM_WX1860A4S\t\t0x0104\n+#define NGBE_DEV_ID_EM_WX1860A4S_VF\t\t0x0114\n+#define NGBE_DEV_ID_EM_WX1860AL2\t\t0x0105\n+#define NGBE_DEV_ID_EM_WX1860AL2_VF\t\t0x0115\n+#define NGBE_DEV_ID_EM_WX1860AL2S\t\t0x0106\n+#define NGBE_DEV_ID_EM_WX1860AL2S_VF\t\t0x0116\n+#define NGBE_DEV_ID_EM_WX1860AL4\t\t0x0107\n+#define NGBE_DEV_ID_EM_WX1860AL4_VF\t\t0x0117\n+#define NGBE_DEV_ID_EM_WX1860AL4S\t\t0x0108\n+#define NGBE_DEV_ID_EM_WX1860AL4S_VF\t\t0x0118\n+#define NGBE_DEV_ID_EM_WX1860NCSI\t\t0x0109\n+#define NGBE_DEV_ID_EM_WX1860NCSI_VF\t\t0x0119\n+#define NGBE_DEV_ID_EM_WX1860A1\t\t\t0x010A\n+#define NGBE_DEV_ID_EM_WX1860A1_VF\t\t0x011A\n+#define NGBE_DEV_ID_EM_WX1860A1L\t\t0x010B\n+#define NGBE_DEV_ID_EM_WX1860A1L_VF\t\t0x011B\n+#define   NGBE_SUB_DEV_ID_EM_ZTE5201_RJ45\t0x0100\n+#define   NGBE_SUB_DEV_ID_EM_SF100F_LP\t\t0x0103\n+#define   NGBE_SUB_DEV_ID_EM_M88E1512_RJ45\t0x0200\n+#define   NGBE_SUB_DEV_ID_EM_SF100HT\t\t0x0102\n+#define   NGBE_SUB_DEV_ID_EM_SF200T\t\t0x0201\n+#define   NGBE_SUB_DEV_ID_EM_SF200HT\t\t0x0202\n+#define   NGBE_SUB_DEV_ID_EM_SF200T_S\t\t0x0210\n+#define   NGBE_SUB_DEV_ID_EM_SF200HT_S\t\t0x0220\n+#define   NGBE_SUB_DEV_ID_EM_SF200HXT\t\t0x0230\n+#define   NGBE_SUB_DEV_ID_EM_SF400T\t\t0x0401\n+#define   NGBE_SUB_DEV_ID_EM_SF400HT\t\t0x0402\n+#define   NGBE_SUB_DEV_ID_EM_M88E1512_SFP\t0x0403\n+#define   NGBE_SUB_DEV_ID_EM_SF400T_S\t\t0x0410\n+#define   NGBE_SUB_DEV_ID_EM_SF400HT_S\t\t0x0420\n+#define   NGBE_SUB_DEV_ID_EM_SF400HXT\t\t0x0430\n+#define   NGBE_SUB_DEV_ID_EM_SF400_OCP\t\t0x0440\n+#define   NGBE_SUB_DEV_ID_EM_SF400_LY\t\t0x0450\n+#define   NGBE_SUB_DEV_ID_EM_SF400_LY_YT\t0x0470\n+\n+/* Assign excessive id with masks */\n+#define NGBE_INTERNAL_MASK\t\t\t0x000F\n+#define NGBE_OEM_MASK\t\t\t\t0x00F0\n+#define NGBE_WOL_SUP_MASK\t\t\t0x4000\n+#define NGBE_NCSI_SUP_MASK\t\t\t0x8000\n+\n+#define NGBE_INTERNAL_SFP\t\t\t0x0003\n+#define NGBE_OCP_CARD\t\t\t\t0x0040\n+#define NGBE_LY_M88E1512_SFP\t\t\t0x0050\n+#define NGBE_YT8521S_SFP\t\t\t0x0060\n+#define NGBE_LY_YT8521S_SFP\t\t\t0x0070\n+#define NGBE_WOL_SUP\t\t\t\t0x4000\n+#define NGBE_NCSI_SUP\t\t\t\t0x8000\n+\n+#endif /* _NGBE_DEVIDS_H_ */\ndiff --git a/drivers/net/ngbe/meson.build b/drivers/net/ngbe/meson.build\nindex de2d7be716..81173fa7f0 100644\n--- a/drivers/net/ngbe/meson.build\n+++ b/drivers/net/ngbe/meson.build\n@@ -7,6 +7,12 @@ if is_windows\n \tsubdir_done()\n endif\n \n+subdir('base')\n+objs = [base_objs]\n+\n sources = files(\n \t'ngbe_ethdev.c',\n )\n+\n+includes += include_directories('base')\n+\ndiff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c\nindex f8e19066de..d8df7ef896 100644\n--- a/drivers/net/ngbe/ngbe_ethdev.c\n+++ b/drivers/net/ngbe/ngbe_ethdev.c\n@@ -7,23 +7,81 @@\n #include <rte_common.h>\n #include <ethdev_pci.h>\n \n+#include <base/ngbe_devids.h>\n+#include \"ngbe_ethdev.h\"\n+\n+/*\n+ * The set of PCI devices this driver supports\n+ */\n+static const struct rte_pci_id pci_id_ngbe_map[] = {\n+\t{ RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860A2) },\n+\t{ RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860A2S) },\n+\t{ RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860A4) },\n+\t{ RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860A4S) },\n+\t{ RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860AL2) },\n+\t{ RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860AL2S) },\n+\t{ RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860AL4) },\n+\t{ RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860AL4S) },\n+\t{ RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860NCSI) },\n+\t{ RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860A1) },\n+\t{ RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860A1L) },\n+\t{ RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, NGBE_DEV_ID_EM_WX1860AL_W) },\n+\t{ .vendor_id = 0, /* sentinel */ },\n+};\n+\n+static int\n+eth_ngbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)\n+{\n+\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n+\n+\tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n+\t\treturn 0;\n+\n+\trte_eth_copy_pci_info(eth_dev, pci_dev);\n+\n+\treturn -EINVAL;\n+}\n+\n+static int\n+eth_ngbe_dev_uninit(struct rte_eth_dev *eth_dev)\n+{\n+\tif (rte_eal_process_type() != RTE_PROC_PRIMARY)\n+\t\treturn 0;\n+\n+\tRTE_SET_USED(eth_dev);\n+\n+\treturn -EINVAL;\n+}\n+\n static int\n eth_ngbe_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \t\tstruct rte_pci_device *pci_dev)\n {\n-\tRTE_SET_USED(pci_dev);\n-\treturn -EINVAL;\n+\treturn rte_eth_dev_create(&pci_dev->device, pci_dev->device.name,\n+\t\t\tsizeof(struct ngbe_adapter),\n+\t\t\teth_dev_pci_specific_init, pci_dev,\n+\t\t\teth_ngbe_dev_init, NULL);\n }\n \n static int eth_ngbe_pci_remove(struct rte_pci_device *pci_dev)\n {\n-\tRTE_SET_USED(pci_dev);\n-\treturn -EINVAL;\n+\tstruct rte_eth_dev *ethdev;\n+\n+\tethdev = rte_eth_dev_allocated(pci_dev->device.name);\n+\tif (ethdev == NULL)\n+\t\treturn 0;\n+\n+\treturn rte_eth_dev_destroy(ethdev, eth_ngbe_dev_uninit);\n }\n \n static struct rte_pci_driver rte_ngbe_pmd = {\n+\t.id_table = pci_id_ngbe_map,\n+\t.drv_flags = RTE_PCI_DRV_NEED_MAPPING,\n \t.probe = eth_ngbe_pci_probe,\n \t.remove = eth_ngbe_pci_remove,\n };\n \n RTE_PMD_REGISTER_PCI(net_ngbe, rte_ngbe_pmd);\n+RTE_PMD_REGISTER_PCI_TABLE(net_ngbe, pci_id_ngbe_map);\n+RTE_PMD_REGISTER_KMOD_DEP(net_ngbe, \"* igb_uio | uio_pci_generic | vfio-pci\");\n+\ndiff --git a/drivers/net/ngbe/ngbe_ethdev.h b/drivers/net/ngbe/ngbe_ethdev.h\nnew file mode 100644\nindex 0000000000..38f55f7fb1\n--- /dev/null\n+++ b/drivers/net/ngbe/ngbe_ethdev.h\n@@ -0,0 +1,16 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2018-2020 Beijing WangXun Technology Co., Ltd.\n+ * Copyright(c) 2010-2017 Intel Corporation\n+ */\n+\n+#ifndef _NGBE_ETHDEV_H_\n+#define _NGBE_ETHDEV_H_\n+\n+/*\n+ * Structure to store private data for each driver instance (for each port).\n+ */\n+struct ngbe_adapter {\n+\tvoid *back;\n+};\n+\n+#endif /* _NGBE_ETHDEV_H_ */\n",
    "prefixes": [
        "v6",
        "02/19"
    ]
}