Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/60313/?format=api
{ "id": 60313, "url": "http://patches.dpdk.org/api/patches/60313/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191001110209.6047-3-g.singh@nxp.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": "<20191001110209.6047-3-g.singh@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20191001110209.6047-3-g.singh@nxp.com", "date": "2019-10-01T11:01:57", "name": "[v3,02/14] net/ppfe: introduce ppfe net poll mode driver", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "d7fe72a1feb15a34770dcc712a54f0a5e9889a40", "submitter": { "id": 1068, "url": "http://patches.dpdk.org/api/people/1068/?format=api", "name": "Gagandeep Singh", "email": "g.singh@nxp.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/20191001110209.6047-3-g.singh@nxp.com/mbox/", "series": [ { "id": 6647, "url": "http://patches.dpdk.org/api/series/6647/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6647", "date": "2019-10-01T11:01:55", "name": "introduces ppfe network PMD", "version": 3, "mbox": "http://patches.dpdk.org/series/6647/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/60313/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/60313/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 1AA84CFA6;\n\tTue, 1 Oct 2019 13:17:31 +0200 (CEST)", "from inva021.nxp.com (inva021.nxp.com [92.121.34.21])\n\tby dpdk.org (Postfix) with ESMTP id CA0624C93\n\tfor <dev@dpdk.org>; Tue, 1 Oct 2019 13:17:27 +0200 (CEST)", "from inva021.nxp.com (localhost [127.0.0.1])\n\tby inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 640B9200554;\n\tTue, 1 Oct 2019 13:17:27 +0200 (CEST)", "from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com\n\t[165.114.16.14])\n\tby inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 99B952001C2;\n\tTue, 1 Oct 2019 13:17:24 +0200 (CEST)", "from GDB1.ap.freescale.net (GDB1.ap.freescale.net [10.232.132.179])\n\tby invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 891E44029A;\n\tTue, 1 Oct 2019 19:17:20 +0800 (SGT)" ], "From": "Gagandeep Singh <g.singh@nxp.com>", "To": "dev@dpdk.org,\n\tferruh.yigit@intel.com", "Cc": "thomas@monjalon.net, Gagandeep Singh <g.singh@nxp.com>,\n\tAkhil Goyal <akhil.goyal@nxp.com>", "Date": "Tue, 1 Oct 2019 16:31:57 +0530", "Message-Id": "<20191001110209.6047-3-g.singh@nxp.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20191001110209.6047-1-g.singh@nxp.com>", "References": "<20190826130246.30485-1-g.singh@nxp.com>\n\t<20191001110209.6047-1-g.singh@nxp.com>", "X-Virus-Scanned": "ClamAV using ClamSMTP", "Subject": "[dpdk-dev] [PATCH v3 02/14] net/ppfe: introduce ppfe net poll mode\n\tdriver", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "ppfe (programmable packet forwarding engine)\nis a network poll mode driver for NXP SoC\nls1012a.\n\nThis patch introduces the framework of ppfe\ndriver with basic functions of initialisation\nand teardown.\n\nSigned-off-by: Gagandeep Singh <g.singh@nxp.com>\nSigned-off-by: Akhil Goyal <akhil.goyal@nxp.com>\nAcked-by: Nipun Gupta <nipun.gupta@nxp.com>\n---\n MAINTAINERS | 6 +\n config/common_armv8a_linux | 5 +\n config/common_base | 5 +\n doc/guides/nics/features/ppfe.ini | 8 +\n drivers/net/Makefile | 1 +\n drivers/net/meson.build | 1 +\n drivers/net/ppfe/Makefile | 28 ++\n drivers/net/ppfe/meson.build | 11 +\n drivers/net/ppfe/pfe_eth.h | 73 +++++\n drivers/net/ppfe/pfe_mod.h | 56 ++++\n drivers/net/ppfe/ppfe_ethdev.c | 322 ++++++++++++++++++++++\n drivers/net/ppfe/rte_pmd_ppfe_version.map | 4 +\n mk/rte.app.mk | 1 +\n 13 files changed, 521 insertions(+)\n create mode 100644 doc/guides/nics/features/ppfe.ini\n create mode 100644 drivers/net/ppfe/Makefile\n create mode 100644 drivers/net/ppfe/meson.build\n create mode 100644 drivers/net/ppfe/pfe_eth.h\n create mode 100644 drivers/net/ppfe/pfe_mod.h\n create mode 100644 drivers/net/ppfe/ppfe_ethdev.c\n create mode 100644 drivers/net/ppfe/rte_pmd_ppfe_version.map", "diff": "diff --git a/MAINTAINERS b/MAINTAINERS\nindex 6adf20107..655ccae83 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -787,6 +787,12 @@ F: drivers/net/enetc/\n F: doc/guides/nics/enetc.rst\n F: doc/guides/nics/features/enetc.ini\n \n+NXP ppfe\n+M: Gagandeep Singh <g.singh@nxp.com>\n+M: Akhil Goyal <akhil.goyal@nxp.com>\n+F: drivers/net/ppfe/\n+F: doc/guides/nics/features/ppfe.ini\n+\n QLogic bnx2x\n M: Rasesh Mody <rmody@marvell.com>\n M: Shahed Shaikh <shshaikh@marvell.com>\ndiff --git a/config/common_armv8a_linux b/config/common_armv8a_linux\nindex 481712ebc..5b82405c5 100644\n--- a/config/common_armv8a_linux\n+++ b/config/common_armv8a_linux\n@@ -36,4 +36,9 @@ CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n\n CONFIG_RTE_LIBRTE_AVP_PMD=n\n CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV=n\n \n+#\n+# NXP PPFE PMD Driver\n+#\n+CONFIG_RTE_LIBRTE_PPFE_PMD=y\n+\n CONFIG_RTE_SCHED_VECTOR=n\ndiff --git a/config/common_base b/config/common_base\nindex 6a7e00d75..fc792f738 100644\n--- a/config/common_base\n+++ b/config/common_base\n@@ -218,6 +218,11 @@ CONFIG_RTE_LIBRTE_BNXT_PMD=y\n #\n CONFIG_RTE_LIBRTE_CXGBE_PMD=y\n \n+#\n+# Compile burst-oriented NXP PPFE PMD driver\n+#\n+CONFIG_RTE_LIBRTE_PPFE_PMD=n\n+\n # NXP DPAA Bus\n CONFIG_RTE_LIBRTE_DPAA_BUS=n\n CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=n\ndiff --git a/doc/guides/nics/features/ppfe.ini b/doc/guides/nics/features/ppfe.ini\nnew file mode 100644\nindex 000000000..4bcac779c\n--- /dev/null\n+++ b/doc/guides/nics/features/ppfe.ini\n@@ -0,0 +1,8 @@\n+;\n+; Supported features of the 'ppfe' network poll mode driver.\n+;\n+; Refer to default.ini for the full list of available PMD features.\n+;\n+[Features]\n+Linux VFIO = Y\n+ARMv8 = Y\ndiff --git a/drivers/net/Makefile b/drivers/net/Makefile\nindex 1770d8b23..d09d32177 100644\n--- a/drivers/net/Makefile\n+++ b/drivers/net/Makefile\n@@ -50,6 +50,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += null\n DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx\n DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += octeontx2\n DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += pcap\n+DIRS-$(CONFIG_RTE_LIBRTE_PPFE_PMD) += ppfe\n DIRS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede\n DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += ring\n DIRS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc\ndiff --git a/drivers/net/meson.build b/drivers/net/meson.build\nindex eb1c6b638..e17b5ef1b 100644\n--- a/drivers/net/meson.build\n+++ b/drivers/net/meson.build\n@@ -38,6 +38,7 @@ drivers = ['af_packet',\n \t'octeontx',\n \t'octeontx2',\n \t'pcap',\n+\t'ppfe',\n \t'ring',\n \t'sfc',\n \t'softnic',\ndiff --git a/drivers/net/ppfe/Makefile b/drivers/net/ppfe/Makefile\nnew file mode 100644\nindex 000000000..b9e894ffd\n--- /dev/null\n+++ b/drivers/net/ppfe/Makefile\n@@ -0,0 +1,28 @@\n+# SPDX-License-Identifier: BSD-3-Clause\n+# Copyright 2019 NXP\n+#\n+\n+include $(RTE_SDK)/mk/rte.vars.mk\n+\n+#\n+# library name\n+#\n+LIB = librte_pmd_ppfe.a\n+\n+CFLAGS += -O3 $(WERROR_FLAGS)\n+CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/\n+CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax\n+\n+EXPORT_MAP := rte_pmd_ppfe_version.map\n+LIBABIVER := 1\n+\n+# Interfaces with DPDK\n+SRCS-$(CONFIG_RTE_LIBRTE_PPFE_PMD) += ppfe_ethdev.c\n+\n+LDLIBS += -lrte_bus_vdev\n+LDLIBS += -lrte_bus_dpaa\n+LDLIBS += -lrte_common_dpaax\n+LDLIBS += -lrte_eal\n+LDLIBS += -lrte_ethdev -lrte_kvargs\n+\n+include $(RTE_SDK)/mk/rte.lib.mk\ndiff --git a/drivers/net/ppfe/meson.build b/drivers/net/ppfe/meson.build\nnew file mode 100644\nindex 000000000..8ca2cb87d\n--- /dev/null\n+++ b/drivers/net/ppfe/meson.build\n@@ -0,0 +1,11 @@\n+# SPDX-License-Identifier: BSD-3-Clause\n+# Copyright 2019 NXP\n+\n+if host_machine.system() != 'linux'\n+\tbuild = false\n+endif\n+deps += ['bus_dpaa']\n+\n+sources = files('ppfe_ethdev.c')\n+\n+includes += include_directories('../../bus/dpaa/include/')\ndiff --git a/drivers/net/ppfe/pfe_eth.h b/drivers/net/ppfe/pfe_eth.h\nnew file mode 100644\nindex 000000000..5811b54eb\n--- /dev/null\n+++ b/drivers/net/ppfe/pfe_eth.h\n@@ -0,0 +1,73 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright 2019 NXP\n+ */\n+\n+#ifndef _PFE_ETH_H_\n+#define _PFE_ETH_H_\n+\n+#include <compat.h>\n+#include <rte_ethdev.h>\n+#include <rte_ethdev_vdev.h>\n+\n+#define ETH_ALEN 6\n+#define GEMAC_NO_PHY BIT(0)\n+\n+#define PFE_SOC_ID_FILE\t\"/sys/devices/soc0/soc_id\"\n+extern unsigned int pfe_svr;\n+#define SVR_LS1012A_REV2\t0x87040020\n+#define SVR_LS1012A_REV1\t0x87040010\n+\n+struct ls1012a_eth_platform_data {\n+\t/* device specific information */\n+\tu32 device_flags;\n+\tchar name[16];\n+\n+\t/* board specific information */\n+\tu32 mii_config;\n+\tu32 phy_flags;\n+\tu32 gem_id;\n+\tu32 bus_id;\n+\tu32 phy_id;\n+\tu32 mdio_muxval;\n+\tu8 mac_addr[ETH_ALEN];\n+};\n+\n+struct ls1012a_mdio_platform_data {\n+\tint enabled;\n+\tint irq[32];\n+\tu32 phy_mask;\n+\tint mdc_div;\n+};\n+\n+struct ls1012a_pfe_platform_data {\n+\tstruct ls1012a_eth_platform_data ls1012a_eth_pdata[3];\n+\tstruct ls1012a_mdio_platform_data ls1012a_mdio_pdata[3];\n+};\n+\n+#define EMAC_TXQ_CNT\t16\n+#define EMAC_TXQ_DEPTH\t(HIF_TX_DESC_NT)\n+\n+#define JUMBO_FRAME_SIZE\t10258\n+#define EMAC_RXQ_CNT\t1\n+#define EMAC_RXQ_DEPTH\tHIF_RX_DESC_NT\n+\n+struct pfe_eth_priv_s {\n+\tstruct pfe\t\t*pfe;\n+\tint\t\t\tlow_tmu_q;\n+\tint\t\t\thigh_tmu_q;\n+\tstruct rte_eth_dev\t*ndev;\n+\tstruct rte_eth_stats\tstats;\n+\tint\t\t\tid;\n+\tint\t\t\tpromisc;\n+\tint\t\t\tlink_fd;\n+\n+\tspinlock_t\t\tlock; /* protect member variables */\n+\tvoid\t\t\t*EMAC_baseaddr;\n+\t/* This points to the EMAC base from where we access PHY */\n+\tvoid\t\t\t*PHY_baseaddr;\n+\tvoid\t\t\t*GPI_baseaddr;\n+\n+\tstruct ls1012a_eth_platform_data *einfo;\n+};\n+\n+#endif /* _PFE_ETH_H_ */\ndiff --git a/drivers/net/ppfe/pfe_mod.h b/drivers/net/ppfe/pfe_mod.h\nnew file mode 100644\nindex 000000000..e971547a9\n--- /dev/null\n+++ b/drivers/net/ppfe/pfe_mod.h\n@@ -0,0 +1,56 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright 2019 NXP\n+ */\n+\n+#ifndef _PFE_MOD_H_\n+#define _PFE_MOD_H_\n+\n+struct pfe;\n+\n+#include \"pfe_eth.h\"\n+\n+#define PHYID_MAX_VAL 32\n+\n+/* PPFE DPDK driver supports two interfaces.\n+ */\n+#define PFE_CDEV_ETH_COUNT 2\n+\n+/* PPFE DPDK driver needs a kernel module named \"pfe.ko\", This module\n+ * is required for PHY initialisation and creates a character device\n+ * \"pfe_us_cdev\" for IOCTL support. PPFE DPDK driver uses this character\n+ * device for link status.\n+ */\n+#define PFE_CDEV_PATH\t\t\"/dev/pfe_us_cdev\"\n+#define PFE_CDEV_INVALID_FD\t-1\n+#define PFE_NAME_PMD\t\teth_pfe\n+\n+/* used when 'read' call is issued, returning PFE_CDEV_ETH_COUNT number of\n+ * pfe_shared_info as array.\n+ */\n+struct pfe_shared_info {\n+\tuint32_t phy_id; /* Link phy ID */\n+\tuint8_t state; /* Has either 0 or 1 */\n+};\n+\n+struct pfe_eth {\n+\tstruct pfe_eth_priv_s *eth_priv[PFE_CDEV_ETH_COUNT];\n+};\n+\n+struct pfe {\n+\tuint64_t ddr_phys_baseaddr;\n+\tvoid *ddr_baseaddr;\n+\tuint64_t ddr_size;\n+\tvoid *cbus_baseaddr;\n+\tuint64_t cbus_size;\n+\tstruct pfe_eth eth;\n+\tint mdio_muxval[PHYID_MAX_VAL];\n+\tuint8_t nb_devs;\n+\tuint8_t max_intf;\n+\tint cdev_fd;\n+};\n+\n+/* IOCTL Commands */\n+#define PFE_CDEV_ETH0_STATE_GET\t\t_IOR('R', 0, int)\n+#define PFE_CDEV_ETH1_STATE_GET\t\t_IOR('R', 1, int)\n+#define PFE_CDEV_HIF_INTR_EN\t\t_IOWR('R', 2, int)\n+#endif /* _PFE_MOD_H */\ndiff --git a/drivers/net/ppfe/ppfe_ethdev.c b/drivers/net/ppfe/ppfe_ethdev.c\nnew file mode 100644\nindex 000000000..1b409a134\n--- /dev/null\n+++ b/drivers/net/ppfe/ppfe_ethdev.c\n@@ -0,0 +1,322 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright 2019 NXP\n+ */\n+\n+#include <rte_kvargs.h>\n+#include <rte_ethdev_vdev.h>\n+#include <rte_bus_vdev.h>\n+#include <dpaa_of.h>\n+\n+#include \"pfe_mod.h\"\n+\n+#define PPFE_MAX_MACS 1 /*we can support upto 4 MACs per IF*/\n+#define PPFE_VDEV_GEM_ID_ARG\t\"intf\"\n+\n+struct pfe_vdev_init_params {\n+\tint8_t\tgem_id;\n+};\n+static struct pfe *g_pfe;\n+\n+/* TODO: make pfe_svr a runtime option.\n+ * Driver should be able to get the SVR\n+ * information from HW.\n+ */\n+unsigned int pfe_svr = SVR_LS1012A_REV1;\n+\n+static void\n+pfe_soc_version_get(void)\n+{\n+\tFILE *svr_file = NULL;\n+\tunsigned int svr_ver = 0;\n+\n+\tsvr_file = fopen(PFE_SOC_ID_FILE, \"r\");\n+\tif (!svr_file)\n+\t\treturn; /* Not supported on this infra */\n+\n+\tif (fscanf(svr_file, \"svr:%x\", &svr_ver) > 0)\n+\t\tpfe_svr = svr_ver;\n+\telse\n+\t\tprintf(\"Unable to read SoC device\");\n+\n+\tfclose(svr_file);\n+}\n+\n+static int\n+pfe_eth_open_cdev(struct pfe_eth_priv_s *priv)\n+{\n+\tint pfe_cdev_fd;\n+\n+\tif (priv == NULL)\n+\t\treturn -1;\n+\n+\tpfe_cdev_fd = open(PFE_CDEV_PATH, O_RDONLY);\n+\tif (pfe_cdev_fd < 0) {\n+\t\tpriv->link_fd = PFE_CDEV_INVALID_FD;\n+\t\treturn -1;\n+\t}\n+\n+\tpriv->link_fd = pfe_cdev_fd;\n+\n+\treturn 0;\n+}\n+\n+static void\n+pfe_eth_close_cdev(struct pfe_eth_priv_s *priv)\n+{\n+\tif (priv == NULL)\n+\t\treturn;\n+\n+\tif (priv->link_fd != PFE_CDEV_INVALID_FD) {\n+\t\tclose(priv->link_fd);\n+\t\tpriv->link_fd = PFE_CDEV_INVALID_FD;\n+\t}\n+}\n+\n+static void\n+pfe_eth_exit(struct rte_eth_dev *dev, struct pfe *pfe)\n+{\n+\t/* Close the device file for link status */\n+\tpfe_eth_close_cdev(dev->data->dev_private);\n+\n+\trte_free(dev->data->mac_addrs);\n+\trte_eth_dev_release_port(dev);\n+\tpfe->nb_devs--;\n+}\n+\n+static int\n+pfe_eth_init(struct rte_vdev_device *vdev, struct pfe *pfe, int id)\n+{\n+\tstruct rte_eth_dev *eth_dev = NULL;\n+\tstruct pfe_eth_priv_s *priv = NULL;\n+\tint err;\n+\n+\teth_dev = rte_eth_vdev_allocate(vdev, sizeof(*priv));\n+\tif (eth_dev == NULL)\n+\t\treturn -ENOMEM;\n+\n+\tpriv = eth_dev->data->dev_private;\n+\tpriv->ndev = eth_dev;\n+\tpriv->pfe = pfe;\n+\n+\tpfe->eth.eth_priv[id] = priv;\n+\n+#define HIF_GEMAC_TMUQ_BASE\t6\n+\tpriv->low_tmu_q = HIF_GEMAC_TMUQ_BASE + (id * 2);\n+\tpriv->high_tmu_q = priv->low_tmu_q + 1;\n+\n+\trte_spinlock_init(&priv->lock);\n+\n+\t/* Copy the station address into the dev structure, */\n+\teth_dev->data->mac_addrs = rte_zmalloc(\"mac_addr\",\n+\t\t\tETHER_ADDR_LEN * PPFE_MAX_MACS, 0);\n+\tif (eth_dev->data->mac_addrs == NULL) {\n+\t\terr = -ENOMEM;\n+\t\tgoto err0;\n+\t}\n+\n+\teth_dev->data->mtu = 1500;\n+\n+\teth_dev->data->nb_rx_queues = 1;\n+\teth_dev->data->nb_tx_queues = 1;\n+\n+\t/* For link status, open the PFE CDEV; Error from this function\n+\t * is silently ignored; In case of error, the link status will not\n+\t * be available.\n+\t */\n+\tpfe_eth_open_cdev(priv);\n+\trte_eth_dev_probing_finish(eth_dev);\n+\n+\treturn 0;\n+err0:\n+\trte_eth_dev_release_port(eth_dev);\n+\treturn err;\n+}\n+\n+/* Parse integer from integer argument */\n+static int\n+parse_integer_arg(const char *key __rte_unused,\n+\t\tconst char *value, void *extra_args)\n+{\n+\tint i;\n+\tchar *end;\n+\terrno = 0;\n+\n+\ti = strtol(value, &end, 10);\n+\tif (*end != 0 || errno != 0 || i < 0 || i > 1)\n+\t\treturn -EINVAL;\n+\n+\t*((uint32_t *)extra_args) = i;\n+\n+\treturn 0;\n+}\n+\n+static int\n+pfe_parse_vdev_init_params(struct pfe_vdev_init_params *params,\n+\t\t\t struct rte_vdev_device *dev)\n+{\n+\tstruct rte_kvargs *kvlist = NULL;\n+\tint ret = 0;\n+\n+\tstatic const char * const pfe_vdev_valid_params[] = {\n+\t\tPPFE_VDEV_GEM_ID_ARG,\n+\t\tNULL\n+\t};\n+\n+\tconst char *input_args = rte_vdev_device_args(dev);\n+\n+\tif (!input_args)\n+\t\treturn -1;\n+\n+\tkvlist = rte_kvargs_parse(input_args, pfe_vdev_valid_params);\n+\tif (kvlist == NULL)\n+\t\treturn -1;\n+\n+\tret = rte_kvargs_process(kvlist,\n+\t\t\t\tPPFE_VDEV_GEM_ID_ARG,\n+\t\t\t\t&parse_integer_arg,\n+\t\t\t\t¶ms->gem_id);\n+\trte_kvargs_free(kvlist);\n+\treturn ret;\n+}\n+\n+static int\n+pmd_pfe_probe(struct rte_vdev_device *vdev)\n+{\n+\tconst u32 *prop;\n+\tconst struct device_node *np;\n+\tconst char *name;\n+\tconst uint32_t *addr;\n+\tuint64_t cbus_addr, ddr_size, cbus_size;\n+\tint rc = -1, fd = -1, gem_id;\n+\tunsigned int interface_count = 0;\n+\tsize_t size = 0;\n+\tstruct pfe_vdev_init_params init_params = {\n+\t\t.gem_id = -1\n+\t};\n+\n+\tname = rte_vdev_device_name(vdev);\n+\trc = pfe_parse_vdev_init_params(&init_params, vdev);\n+\tif (rc < 0)\n+\t\treturn -EINVAL;\n+\n+\tif (g_pfe) {\n+\t\tif (g_pfe->nb_devs >= g_pfe->max_intf)\n+\t\t\treturn -EINVAL;\n+\n+\t\tgoto eth_init;\n+\t}\n+\n+\tg_pfe = rte_zmalloc(NULL, sizeof(*g_pfe), RTE_CACHE_LINE_SIZE);\n+\tif (g_pfe == NULL)\n+\t\treturn -EINVAL;\n+\n+\t/* Load the device-tree driver */\n+\trc = of_init();\n+\tif (rc)\n+\t\tgoto err;\n+\n+\tnp = of_find_compatible_node(NULL, NULL, \"fsl,pfe\");\n+\tif (!np) {\n+\t\trc = -EINVAL;\n+\t\tgoto err;\n+\t}\n+\n+\taddr = of_get_address(np, 0, &cbus_size, NULL);\n+\tif (!addr)\n+\t\tgoto err;\n+\n+\tcbus_addr = of_translate_address(np, addr);\n+\tif (!cbus_addr)\n+\t\tgoto err;\n+\n+\n+\taddr = of_get_address(np, 1, &ddr_size, NULL);\n+\tif (!addr)\n+\t\tgoto err;\n+\n+\tg_pfe->ddr_phys_baseaddr = of_translate_address(np, addr);\n+\tif (!g_pfe->ddr_phys_baseaddr)\n+\t\tgoto err;\n+\n+\tg_pfe->ddr_size = ddr_size;\n+\tg_pfe->cbus_size = cbus_size;\n+\n+\tfd = open(\"/dev/mem\", O_RDWR);\n+\tg_pfe->cbus_baseaddr = mmap(NULL, cbus_size, PROT_READ | PROT_WRITE,\n+\t\t\t\t\tMAP_SHARED, fd, cbus_addr);\n+\tclose(fd);\n+\tif (g_pfe->cbus_baseaddr == MAP_FAILED) {\n+\t\trc = -EINVAL;\n+\t\tgoto err;\n+\t}\n+\n+\t/* Read interface count */\n+\tprop = of_get_property(np, \"fsl,pfe-num-interfaces\", &size);\n+\tif (!prop) {\n+\t\trc = -ENXIO;\n+\t\tgoto err_prop;\n+\t}\n+\n+\tinterface_count = rte_be_to_cpu_32((unsigned int)*prop);\n+\tif (interface_count <= 0) {\n+\t\trc = -ENXIO;\n+\t\tgoto err_prop;\n+\t}\n+\tg_pfe->max_intf = interface_count;\n+\tpfe_soc_version_get();\n+eth_init:\n+\tif (init_params.gem_id < 0)\n+\t\tgem_id = g_pfe->nb_devs;\n+\telse\n+\t\tgem_id = init_params.gem_id;\n+\n+\tRTE_LOG(INFO, PMD, \"Init pmd_pfe for %s gem-id %d(given =%d)\\n\",\n+\t\tname, gem_id, init_params.gem_id);\n+\n+\trc = pfe_eth_init(vdev, g_pfe, gem_id);\n+\tif (rc < 0)\n+\t\tgoto err_eth;\n+\telse\n+\t\tg_pfe->nb_devs++;\n+\n+\treturn 0;\n+\n+err_eth:\n+err_prop:\n+\tmunmap(g_pfe->cbus_baseaddr, cbus_size);\n+err:\n+\trte_free(g_pfe);\n+\treturn rc;\n+}\n+\n+static int\n+pmd_pfe_remove(struct rte_vdev_device *vdev)\n+{\n+\tconst char *name;\n+\tstruct rte_eth_dev *eth_dev = NULL;\n+\n+\tname = rte_vdev_device_name(vdev);\n+\tif (name == NULL)\n+\t\treturn -EINVAL;\n+\n+\tif (!g_pfe)\n+\t\treturn 0;\n+\n+\teth_dev = rte_eth_dev_allocated(name);\n+\tif (eth_dev == NULL)\n+\t\treturn -ENODEV;\n+\n+\tpfe_eth_exit(eth_dev, g_pfe);\n+\tmunmap(g_pfe->cbus_baseaddr, g_pfe->cbus_size);\n+\n+\treturn 0;\n+}\n+\n+static\n+struct rte_vdev_driver pmd_pfe_drv = {\n+\t.probe = pmd_pfe_probe,\n+\t.remove = pmd_pfe_remove,\n+};\n+\n+RTE_PMD_REGISTER_VDEV(PFE_NAME_PMD, pmd_pfe_drv);\n+RTE_PMD_REGISTER_PARAM_STRING(PFE_NAME_PMD, PPFE_VDEV_GEM_ID_ARG \"=<int> \");\ndiff --git a/drivers/net/ppfe/rte_pmd_ppfe_version.map b/drivers/net/ppfe/rte_pmd_ppfe_version.map\nnew file mode 100644\nindex 000000000..b7b7c9168\n--- /dev/null\n+++ b/drivers/net/ppfe/rte_pmd_ppfe_version.map\n@@ -0,0 +1,4 @@\n+DPDK_19.11 {\n+\n+\tlocal: *;\n+};\ndiff --git a/mk/rte.app.mk b/mk/rte.app.mk\nindex 17b991604..5e559cc7d 100644\n--- a/mk/rte.app.mk\n+++ b/mk/rte.app.mk\n@@ -161,6 +161,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += -lrte_pmd_bond\n _LDLIBS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += -lrte_pmd_cxgbe\n ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y)\n _LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += -lrte_pmd_dpaa\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_PPFE_PMD) += -lrte_pmd_ppfe\n endif\n ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)\n _LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += -lrte_pmd_dpaa2\n", "prefixes": [ "v3", "02/14" ] }