Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/58022/?format=api
{ "id": 58022, "url": "http://patches.dpdk.org/api/patches/58022/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190827070730.11206-25-sachin.saxena@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": "<20190827070730.11206-25-sachin.saxena@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190827070730.11206-25-sachin.saxena@nxp.com", "date": "2019-08-27T07:07:24", "name": "[v1,24/30] net/dpaa2: add ptp driver", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "118ff53ef2785b385ac6e523044c9ee17274bf1e", "submitter": { "id": 1054, "url": "http://patches.dpdk.org/api/people/1054/?format=api", "name": "Sachin Saxena", "email": "sachin.saxena@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/20190827070730.11206-25-sachin.saxena@nxp.com/mbox/", "series": [ { "id": 6130, "url": "http://patches.dpdk.org/api/series/6130/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6130", "date": "2019-08-27T07:07:00", "name": "Enhancements and fixes in NXP dpaax drivers and fsl-mc bus", "version": 1, "mbox": "http://patches.dpdk.org/series/6130/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/58022/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/58022/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 451911C1B2;\n\tTue, 27 Aug 2019 09:10:26 +0200 (CEST)", "from inva021.nxp.com (inva021.nxp.com [92.121.34.21])\n\tby dpdk.org (Postfix) with ESMTP id 1D2A71C032\n\tfor <dev@dpdk.org>; Tue, 27 Aug 2019 09:09:32 +0200 (CEST)", "from inva021.nxp.com (localhost [127.0.0.1])\n\tby inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id EF4EF200059;\n\tTue, 27 Aug 2019 09:09:31 +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 763B3200131;\n\tTue, 27 Aug 2019 09:09:29 +0200 (CEST)", "from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net\n\t[10.232.133.63])\n\tby invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 637294031D;\n\tTue, 27 Aug 2019 15:09:26 +0800 (SGT)" ], "From": "Sachin Saxena <sachin.saxena@nxp.com>", "To": "dev@dpdk.org", "Cc": "thomas@monjalon.net,\n\tPriyanka Jain <priyanka.jain@nxp.com>", "Date": "Tue, 27 Aug 2019 12:37:24 +0530", "Message-Id": "<20190827070730.11206-25-sachin.saxena@nxp.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20190827070730.11206-1-sachin.saxena@nxp.com>", "References": "<20190827070730.11206-1-sachin.saxena@nxp.com>", "X-Virus-Scanned": "ClamAV using ClamSMTP", "Subject": "[dpdk-dev] [PATCH v1 24/30] net/dpaa2: add ptp driver", "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": "From: Priyanka Jain <priyanka.jain@nxp.com>\n\nThis patch adds the support for PTP driver for\nDPAA2 devices.\n\nTo enable set\nCONFIG_RTE_LIBRTE_IEEE1588=y in\nconfig/defconfig_arm64-dpaa2-linuxapp-gc\n\nSigned-off-by: Priyanka Jain <priyanka.jain@nxp.com>\n---\n config/defconfig_arm64-dpaa2-linuxapp-gcc | 2 +-\n drivers/bus/fslmc/fslmc_bus.c | 2 +\n drivers/bus/fslmc/fslmc_vfio.c | 2 +\n drivers/bus/fslmc/rte_fslmc.h | 1 +\n drivers/net/dpaa2/Makefile | 1 +\n drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h | 2 +-\n drivers/net/dpaa2/dpaa2_ethdev.c | 9 +\n drivers/net/dpaa2/dpaa2_ethdev.h | 27 ++-\n drivers/net/dpaa2/dpaa2_ptp.c | 181 +++++++++++++++++++\n drivers/net/dpaa2/meson.build | 1 +\n 10 files changed, 225 insertions(+), 3 deletions(-)\n create mode 100644 drivers/net/dpaa2/dpaa2_ptp.c", "diff": "diff --git a/config/defconfig_arm64-dpaa2-linuxapp-gcc b/config/defconfig_arm64-dpaa2-linuxapp-gcc\nindex b2543266a..5c7eddd5e 100644\n--- a/config/defconfig_arm64-dpaa2-linuxapp-gcc\n+++ b/config/defconfig_arm64-dpaa2-linuxapp-gcc\n@@ -16,7 +16,7 @@ CONFIG_RTE_CACHE_LINE_SIZE=64\n CONFIG_RTE_PKTMBUF_HEADROOM=128\n \n # Enable IEEE1588, Keep it disable by default\n-CONFIG_RTE_LIBRTE_IEEE1588=n\n+CONFIG_RTE_LIBRTE_IEEE1588=y\n \n # Doesn't support NUMA\n CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=n\ndiff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c\nindex a2f482516..9b2dd51c4 100644\n--- a/drivers/bus/fslmc/fslmc_bus.c\n+++ b/drivers/bus/fslmc/fslmc_bus.c\n@@ -191,6 +191,8 @@ scan_one_fslmc_device(char *dev_name)\n \t\tdev->dev_type = DPAA2_QDMA;\n \telse if (!strncmp(\"dpdmux\", t_ptr, 6))\n \t\tdev->dev_type = DPAA2_MUX;\n+\telse if (!strncmp(\"dprtc\", t_ptr, 5))\n+\t\tdev->dev_type = DPAA2_DPRTC;\n \telse\n \t\tdev->dev_type = DPAA2_UNKNOWN;\n \ndiff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c\nindex 9658fd84d..60c51d80e 100644\n--- a/drivers/bus/fslmc/fslmc_vfio.c\n+++ b/drivers/bus/fslmc/fslmc_vfio.c\n@@ -612,6 +612,7 @@ fslmc_process_iodevices(struct rte_dpaa2_device *dev)\n \tcase DPAA2_IO:\n \tcase DPAA2_CI:\n \tcase DPAA2_BPOOL:\n+\tcase DPAA2_DPRTC:\n \tcase DPAA2_MUX:\n \t\tTAILQ_FOREACH(object, &dpaa2_obj_list, next) {\n \t\t\tif (dev->dev_type == object->dev_type)\n@@ -768,6 +769,7 @@ fslmc_vfio_process_group(void)\n \t\tcase DPAA2_CON:\n \t\tcase DPAA2_CI:\n \t\tcase DPAA2_BPOOL:\n+\t\tcase DPAA2_DPRTC:\n \t\tcase DPAA2_MUX:\n \t\t\t/* IN case of secondary processes, all control objects\n \t\t\t * like dpbp, dpcon, dpci are not initialized/required\ndiff --git a/drivers/bus/fslmc/rte_fslmc.h b/drivers/bus/fslmc/rte_fslmc.h\nindex 5cfb24505..31dfd1377 100644\n--- a/drivers/bus/fslmc/rte_fslmc.h\n+++ b/drivers/bus/fslmc/rte_fslmc.h\n@@ -67,6 +67,7 @@ enum rte_dpaa2_dev_type {\n \tDPAA2_MPORTAL, /**< DPMCP type device */\n \tDPAA2_QDMA, /**< DPDMAI type device */\n \tDPAA2_MUX,\t/**< DPDMUX type device */\n+\tDPAA2_DPRTC,\t/**< DPRTC type device */\n \t/* Unknown device placeholder */\n \tDPAA2_UNKNOWN,\n \tDPAA2_DEVTYPE_MAX,\ndiff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile\nindex 9b52fa1e5..0cc539dc5 100644\n--- a/drivers/net/dpaa2/Makefile\n+++ b/drivers/net/dpaa2/Makefile\n@@ -38,6 +38,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpni.c\n SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpkg.c\n SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpdmux.c\n SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += mc/dprtc.c\n+SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += dpaa2_ptp.c\n \n LDLIBS += -lrte_bus_fslmc\n LDLIBS += -lrte_mempool_dpaa2\ndiff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h b/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h\nindex 0d6324183..699e4c089 100644\n--- a/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h\n+++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h\n@@ -279,7 +279,7 @@ struct dpaa2_faead {\n #define DPAA2_ETH_FAS_DISC\t 0x80000000\n /* MACSEC frame */\n #define DPAA2_ETH_FAS_MS\t\t0x40000000\n-#define DPAA2_ETH_FAS_PTP\t 0x08000000\n+#define DPAA2_ETH_FAS_PTP\t BIT_POS(59)\n /* Ethernet multicast frame */\n #define DPAA2_ETH_FAS_MC\t\t0x04000000\n /* Ethernet broadcast frame */\ndiff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c\nindex afad96b15..3381b1894 100644\n--- a/drivers/net/dpaa2/dpaa2_ethdev.c\n+++ b/drivers/net/dpaa2/dpaa2_ethdev.c\n@@ -2177,6 +2177,15 @@ static struct eth_dev_ops dpaa2_ethdev_ops = {\n \t.rss_hash_update = dpaa2_dev_rss_hash_update,\n \t.rss_hash_conf_get = dpaa2_dev_rss_hash_conf_get,\n \t.filter_ctrl = dpaa2_dev_flow_ctrl,\n+#if defined(RTE_LIBRTE_IEEE1588)\n+\t.timesync_enable = dpaa2_timesync_enable,\n+\t.timesync_disable = dpaa2_timesync_disable,\n+\t.timesync_read_time = dpaa2_timesync_read_time,\n+\t.timesync_write_time = dpaa2_timesync_write_time,\n+\t.timesync_adjust_time = dpaa2_timesync_adjust_time,\n+\t.timesync_read_rx_timestamp = dpaa2_timesync_read_rx_timestamp,\n+\t.timesync_read_tx_timestamp = dpaa2_timesync_read_tx_timestamp,\n+#endif\n };\n \n /* Populate the mac address from physically available (u-boot/firmware) and/or\ndiff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h\nindex 04a8ef8da..b51c35f89 100644\n--- a/drivers/net/dpaa2/dpaa2_ethdev.h\n+++ b/drivers/net/dpaa2/dpaa2_ethdev.h\n@@ -1,7 +1,7 @@\n /* SPDX-License-Identifier: BSD-3-Clause\n *\n * Copyright (c) 2015-2016 Freescale Semiconductor, Inc. All rights reserved.\n- * Copyright 2016 NXP\n+ * Copyright 2016-2019 NXP\n *\n */\n \n@@ -130,6 +130,17 @@ struct dpaa2_dev_priv {\n \t\tuint64_t qos_extract_param;\n \t\tuint64_t fs_extract_param[MAX_TCS];\n \t} extract;\n+\n+#if defined(RTE_LIBRTE_IEEE1588)\n+\t/*stores timestamp of last received packet on dev*/\n+\tuint64_t rx_timestamp;\n+\t/*stores timestamp of last received tx confirmation packet on dev*/\n+\tuint64_t tx_timestamp;\n+\t/* stores pointer to next tx_conf queue that should be processed,\n+\t * it corresponds to last packet transmitted\n+\t */\n+\tstruct dpaa2_queue *next_tx_conf_queue;\n+#endif\n \tLIST_HEAD(, rte_flow) flows; /**< Configured flow rule handles. */\n };\n \n@@ -182,4 +193,18 @@ void dpaa2_dev_free_eqresp_buf(uint16_t eqresp_ci);\n void dpaa2_flow_clean(struct rte_eth_dev *dev);\n uint16_t dpaa2_dev_tx_conf(void *queue) __attribute__((unused));\n \n+#if defined(RTE_LIBRTE_IEEE1588)\n+int dpaa2_timesync_enable(struct rte_eth_dev *dev);\n+int dpaa2_timesync_disable(struct rte_eth_dev *dev);\n+int dpaa2_timesync_read_time(struct rte_eth_dev *dev,\n+\t\t\t\t\tstruct timespec *timestamp);\n+int dpaa2_timesync_write_time(struct rte_eth_dev *dev,\n+\t\t\t\t\tconst struct timespec *timestamp);\n+int dpaa2_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta);\n+int dpaa2_timesync_read_rx_timestamp(struct rte_eth_dev *dev,\n+\t\t\t\t\t\tstruct timespec *timestamp,\n+\t\t\t\t\t\tuint32_t flags __rte_unused);\n+int dpaa2_timesync_read_tx_timestamp(struct rte_eth_dev *dev,\n+\t\t\t\t\t struct timespec *timestamp);\n+#endif\n #endif /* _DPAA2_ETHDEV_H */\ndiff --git a/drivers/net/dpaa2/dpaa2_ptp.c b/drivers/net/dpaa2/dpaa2_ptp.c\nnew file mode 100644\nindex 000000000..316912fe3\n--- /dev/null\n+++ b/drivers/net/dpaa2/dpaa2_ptp.c\n@@ -0,0 +1,181 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright 2019 NXP\n+ */\n+\n+#include <sys/queue.h>\n+#include <stdio.h>\n+#include <errno.h>\n+#include <stdint.h>\n+#include <string.h>\n+#include <unistd.h>\n+#include <stdarg.h>\n+\n+#include <rte_ethdev.h>\n+#include <rte_log.h>\n+#include <rte_eth_ctrl.h>\n+#include <rte_malloc.h>\n+#include <rte_time.h>\n+\n+#include <rte_fslmc.h>\n+#include <fsl_dprtc.h>\n+#include <fsl_dpkg.h>\n+\n+#include <dpaa2_ethdev.h>\n+#include <dpaa2_pmd_logs.h>\n+\n+struct dpaa2_dprtc_dev {\n+\tstruct fsl_mc_io dprtc; /** handle to DPRTC portal object */\n+\tuint16_t token;\n+\tuint32_t dprtc_id; /*HW ID for DPRTC object */\n+};\n+static struct dpaa2_dprtc_dev *dprtc_dev;\n+\n+int dpaa2_timesync_enable(struct rte_eth_dev *dev __rte_unused)\n+{\n+\treturn 0;\n+}\n+\n+int dpaa2_timesync_disable(struct rte_eth_dev *dev __rte_unused)\n+{\n+\treturn 0;\n+}\n+\n+int dpaa2_timesync_read_time(struct rte_eth_dev *dev,\n+\t\t\t\t\tstruct timespec *timestamp)\n+{\n+\tuint64_t ns;\n+\tint ret = 0;\n+\n+\tRTE_SET_USED(dev);\n+\n+\tret = dprtc_get_time(&dprtc_dev->dprtc, CMD_PRI_LOW,\n+\t\t\t dprtc_dev->token, &ns);\n+\tif (ret) {\n+\t\tDPAA2_PMD_ERR(\"dprtc_get_time failed ret: %d\", ret);\n+\t\treturn ret;\n+\t}\n+\n+\t*timestamp = rte_ns_to_timespec(ns);\n+\n+\treturn 0;\n+}\n+\n+int dpaa2_timesync_write_time(struct rte_eth_dev *dev,\n+\t\t\t\t\tconst struct timespec *ts)\n+{\n+\tuint64_t ns;\n+\tint ret = 0;\n+\n+\tRTE_SET_USED(dev);\n+\n+\tns = rte_timespec_to_ns(ts);\n+\n+\tret = dprtc_set_time(&dprtc_dev->dprtc, CMD_PRI_LOW,\n+\t\t\t dprtc_dev->token, ns);\n+\tif (ret) {\n+\t\tDPAA2_PMD_ERR(\"dprtc_set_time failed ret: %d\", ret);\n+\t\treturn ret;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+int dpaa2_timesync_adjust_time(struct rte_eth_dev *dev, int64_t delta)\n+{\n+\tuint64_t ns;\n+\tint ret = 0;\n+\n+\tRTE_SET_USED(dev);\n+\n+\tret = dprtc_get_time(&dprtc_dev->dprtc, CMD_PRI_LOW,\n+\t\t\t dprtc_dev->token, &ns);\n+\tif (ret) {\n+\t\tDPAA2_PMD_ERR(\"dprtc_get_time failed ret: %d\", ret);\n+\t\treturn ret;\n+\t}\n+\n+\tns += delta;\n+\n+\tret = dprtc_set_time(&dprtc_dev->dprtc, CMD_PRI_LOW,\n+\t\t\t dprtc_dev->token, ns);\n+\tif (ret) {\n+\t\tDPAA2_PMD_ERR(\"dprtc_set_time failed ret: %d\", ret);\n+\t\treturn ret;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+int dpaa2_timesync_read_tx_timestamp(struct rte_eth_dev *dev,\n+\t\t\t\t\t\tstruct timespec *timestamp)\n+{\n+\tstruct dpaa2_dev_priv *priv = dev->data->dev_private;\n+\n+\tif (priv->next_tx_conf_queue)\n+\t\tdpaa2_dev_tx_conf(priv->next_tx_conf_queue);\n+\telse\n+\t\treturn -1;\n+\t*timestamp = rte_ns_to_timespec(priv->tx_timestamp);\n+\n+\treturn 0;\n+}\n+\n+int dpaa2_timesync_read_rx_timestamp(struct rte_eth_dev *dev,\n+\t\t\t\t\t\tstruct timespec *timestamp,\n+\t\t\t\t\t\tuint32_t flags __rte_unused)\n+{\n+\tstruct dpaa2_dev_priv *priv = dev->data->dev_private;\n+\t*timestamp = rte_ns_to_timespec(priv->rx_timestamp);\n+\treturn 0;\n+}\n+\n+static int\n+dpaa2_create_dprtc_device(int vdev_fd __rte_unused,\n+\t\t\t struct vfio_device_info *obj_info __rte_unused,\n+\t\t\t int dprtc_id)\n+{\n+\tstruct dprtc_attr attr;\n+\tint ret;\n+\n+\tPMD_INIT_FUNC_TRACE();\n+\n+\t/* Allocate DPAA2 dprtc handle */\n+\tdprtc_dev = rte_malloc(NULL, sizeof(struct dpaa2_dprtc_dev), 0);\n+\tif (!dprtc_dev) {\n+\t\tDPAA2_PMD_ERR(\"Memory allocation failed for DPRTC Device\");\n+\t\treturn -1;\n+\t}\n+\n+\t/* Open the dprtc object */\n+\tdprtc_dev->dprtc.regs = rte_mcp_ptr_list[MC_PORTAL_INDEX];\n+\tret = dprtc_open(&dprtc_dev->dprtc, CMD_PRI_LOW, dprtc_id,\n+\t\t\t &dprtc_dev->token);\n+\tif (ret) {\n+\t\tDPAA2_PMD_ERR(\"Unable to open dprtc object: err(%d)\", ret);\n+\t\tgoto init_err;\n+\t}\n+\n+\tret = dprtc_get_attributes(&dprtc_dev->dprtc, CMD_PRI_LOW,\n+\t\t\t\t dprtc_dev->token, &attr);\n+\tif (ret) {\n+\t\tDPAA2_PMD_ERR(\"Unable to get dprtc attr: err(%d)\", ret);\n+\t\tgoto init_err;\n+\t}\n+\n+\tdprtc_dev->dprtc_id = dprtc_id;\n+\n+\treturn 0;\n+\n+init_err:\n+\tif (dprtc_dev)\n+\t\trte_free(dprtc_dev);\n+\n+\treturn -1;\n+}\n+\n+static struct rte_dpaa2_object rte_dpaa2_dprtc_obj = {\n+\t.dev_type = DPAA2_DPRTC,\n+\t.create = dpaa2_create_dprtc_device,\n+};\n+\n+RTE_PMD_REGISTER_DPAA2_OBJECT(dprtc, rte_dpaa2_dprtc_obj);\ndiff --git a/drivers/net/dpaa2/meson.build b/drivers/net/dpaa2/meson.build\nindex 1184ce6b9..fc311e9f7 100644\n--- a/drivers/net/dpaa2/meson.build\n+++ b/drivers/net/dpaa2/meson.build\n@@ -20,6 +20,7 @@ sources = files('base/dpaa2_hw_dpni.c',\n \n if dpdk_conf.has('RTE_LIBRTE_IEEE1588')\n \tsources += files('mc/dprtc.c')\n+\tsources += files('dpaa2_ptp.c')\n endif\n \n includes += include_directories('base', 'mc')\n", "prefixes": [ "v1", "24/30" ] }