Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/123035/?format=api
{ "id": 123035, "url": "http://patchwork.dpdk.org/api/patches/123035/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230203132810.14187-1-thomas@monjalon.net/", "project": { "id": 1, "url": "http://patchwork.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": "<20230203132810.14187-1-thomas@monjalon.net>", "list_archive_url": "https://inbox.dpdk.org/dev/20230203132810.14187-1-thomas@monjalon.net", "date": "2023-02-03T13:28:09", "name": "drivers: remove compile-time option for IEEE 1588", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "9aa3d9ed7fa2d9fe30b32d013fdbf19e5948e1ed", "submitter": { "id": 685, "url": "http://patchwork.dpdk.org/api/people/685/?format=api", "name": "Thomas Monjalon", "email": "thomas@monjalon.net" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230203132810.14187-1-thomas@monjalon.net/mbox/", "series": [ { "id": 26787, "url": "http://patchwork.dpdk.org/api/series/26787/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=26787", "date": "2023-02-03T13:28:09", "name": "drivers: remove compile-time option for IEEE 1588", "version": 1, "mbox": "http://patchwork.dpdk.org/series/26787/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/123035/comments/", "check": "fail", "checks": "http://patchwork.dpdk.org/api/patches/123035/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 57E8D41BBD;\n\tFri, 3 Feb 2023 14:29:28 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id DCF594067B;\n\tFri, 3 Feb 2023 14:29:27 +0100 (CET)", "from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com\n [66.111.4.25]) by mails.dpdk.org (Postfix) with ESMTP id DEFB74021E\n for <dev@dpdk.org>; Fri, 3 Feb 2023 14:29:25 +0100 (CET)", "from compute2.internal (compute2.nyi.internal [10.202.2.46])\n by mailout.nyi.internal (Postfix) with ESMTP id CE52C5C005B;\n Fri, 3 Feb 2023 08:29:22 -0500 (EST)", "from mailfrontend1 ([10.202.2.162])\n by compute2.internal (MEProxy); Fri, 03 Feb 2023 08:29:22 -0500", "by mail.messagingengine.com (Postfix) with ESMTPA; Fri,\n 3 Feb 2023 08:29:19 -0500 (EST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=\n cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to\n :message-id:mime-version:reply-to:sender:subject:subject:to:to;\n s=fm3; t=1675430962; x=1675517362; bh=uGfcPcjLNx+UCw0KvCJaSWWc5\n ljrQNVQkbQnf6LolaU=; b=vBJI1vGe/Em5Gu/iJQgekb+x3Hv2GRKsR11xWxk8m\n 74//7eLKrl50AbzSQ44TXuThoFzgkS2eDzY/EfXTNR8X53urk3bWok1r4VMH2E4Z\n O9hSfXXdQjYSlHk2Vc0vplyAMdFrB5ExxxSDMYxb6ZrbObOHjp3+Zl0n+itRkkVY\n 447ghuc+hXs+fZhoXNoVnpBETVQJXSJOkJZ+clsrAVS/To+C40ox32E29H2oMZaY\n o/f93XIC1/006IdmDS/XXAhEy94ShXnmdFbYq1Dv4Iuny0eFlBPpHHfn/dFl9W5H\n I/yQuxc26UwfjQU9IBX4+ugdwGX5f0B/BP0t7ry+pCquQ==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=\n messagingengine.com; h=cc:cc:content-transfer-encoding:date:date\n :feedback-id:feedback-id:from:from:in-reply-to:message-id\n :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy\n :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=\n 1675430962; x=1675517362; bh=uGfcPcjLNx+UCw0KvCJaSWWc5ljrQNVQkbQ\n nf6LolaU=; b=X3aIVkF2sga6sWTIv8uk7tBhxCMjd1+7o6SWCGvoUeLTyJGIYt+\n DUe9/N3baQcmerny/7KZdwX/laeq/pOwAuLV42kK64dC4LcJ0PHK+MIOLHrclWNr\n kEuZh3odGatL51Kx3UeBrDyX6TRQB6r7uqRqdeWXzJDPN3BfoA5MKpTZU0s9Lzha\n 5vNOo0YRAM51RX7eXSOySHhbisCxsGs43paN5Sj5ueLW8DU0/YQDb9tNR1xqyK5X\n yBYNi8JIPW7njgp0nSd+wFLFoicZoYPVRCFuF2JSeGFBYLAUWsL3tZWHfxAOcJ7J\n ea93TmL38jBq02Hw8r2HI1oiRZRoYvp9CBg==" ], "X-ME-Sender": "<xms:MgzdY_UoPz9KeASHJdttBhRA9YY2TVdDjP5dpd-6IysJVIGfIsJUbg>\n <xme:MgzdY3mqgiwFCXwGubFEJEkXBzR2zE5FYLujgmlG1SpR0ukxUDrJv5ACdp2cV8P8W\n 7LNCI9uk8uCzcmkPg>", "X-ME-Received": "\n <xmr:MgzdY7ajt2XNpjiJYoO6_rFFp2TG60Ga1geihP-4TNRwYVvGOKIpa5QdJxH-1CYkVJkooh2TmMGkGSPZ5Oo5mIzC4An_9yA>", "X-ME-Proxy-Cause": "\n gggruggvucftvghtrhhoucdtuddrgedvhedrudegtddghedtucetufdoteggodetrfdotf\n fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen\n uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne\n cujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs\n ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucggtf\n frrghtthgvrhhnpeevveefveeiiefhtedukeegkeelieegffeukeevudetueffieduveet\n iedukeefleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh\n hmpehthhhomhgrshesmhhonhhjrghlohhnrdhnvght", "X-ME-Proxy": "<xmx:MgzdY6Wk8VB4opflBpdtzwXAf42kQ7R4gOrtTVKqTZa8CXgi-tJhkQ>\n <xmx:MgzdY5kcL6tDGQg0OwQRdUeizjZZfjy1y97GbW3wifTVHoni73BJnQ>\n <xmx:MgzdY3c_s8J2H52iKlTiXi-_4-e1TtyYPkWGFiZzJ551CzfuBMbx6Q>\n <xmx:MgzdY0oBr4LrE7yzuNg50zwgGo5l6A8j7Z9XO9rF1m2UMNHX6LBDsg>", "Feedback-ID": "i47234305:Fastmail", "From": "Thomas Monjalon <thomas@monjalon.net>", "To": "dev@dpdk.org", "Cc": "Aman Singh <aman.deep.singh@intel.com>,\n Yuying Zhang <yuying.zhang@intel.com>,\n Ajit Khaparde <ajit.khaparde@broadcom.com>,\n Somnath Kotur <somnath.kotur@broadcom.com>,\n Nithin Dabilpuram <ndabilpuram@marvell.com>,\n Kiran Kumar K <kirankumark@marvell.com>,\n Sunil Kumar Kori <skori@marvell.com>, Satha Rao <skoteshwar@marvell.com>,\n Hemant Agrawal <hemant.agrawal@nxp.com>,\n Sachin Saxena <sachin.saxena@nxp.com>, Simei Su <simei.su@intel.com>,\n Wenjun Wu <wenjun1.wu@intel.com>, Qi Zhang <qi.z.zhang@intel.com>,\n Xiao Wang <xiao.w.wang@intel.com>, Beilei Xing <beilei.xing@intel.com>,\n Qiming Yang <qiming.yang@intel.com>, Jiawen Wu <jiawenwu@trustnetic.com>,\n Jian Wang <jianwang@trustnetic.com>", "Subject": "[PATCH] drivers: remove compile-time option for IEEE 1588", "Date": "Fri, 3 Feb 2023 14:28:09 +0100", "Message-Id": "<20230203132810.14187-1-thomas@monjalon.net>", "X-Mailer": "git-send-email 2.39.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "The option RTE_LIBRTE_IEEE1588 has no effect on any library\nunlike its name.\n\nAlso we are suppose to enable/disable features dynamically,\nnot at compilation time.\n\nAnd the best is that this macro is neither documented,\nnor in rte_config.h.\n\nIt looks to be a mistake keeping this flag, so it is removed,\nmeaning always enabled.\nPS: it is disabling vector paths of some drivers.\n\nSigned-off-by: Thomas Monjalon <thomas@monjalon.net>\n---\n app/test-pmd/testpmd.c | 2 -\n app/test-pmd/testpmd.h | 2 -\n drivers/net/bnxt/bnxt_ethdev.c | 96 -----------------------\n drivers/net/bnxt/bnxt_rxr.c | 6 --\n drivers/net/cnxk/cnxk_ethdev.h | 8 +-\n drivers/net/dpaa2/dpaa2_ethdev.c | 9 +--\n drivers/net/dpaa2/dpaa2_ptp.c | 2 -\n drivers/net/dpaa2/dpaa2_rxtx.c | 21 +----\n drivers/net/e1000/igb_rxtx.c | 16 +---\n drivers/net/fm10k/fm10k_rxtx_vec.c | 12 ---\n drivers/net/i40e/i40e_rxtx.c | 41 ++--------\n drivers/net/i40e/i40e_rxtx_vec_common.h | 48 ------------\n drivers/net/ixgbe/ixgbe_rxtx.c | 16 +---\n drivers/net/ixgbe/ixgbe_rxtx_vec_common.h | 10 ---\n drivers/net/ngbe/ngbe_rxtx.c | 17 +---\n drivers/net/txgbe/txgbe_rxtx.c | 17 +---\n 16 files changed, 18 insertions(+), 305 deletions(-)", "diff": "diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c\nindex e366f81a0f..c8f8f896cb 100644\n--- a/app/test-pmd/testpmd.c\n+++ b/app/test-pmd/testpmd.c\n@@ -198,9 +198,7 @@ struct fwd_engine * fwd_engines[] = {\n \t&icmp_echo_engine,\n \t&noisy_vnf_engine,\n \t&five_tuple_swap_fwd_engine,\n-#ifdef RTE_LIBRTE_IEEE1588\n \t&ieee1588_fwd_engine,\n-#endif\n \t&shared_rxq_engine,\n \tNULL,\n };\ndiff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h\nindex 7d24d25970..b9aabf8136 100644\n--- a/app/test-pmd/testpmd.h\n+++ b/app/test-pmd/testpmd.h\n@@ -427,9 +427,7 @@ extern struct fwd_engine csum_fwd_engine;\n extern struct fwd_engine icmp_echo_engine;\n extern struct fwd_engine noisy_vnf_engine;\n extern struct fwd_engine five_tuple_swap_fwd_engine;\n-#ifdef RTE_LIBRTE_IEEE1588\n extern struct fwd_engine ieee1588_fwd_engine;\n-#endif\n extern struct fwd_engine shared_rxq_engine;\n \n extern struct fwd_engine * fwd_engines[]; /**< NULL terminated array. */\ndiff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex b3de490d36..e6ef4f78ec 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -1230,64 +1230,6 @@ bnxt_receive_function(struct rte_eth_dev *eth_dev)\n \t\treturn bnxt_recv_pkts;\n \t}\n \n-#if (defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64)) && \\\n-\t!defined(RTE_LIBRTE_IEEE1588)\n-\n-\t/* Vector mode receive cannot be enabled if scattered rx is in use. */\n-\tif (eth_dev->data->scattered_rx)\n-\t\tgoto use_scalar_rx;\n-\n-\t/*\n-\t * Vector mode receive cannot be enabled if Truflow is enabled or if\n-\t * asynchronous completions and receive completions can be placed in\n-\t * the same completion ring.\n-\t */\n-\tif (BNXT_TRUFLOW_EN(bp) || !BNXT_NUM_ASYNC_CPR(bp))\n-\t\tgoto use_scalar_rx;\n-\n-\t/*\n-\t * Vector mode receive cannot be enabled if any receive offloads outside\n-\t * a limited subset have been enabled.\n-\t */\n-\tif (eth_dev->data->dev_conf.rxmode.offloads &\n-\t\t~(RTE_ETH_RX_OFFLOAD_VLAN_STRIP |\n-\t\t RTE_ETH_RX_OFFLOAD_KEEP_CRC |\n-\t\t RTE_ETH_RX_OFFLOAD_IPV4_CKSUM |\n-\t\t RTE_ETH_RX_OFFLOAD_UDP_CKSUM |\n-\t\t RTE_ETH_RX_OFFLOAD_TCP_CKSUM |\n-\t\t RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM |\n-\t\t RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM |\n-\t\t RTE_ETH_RX_OFFLOAD_RSS_HASH |\n-\t\t RTE_ETH_RX_OFFLOAD_VLAN_FILTER))\n-\t\tgoto use_scalar_rx;\n-\n-#if defined(RTE_ARCH_X86) && defined(CC_AVX2_SUPPORT)\n-\tif (rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_256 &&\n-\t rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) == 1) {\n-\t\tPMD_DRV_LOG(INFO,\n-\t\t\t \"Using AVX2 vector mode receive for port %d\\n\",\n-\t\t\t eth_dev->data->port_id);\n-\t\tbp->flags |= BNXT_FLAG_RX_VECTOR_PKT_MODE;\n-\t\treturn bnxt_recv_pkts_vec_avx2;\n-\t}\n- #endif\n-\tif (rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) {\n-\t\tPMD_DRV_LOG(INFO,\n-\t\t\t \"Using SSE vector mode receive for port %d\\n\",\n-\t\t\t eth_dev->data->port_id);\n-\t\tbp->flags |= BNXT_FLAG_RX_VECTOR_PKT_MODE;\n-\t\treturn bnxt_recv_pkts_vec;\n-\t}\n-\n-use_scalar_rx:\n-\tPMD_DRV_LOG(INFO, \"Vector mode receive disabled for port %d\\n\",\n-\t\t eth_dev->data->port_id);\n-\tPMD_DRV_LOG(INFO,\n-\t\t \"Port %d scatter: %d rx offload: %\" PRIX64 \"\\n\",\n-\t\t eth_dev->data->port_id,\n-\t\t eth_dev->data->scattered_rx,\n-\t\t eth_dev->data->dev_conf.rxmode.offloads);\n-#endif\n \tbp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;\n \treturn bnxt_recv_pkts;\n }\n@@ -1301,44 +1243,6 @@ bnxt_transmit_function(struct rte_eth_dev *eth_dev)\n \tif (BNXT_CHIP_SR2(bp))\n \t\treturn bnxt_xmit_pkts;\n \n-#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64) && \\\n-\t!defined(RTE_LIBRTE_IEEE1588)\n-\tuint64_t offloads = eth_dev->data->dev_conf.txmode.offloads;\n-\n-\t/*\n-\t * Vector mode transmit can be enabled only if not using scatter rx\n-\t * or tx offloads.\n-\t */\n-\tif (eth_dev->data->scattered_rx ||\n-\t (offloads & ~RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE) ||\n-\t BNXT_TRUFLOW_EN(bp))\n-\t\tgoto use_scalar_tx;\n-\n-#if defined(RTE_ARCH_X86) && defined(CC_AVX2_SUPPORT)\n-\tif (rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_256 &&\n-\t rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) == 1) {\n-\t\tPMD_DRV_LOG(INFO,\n-\t\t\t \"Using AVX2 vector mode transmit for port %d\\n\",\n-\t\t\t eth_dev->data->port_id);\n-\t\treturn bnxt_xmit_pkts_vec_avx2;\n-\t}\n-#endif\n-\tif (rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) {\n-\t\tPMD_DRV_LOG(INFO,\n-\t\t\t \"Using SSE vector mode transmit for port %d\\n\",\n-\t\t\t eth_dev->data->port_id);\n-\t\treturn bnxt_xmit_pkts_vec;\n-\t}\n-\n-use_scalar_tx:\n-\tPMD_DRV_LOG(INFO, \"Vector mode transmit disabled for port %d\\n\",\n-\t\t eth_dev->data->port_id);\n-\tPMD_DRV_LOG(INFO,\n-\t\t \"Port %d scatter: %d tx offload: %\" PRIX64 \"\\n\",\n-\t\t eth_dev->data->port_id,\n-\t\t eth_dev->data->scattered_rx,\n-\t\t offloads);\n-#endif\n \treturn bnxt_xmit_pkts;\n }\n \ndiff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c\nindex daaf9ffc1e..1d434c79bc 100644\n--- a/drivers/net/bnxt/bnxt_rxr.c\n+++ b/drivers/net/bnxt/bnxt_rxr.c\n@@ -680,16 +680,13 @@ bnxt_set_ol_flags(struct bnxt_rx_ring_info *rxr, struct rx_pkt_cmpl *rxcmp,\n \t\tol_flags |= RTE_MBUF_F_RX_RSS_HASH;\n \t}\n \n-#ifdef RTE_LIBRTE_IEEE1588\n \tif (unlikely((flags_type & RX_PKT_CMPL_FLAGS_MASK) ==\n \t\t RX_PKT_CMPL_FLAGS_ITYPE_PTP_W_TIMESTAMP))\n \t\tol_flags |= RTE_MBUF_F_RX_IEEE1588_PTP | RTE_MBUF_F_RX_IEEE1588_TMST;\n-#endif\n \n \tmbuf->ol_flags = ol_flags;\n }\n \n-#ifdef RTE_LIBRTE_IEEE1588\n static void\n bnxt_get_rx_ts_p5(struct bnxt *bp, uint32_t rx_ts_cmpl)\n {\n@@ -716,7 +713,6 @@ bnxt_get_rx_ts_p5(struct bnxt *bp, uint32_t rx_ts_cmpl)\n \t}\n \tptp->rx_timestamp = pkt_time;\n }\n-#endif\n \n static uint32_t\n bnxt_ulp_set_mark_in_mbuf(struct bnxt *bp, struct rx_pkt_cmpl_hi *rxcmp1,\n@@ -926,12 +922,10 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,\n \tmbuf->data_len = mbuf->pkt_len;\n \tmbuf->port = rxq->port_id;\n \n-#ifdef RTE_LIBRTE_IEEE1588\n \tif (unlikely((rte_le_to_cpu_16(rxcmp->flags_type) &\n \t\t RX_PKT_CMPL_FLAGS_MASK) ==\n \t\t RX_PKT_CMPL_FLAGS_ITYPE_PTP_W_TIMESTAMP))\n \t\tbnxt_get_rx_ts_p5(rxq->bp, rxcmp1->reorder);\n-#endif\n \n \tif (cmp_type == CMPL_BASE_TYPE_RX_L2_V2) {\n \t\tbnxt_parse_csum_v2(mbuf, rxcmp1);\ndiff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h\nindex 651ef45ea8..b517204f7f 100644\n--- a/drivers/net/cnxk/cnxk_ethdev.h\n+++ b/drivers/net/cnxk/cnxk_ethdev.h\n@@ -48,14 +48,8 @@\n /* LPB & SPB */\n #define CNXK_NIX_NUM_POOLS_MAX 2\n \n-/* If PTP is enabled additional SEND MEM DESC is required which\n- * takes 2 words, hence max 7 iova address are possible\n- */\n-#if defined(RTE_LIBRTE_IEEE1588)\n+/* PTP requires 2 words, hence max 7 IOVA addresses are possible. */\n #define CNXK_NIX_TX_NB_SEG_MAX 7\n-#else\n-#define CNXK_NIX_TX_NB_SEG_MAX 9\n-#endif\n \n #define CNXK_NIX_TX_MSEG_SG_DWORDS \\\n \t((RTE_ALIGN_MUL_CEIL(CNXK_NIX_TX_NB_SEG_MAX, 3) / 3) + \\\ndiff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c\nindex 679f33ae1a..de9c02a962 100644\n--- a/drivers/net/dpaa2/dpaa2_ethdev.c\n+++ b/drivers/net/dpaa2/dpaa2_ethdev.c\n@@ -618,9 +618,6 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)\n \t\treturn ret;\n \t}\n \n-#if !defined(RTE_LIBRTE_IEEE1588)\n-\tif (rx_offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)\n-#endif\n \t{\n \t\tret = rte_mbuf_dyn_rx_timestamp_register(\n \t\t\t\t&dpaa2_timestamp_dynfield_offset,\n@@ -2461,7 +2458,6 @@ static struct eth_dev_ops dpaa2_ethdev_ops = {\n \t.rxq_info_get\t = dpaa2_rxq_info_get,\n \t.txq_info_get\t = dpaa2_txq_info_get,\n \t.tm_ops_get\t = dpaa2_tm_ops_get,\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@@ -2469,7 +2465,6 @@ static struct eth_dev_ops dpaa2_ethdev_ops = {\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\n@@ -2681,10 +2676,8 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)\n \tpriv->max_mac_filters = attr.mac_filter_entries;\n \tpriv->max_vlan_filters = attr.vlan_filter_entries;\n \tpriv->flags = 0;\n-#if defined(RTE_LIBRTE_IEEE1588)\n-\tprintf(\"DPDK IEEE1588 is enabled\\n\");\n \tpriv->flags |= DPAA2_TX_CONF_ENABLE;\n-#endif\n+\n \t/* Used with ``fslmc:dpni.1,drv_tx_conf=1`` */\n \tif (dpaa2_get_devargs(dev->devargs, DRIVER_TX_CONF)) {\n \t\tpriv->flags |= DPAA2_TX_CONF_ENABLE;\ndiff --git a/drivers/net/dpaa2/dpaa2_ptp.c b/drivers/net/dpaa2/dpaa2_ptp.c\nindex c08aa0f3bf..955dc863d0 100644\n--- a/drivers/net/dpaa2/dpaa2_ptp.c\n+++ b/drivers/net/dpaa2/dpaa2_ptp.c\n@@ -131,7 +131,6 @@ int dpaa2_timesync_read_rx_timestamp(struct rte_eth_dev *dev,\n \treturn 0;\n }\n \n-#if defined(RTE_LIBRTE_IEEE1588)\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@@ -181,4 +180,3 @@ static struct rte_dpaa2_object rte_dpaa2_dprtc_obj = {\n };\n \n RTE_PMD_REGISTER_DPAA2_OBJECT(dprtc, rte_dpaa2_dprtc_obj);\n-#endif\ndiff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c\nindex f60e78e1fd..e1aed0a461 100644\n--- a/drivers/net/dpaa2/dpaa2_rxtx.c\n+++ b/drivers/net/dpaa2/dpaa2_rxtx.c\n@@ -139,12 +139,10 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf,\n \t\t\t\"(4)=0x%\" PRIx64 \"\\t\",\n \t\t\tannotation->word3, annotation->word4);\n \n-#if defined(RTE_LIBRTE_IEEE1588)\n \tif (BIT_ISSET_AT_POS(annotation->word1, DPAA2_ETH_FAS_PTP)) {\n \t\tmbuf->ol_flags |= RTE_MBUF_F_RX_IEEE1588_PTP;\n \t\tmbuf->ol_flags |= RTE_MBUF_F_RX_IEEE1588_TMST;\n \t}\n-#endif\n \n \tif (BIT_ISSET_AT_POS(annotation->word3, L2_VLAN_1_PRESENT)) {\n \t\tvlan_tci = rte_pktmbuf_mtod_offset(mbuf, uint16_t *,\n@@ -412,10 +410,9 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,\n \tstruct qbman_sge *sgt, *sge = NULL;\n \tint i, offset = 0;\n \n-#ifdef RTE_LIBRTE_IEEE1588\n \t/* annotation area for timestamp in first buffer */\n \toffset = 0x64;\n-#endif\n+\n \tif (RTE_MBUF_DIRECT(mbuf) &&\n \t\t(mbuf->data_off > (mbuf->nb_segs * sizeof(struct qbman_sge)\n \t\t+ offset))) {\n@@ -829,12 +826,10 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\tbufs[num_rx] = eth_sg_fd_to_mbuf(fd, eth_data->port_id);\n \t\telse\n \t\t\tbufs[num_rx] = eth_fd_to_mbuf(fd, eth_data->port_id);\n-#if defined(RTE_LIBRTE_IEEE1588)\n \t\tif (bufs[num_rx]->ol_flags & RTE_MBUF_F_RX_IEEE1588_TMST) {\n \t\t\tpriv->rx_timestamp =\n \t\t\t\t*dpaa2_timestamp_dynfield(bufs[num_rx]);\n \t\t}\n-#endif\n \n \t\tif (eth_data->dev_conf.rxmode.offloads &\n \t\t\t\tRTE_ETH_RX_OFFLOAD_VLAN_STRIP)\n@@ -1050,12 +1045,10 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\t\tbufs[num_rx] = eth_fd_to_mbuf(fd,\n \t\t\t\t\t\t\teth_data->port_id);\n \n-#if defined(RTE_LIBRTE_IEEE1588)\n \t\tif (bufs[num_rx]->ol_flags & RTE_MBUF_F_RX_IEEE1588_TMST) {\n \t\t\tpriv->rx_timestamp =\n \t\t\t\t*dpaa2_timestamp_dynfield(bufs[num_rx]);\n \t\t}\n-#endif\n \n \t\tif (eth_data->dev_conf.rxmode.offloads &\n \t\t\t\tRTE_ETH_RX_OFFLOAD_VLAN_STRIP) {\n@@ -1088,13 +1081,11 @@ uint16_t dpaa2_dev_tx_conf(void *queue)\n \tstruct qbman_release_desc releasedesc;\n \tuint32_t bpid;\n \tuint64_t buf;\n-#if defined(RTE_LIBRTE_IEEE1588)\n \tstruct rte_eth_dev_data *eth_data = dpaa2_q->eth_data;\n \tstruct dpaa2_dev_priv *priv = eth_data->dev_private;\n \tstruct dpaa2_annot_hdr *annotation;\n \tvoid *v_addr;\n \tstruct rte_mbuf *mbuf;\n-#endif\n \n \tif (unlikely(!DPAA2_PER_LCORE_DPIO)) {\n \t\tret = dpaa2_affine_qbman_swp();\n@@ -1177,7 +1168,6 @@ uint16_t dpaa2_dev_tx_conf(void *queue)\n \t\t\tdq_storage++;\n \t\t\tnum_tx_conf++;\n \t\t\tnum_pulled++;\n-#if defined(RTE_LIBRTE_IEEE1588)\n \t\t\tv_addr = DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd));\n \t\t\tmbuf = DPAA2_INLINE_MBUF_FROM_BUF(v_addr,\n \t\t\t\trte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size);\n@@ -1188,7 +1178,6 @@ uint16_t dpaa2_dev_tx_conf(void *queue)\n \t\t\t\t\tDPAA2_FD_PTA_SIZE);\n \t\t\t\tpriv->tx_timestamp = annotation->word2;\n \t\t\t}\n-#endif\n \t\t} while (pending);\n \n \t/* Last VDQ provided all packets and more packets are requested */\n@@ -1259,7 +1248,6 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \tDPAA2_PMD_DP_DEBUG(\"===> eth_data =%p, fqid =%d\\n\",\n \t\t\teth_data, dpaa2_q->fqid);\n \n-#ifdef RTE_LIBRTE_IEEE1588\n \t/* IEEE1588 driver need pointer to tx confirmation queue\n \t * corresponding to last packet transmitted for reading\n \t * the timestamp\n@@ -1269,7 +1257,6 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\tdpaa2_dev_tx_conf(dpaa2_q->tx_conf_queue);\n \t\tpriv->tx_timestamp = 0;\n \t}\n-#endif\n \n \t/*Prepare enqueue descriptor*/\n \tqbman_eq_desc_clear(&eqdesc);\n@@ -1326,9 +1313,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\t\t\t\t(void **)bufs, 1, 0);\n #endif\n \t\t\t\t\tbufs++;\n-#ifdef RTE_LIBRTE_IEEE1588\n \t\t\t\t\tenable_tx_tstamp(&fd_arr[loop]);\n-#endif\n \t\t\t\t\tcontinue;\n \t\t\t\t}\n \t\t\t} else {\n@@ -1354,9 +1339,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\t\t\t\t\tloop, 0);\n \t\t\t\t}\n \t\t\t\tbufs++;\n-#ifdef RTE_LIBRTE_IEEE1588\n \t\t\t\tenable_tx_tstamp(&fd_arr[loop]);\n-#endif\n \t\t\t\tcontinue;\n \t\t\t}\n \n@@ -1409,9 +1392,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\t\t\t\t\tloop, bpid);\n \t\t\t\t}\n \t\t\t}\n-#ifdef RTE_LIBRTE_IEEE1588\n \t\t\tenable_tx_tstamp(&fd_arr[loop]);\n-#endif\n \t\t\tbufs++;\n \t\t}\n \ndiff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c\nindex f32dee46df..b8c4de567c 100644\n--- a/drivers/net/e1000/igb_rxtx.c\n+++ b/drivers/net/e1000/igb_rxtx.c\n@@ -43,11 +43,6 @@\n #include \"base/e1000_api.h\"\n #include \"e1000_ethdev.h\"\n \n-#ifdef RTE_LIBRTE_IEEE1588\n-#define IGB_TX_IEEE1588_TMST RTE_MBUF_F_TX_IEEE1588_TMST\n-#else\n-#define IGB_TX_IEEE1588_TMST 0\n-#endif\n /* Bit Mask to indicate what bits required for building TX context */\n #define IGB_TX_OFFLOAD_MASK (RTE_MBUF_F_TX_OUTER_IPV6 |\t \\\n \t\tRTE_MBUF_F_TX_OUTER_IPV4 |\t \\\n@@ -57,7 +52,7 @@\n \t\tRTE_MBUF_F_TX_IP_CKSUM |\t\t \\\n \t\tRTE_MBUF_F_TX_L4_MASK |\t\t \\\n \t\tRTE_MBUF_F_TX_TCP_SEG |\t\t \\\n-\t\tIGB_TX_IEEE1588_TMST)\n+\t\tRTE_MBUF_F_TX_IEEE1588_TMST)\n \n #define IGB_TX_OFFLOAD_NOTSUP_MASK \\\n \t\t(RTE_MBUF_F_TX_OFFLOAD_MASK ^ IGB_TX_OFFLOAD_MASK)\n@@ -530,10 +525,8 @@ eth_igb_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\tif (tx_ol_req & RTE_MBUF_F_TX_TCP_SEG)\n \t\t\tpkt_len -= (tx_pkt->l2_len + tx_pkt->l3_len + tx_pkt->l4_len);\n \t\tolinfo_status = (pkt_len << E1000_ADVTXD_PAYLEN_SHIFT);\n-#if defined(RTE_LIBRTE_IEEE1588)\n \t\tif (ol_flags & RTE_MBUF_F_TX_IEEE1588_TMST)\n \t\t\tcmd_type_len |= E1000_ADVTXD_MAC_TSTAMP;\n-#endif\n \t\tif (tx_ol_req) {\n \t\t\t/* Setup TX Advanced context descriptor if required */\n \t\t\tif (new_ctx) {\n@@ -746,7 +739,6 @@ rx_desc_hlen_type_rss_to_pkt_flags(struct igb_rx_queue *rxq, uint32_t hl_tp_rs)\n {\n \tuint64_t pkt_flags = ((hl_tp_rs & 0x0F) == 0) ? 0 : RTE_MBUF_F_RX_RSS_HASH;\n \n-#if defined(RTE_LIBRTE_IEEE1588)\n \tstatic uint32_t ip_pkt_etqf_map[8] = {\n \t\t0, 0, 0, RTE_MBUF_F_RX_IEEE1588_PTP,\n \t\t0, 0, 0, 0,\n@@ -760,9 +752,6 @@ rx_desc_hlen_type_rss_to_pkt_flags(struct igb_rx_queue *rxq, uint32_t hl_tp_rs)\n \t\tpkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >> 12) & 0x07];\n \telse\n \t\tpkt_flags |= ip_pkt_etqf_map[(hl_tp_rs >> 4) & 0x07];\n-#else\n-\tRTE_SET_USED(rxq);\n-#endif\n \n \treturn pkt_flags;\n }\n@@ -776,10 +765,9 @@ rx_desc_status_to_pkt_flags(uint32_t rx_status)\n \tpkt_flags = ((rx_status & E1000_RXD_STAT_VP) ?\n \t\tRTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED : 0);\n \n-#if defined(RTE_LIBRTE_IEEE1588)\n \tif (rx_status & E1000_RXD_STAT_TMST)\n \t\tpkt_flags = pkt_flags | RTE_MBUF_F_RX_IEEE1588_TMST;\n-#endif\n+\n \treturn pkt_flags;\n }\n \ndiff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c\nindex dfc4abe3e3..9cc3ccee85 100644\n--- a/drivers/net/fm10k/fm10k_rxtx_vec.c\n+++ b/drivers/net/fm10k/fm10k_rxtx_vec.c\n@@ -207,20 +207,8 @@ fm10k_desc_to_pktype_v(__m128i descs[4], struct rte_mbuf **rx_pkts)\n int __rte_cold\n fm10k_rx_vec_condition_check(struct rte_eth_dev *dev)\n {\n-#ifndef RTE_LIBRTE_IEEE1588\n-\tstruct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;\n-\n-#ifndef RTE_FM10K_RX_OLFLAGS_ENABLE\n-\t/* without rx ol_flags, no VP flag report */\n-\tif (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_EXTEND)\n-\t\treturn -1;\n-#endif\n-\n-\treturn 0;\n-#else\n \tRTE_SET_USED(dev);\n \treturn -1;\n-#endif\n }\n \n int __rte_cold\ndiff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c\nindex 788ffb51c2..f20297b709 100644\n--- a/drivers/net/i40e/i40e_rxtx.c\n+++ b/drivers/net/i40e/i40e_rxtx.c\n@@ -43,12 +43,6 @@\n \n #define I40E_TXD_CMD (I40E_TX_DESC_CMD_EOP | I40E_TX_DESC_CMD_RS)\n \n-#ifdef RTE_LIBRTE_IEEE1588\n-#define I40E_TX_IEEE1588_TMST RTE_MBUF_F_TX_IEEE1588_TMST\n-#else\n-#define I40E_TX_IEEE1588_TMST 0\n-#endif\n-\n #define I40E_TX_CKSUM_OFFLOAD_MASK (RTE_MBUF_F_TX_IP_CKSUM |\t\t \\\n \t\tRTE_MBUF_F_TX_L4_MASK |\t\t \\\n \t\tRTE_MBUF_F_TX_TCP_SEG |\t\t \\\n@@ -66,7 +60,7 @@\n \t\tRTE_MBUF_F_TX_VLAN |\t\\\n \t\tRTE_MBUF_F_TX_TUNNEL_MASK |\t\\\n \t\tRTE_MBUF_F_TX_OUTER_UDP_CKSUM |\t\\\n-\t\tI40E_TX_IEEE1588_TMST)\n+\t\tRTE_MBUF_F_TX_IEEE1588_TMST)\n \n #define I40E_TX_OFFLOAD_NOTSUP_MASK \\\n \t\t(RTE_MBUF_F_TX_OFFLOAD_MASK ^ I40E_TX_OFFLOAD_MASK)\n@@ -192,7 +186,6 @@ i40e_rxd_error_to_pkt_flags(uint64_t qword)\n /* Function to check and set the ieee1588 timesync index and get the\n * appropriate flags.\n */\n-#ifdef RTE_LIBRTE_IEEE1588\n static inline uint64_t\n i40e_get_iee15888_flags(struct rte_mbuf *mb, uint64_t qword)\n {\n@@ -211,7 +204,6 @@ i40e_get_iee15888_flags(struct rte_mbuf *mb, uint64_t qword)\n \n \treturn pkt_flags;\n }\n-#endif\n \n static inline uint64_t\n i40e_rxd_build_fdir(volatile union i40e_rx_desc *rxdp, struct rte_mbuf *mb)\n@@ -529,12 +521,8 @@ i40e_rx_scan_hw_ring(struct i40e_rx_queue *rxq)\n \t\t\t\t\trxdp[j].wb.qword0.hi_dword.rss);\n \t\t\tif (pkt_flags & RTE_MBUF_F_RX_FDIR)\n \t\t\t\tpkt_flags |= i40e_rxd_build_fdir(&rxdp[j], mb);\n-\n-#ifdef RTE_LIBRTE_IEEE1588\n \t\t\tpkt_flags |= i40e_get_iee15888_flags(mb, qword1);\n-#endif\n \t\t\tmb->ol_flags |= pkt_flags;\n-\n \t\t}\n \n \t\tfor (j = 0; j < I40E_LOOK_AHEAD; j++)\n@@ -798,10 +786,7 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\t\t\trte_le_to_cpu_32(rxd.wb.qword0.hi_dword.rss);\n \t\tif (pkt_flags & RTE_MBUF_F_RX_FDIR)\n \t\t\tpkt_flags |= i40e_rxd_build_fdir(&rxd, rxm);\n-\n-#ifdef RTE_LIBRTE_IEEE1588\n \t\tpkt_flags |= i40e_get_iee15888_flags(rxm, qword1);\n-#endif\n \t\trxm->ol_flags |= pkt_flags;\n \n \t\trx_pkts[nb_rx++] = rxm;\n@@ -972,10 +957,7 @@ i40e_recv_scattered_pkts(void *rx_queue,\n \t\t\t\trte_le_to_cpu_32(rxd.wb.qword0.hi_dword.rss);\n \t\tif (pkt_flags & RTE_MBUF_F_RX_FDIR)\n \t\t\tpkt_flags |= i40e_rxd_build_fdir(&rxd, first_seg);\n-\n-#ifdef RTE_LIBRTE_IEEE1588\n \t\tpkt_flags |= i40e_get_iee15888_flags(first_seg, qword1);\n-#endif\n \t\tfirst_seg->ol_flags |= pkt_flags;\n \n \t\t/* Prefetch data of first segment, if configured to do so. */\n@@ -1017,11 +999,8 @@ i40e_calc_context_desc(uint64_t flags)\n \tstatic uint64_t mask = RTE_MBUF_F_TX_OUTER_IP_CKSUM |\n \t\tRTE_MBUF_F_TX_TCP_SEG |\n \t\tRTE_MBUF_F_TX_QINQ |\n-\t\tRTE_MBUF_F_TX_TUNNEL_MASK;\n-\n-#ifdef RTE_LIBRTE_IEEE1588\n-\tmask |= RTE_MBUF_F_TX_IEEE1588_TMST;\n-#endif\n+\t\tRTE_MBUF_F_TX_TUNNEL_MASK |\n+\t\tRTE_MBUF_F_TX_IEEE1588_TMST;\n \n \treturn (flags & mask) ? 1 : 0;\n }\n@@ -1199,14 +1178,10 @@ i40e_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\t\tif (ol_flags & RTE_MBUF_F_TX_TCP_SEG)\n \t\t\t\tcd_type_cmd_tso_mss |=\n \t\t\t\t\ti40e_set_tso_ctx(tx_pkt, tx_offload);\n-\t\t\telse {\n-#ifdef RTE_LIBRTE_IEEE1588\n-\t\t\t\tif (ol_flags & RTE_MBUF_F_TX_IEEE1588_TMST)\n-\t\t\t\t\tcd_type_cmd_tso_mss |=\n-\t\t\t\t\t\t((uint64_t)I40E_TX_CTX_DESC_TSYN <<\n-\t\t\t\t\t\t I40E_TXD_CTX_QW1_CMD_SHIFT);\n-#endif\n-\t\t\t}\n+\t\t\telse if (ol_flags & RTE_MBUF_F_TX_IEEE1588_TMST)\n+\t\t\t\tcd_type_cmd_tso_mss |=\n+\t\t\t\t\t((uint64_t)I40E_TX_CTX_DESC_TSYN <<\n+\t\t\t\t\tI40E_TXD_CTX_QW1_CMD_SHIFT);\n \n \t\t\tctx_txd->tunneling_params =\n \t\t\t\trte_cpu_to_le_32(cd_tunneling_params);\n@@ -2805,9 +2780,7 @@ i40e_tx_queue_init(struct i40e_tx_queue *txq)\n \ttx_ctx.base = txq->tx_ring_phys_addr / I40E_QUEUE_BASE_ADDR_UNIT;\n \ttx_ctx.qlen = txq->nb_tx_desc;\n \n-#ifdef RTE_LIBRTE_IEEE1588\n \ttx_ctx.timesync_ena = 1;\n-#endif\n \ttx_ctx.rdylist = rte_le_to_cpu_16(vsi->info.qs_handle[txq->dcb_tc]);\n \tif (vsi->type == I40E_VSI_FDIR)\n \t\ttx_ctx.fd_ena = TRUE;\ndiff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h b/drivers/net/i40e/i40e_rxtx_vec_common.h\nindex fe1a6ec75e..094e7b8ee6 100644\n--- a/drivers/net/i40e/i40e_rxtx_vec_common.h\n+++ b/drivers/net/i40e/i40e_rxtx_vec_common.h\n@@ -207,56 +207,8 @@ i40e_rxq_vec_setup_default(struct i40e_rx_queue *rxq)\n static inline int\n i40e_rx_vec_dev_conf_condition_check_default(struct rte_eth_dev *dev)\n {\n-#ifndef RTE_LIBRTE_IEEE1588\n-\tstruct i40e_adapter *ad =\n-\t\tI40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);\n-\tstruct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;\n-\tstruct i40e_rx_queue *rxq;\n-\tuint16_t desc, i;\n-\tbool first_queue;\n-\n-\t/* no QinQ support */\n-\tif (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_EXTEND)\n-\t\treturn -1;\n-\n-\t/**\n-\t * Vector mode is allowed only when number of Rx queue\n-\t * descriptor is power of 2.\n-\t */\n-\tif (!dev->data->dev_started) {\n-\t\tfirst_queue = true;\n-\t\tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n-\t\t\trxq = dev->data->rx_queues[i];\n-\t\t\tif (!rxq)\n-\t\t\t\tcontinue;\n-\t\t\tdesc = rxq->nb_rx_desc;\n-\t\t\tif (first_queue)\n-\t\t\t\tad->rx_vec_allowed =\n-\t\t\t\t\trte_is_power_of_2(desc);\n-\t\t\telse\n-\t\t\t\tad->rx_vec_allowed =\n-\t\t\t\t\tad->rx_vec_allowed ?\n-\t\t\t\t\trte_is_power_of_2(desc) :\n-\t\t\t\t\tad->rx_vec_allowed;\n-\t\t\tfirst_queue = false;\n-\t\t}\n-\t} else {\n-\t\t/* Only check the first queue's descriptor number */\n-\t\tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n-\t\t\trxq = dev->data->rx_queues[i];\n-\t\t\tif (!rxq)\n-\t\t\t\tcontinue;\n-\t\t\tdesc = rxq->nb_rx_desc;\n-\t\t\tad->rx_vec_allowed = rte_is_power_of_2(desc);\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-\n-\treturn 0;\n-#else\n \tRTE_SET_USED(dev);\n \treturn -1;\n-#endif\n }\n \n #endif\ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c\nindex c9d6ca9efe..99d4039fba 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx.c\n+++ b/drivers/net/ixgbe/ixgbe_rxtx.c\n@@ -53,11 +53,6 @@\n #include \"base/ixgbe_common.h\"\n #include \"ixgbe_rxtx.h\"\n \n-#ifdef RTE_LIBRTE_IEEE1588\n-#define IXGBE_TX_IEEE1588_TMST RTE_MBUF_F_TX_IEEE1588_TMST\n-#else\n-#define IXGBE_TX_IEEE1588_TMST 0\n-#endif\n /* Bit Mask to indicate what bits required for building TX context */\n #define IXGBE_TX_OFFLOAD_MASK (RTE_MBUF_F_TX_OUTER_IPV6 |\t\t \\\n \t\tRTE_MBUF_F_TX_OUTER_IPV4 |\t\t \\\n@@ -70,7 +65,7 @@\n \t\tRTE_MBUF_F_TX_MACSEC |\t\t\t \\\n \t\tRTE_MBUF_F_TX_OUTER_IP_CKSUM |\t\t \\\n \t\tRTE_MBUF_F_TX_SEC_OFFLOAD |\t \\\n-\t\tIXGBE_TX_IEEE1588_TMST)\n+\t\tRTE_MBUF_F_TX_IEEE1588_TMST)\n \n #define IXGBE_TX_OFFLOAD_NOTSUP_MASK \\\n \t\t(RTE_MBUF_F_TX_OFFLOAD_MASK ^ IXGBE_TX_OFFLOAD_MASK)\n@@ -823,10 +818,8 @@ ixgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\tcmd_type_len = IXGBE_ADVTXD_DTYP_DATA |\n \t\t\tIXGBE_ADVTXD_DCMD_IFCS | IXGBE_ADVTXD_DCMD_DEXT;\n \n-#ifdef RTE_LIBRTE_IEEE1588\n \t\tif (ol_flags & RTE_MBUF_F_TX_IEEE1588_TMST)\n \t\t\tcmd_type_len |= IXGBE_ADVTXD_MAC_1588;\n-#endif\n \n \t\tolinfo_status = 0;\n \t\tif (tx_ol_req) {\n@@ -1436,7 +1429,6 @@ ixgbe_rxd_pkt_info_to_pkt_flags(uint16_t pkt_info)\n \t\tRTE_MBUF_F_RX_RSS_HASH, 0, 0, 0,\n \t\t0, 0, 0, RTE_MBUF_F_RX_FDIR,\n \t};\n-#ifdef RTE_LIBRTE_IEEE1588\n \tstatic uint64_t ip_pkt_etqf_map[8] = {\n \t\t0, 0, 0, RTE_MBUF_F_RX_IEEE1588_PTP,\n \t\t0, 0, 0, 0,\n@@ -1447,9 +1439,6 @@ ixgbe_rxd_pkt_info_to_pkt_flags(uint16_t pkt_info)\n \t\t\t\tip_rss_types_map[pkt_info & 0XF];\n \telse\n \t\treturn ip_rss_types_map[pkt_info & 0XF];\n-#else\n-\treturn ip_rss_types_map[pkt_info & 0XF];\n-#endif\n }\n \n static inline uint64_t\n@@ -1464,10 +1453,9 @@ rx_desc_status_to_pkt_flags(uint32_t rx_status, uint64_t vlan_flags)\n \t */\n \tpkt_flags = (rx_status & IXGBE_RXD_STAT_VP) ? vlan_flags : 0;\n \n-#ifdef RTE_LIBRTE_IEEE1588\n \tif (rx_status & IXGBE_RXD_STAT_TMST)\n \t\tpkt_flags = pkt_flags | RTE_MBUF_F_RX_IEEE1588_TMST;\n-#endif\n+\n \treturn pkt_flags;\n }\n \ndiff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h\nindex a4d9ec9b08..2822c43aec 100644\n--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h\n+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_common.h\n@@ -276,17 +276,7 @@ ixgbe_txq_vec_setup_default(struct ixgbe_tx_queue *txq,\n static inline int\n ixgbe_rx_vec_dev_conf_condition_check_default(struct rte_eth_dev *dev)\n {\n-#ifndef RTE_LIBRTE_IEEE1588\n-\tstruct rte_eth_fdir_conf *fconf = IXGBE_DEV_FDIR_CONF(dev);\n-\n-\t/* no fdir support */\n-\tif (fconf->mode != RTE_FDIR_MODE_NONE)\n-\t\treturn -1;\n-\n-\treturn 0;\n-#else\n \tRTE_SET_USED(dev);\n \treturn -1;\n-#endif\n }\n #endif\ndiff --git a/drivers/net/ngbe/ngbe_rxtx.c b/drivers/net/ngbe/ngbe_rxtx.c\nindex 9fd24fa444..7b05509ccc 100644\n--- a/drivers/net/ngbe/ngbe_rxtx.c\n+++ b/drivers/net/ngbe/ngbe_rxtx.c\n@@ -16,12 +16,6 @@\n #include \"ngbe_ethdev.h\"\n #include \"ngbe_rxtx.h\"\n \n-#ifdef RTE_LIBRTE_IEEE1588\n-#define NGBE_TX_IEEE1588_TMST RTE_MBUF_F_TX_IEEE1588_TMST\n-#else\n-#define NGBE_TX_IEEE1588_TMST 0\n-#endif\n-\n /* Bit Mask to indicate what bits required for building Tx context */\n static const u64 NGBE_TX_OFFLOAD_MASK = (RTE_MBUF_F_TX_IP_CKSUM |\n \t\tRTE_MBUF_F_TX_OUTER_IPV6 |\n@@ -33,7 +27,7 @@ static const u64 NGBE_TX_OFFLOAD_MASK = (RTE_MBUF_F_TX_IP_CKSUM |\n \t\tRTE_MBUF_F_TX_TCP_SEG |\n \t\tRTE_MBUF_F_TX_TUNNEL_MASK |\n \t\tRTE_MBUF_F_TX_OUTER_IP_CKSUM |\n-\t\tNGBE_TX_IEEE1588_TMST);\n+\t\tRTE_MBUF_F_TX_IEEE1588_TMST);\n \n #define NGBE_TX_OFFLOAD_NOTSUP_MASK \\\n \t\t(RTE_MBUF_F_TX_OFFLOAD_MASK ^ NGBE_TX_OFFLOAD_MASK)\n@@ -739,10 +733,8 @@ ngbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t */\n \t\tcmd_type_len = NGBE_TXD_FCS;\n \n-#ifdef RTE_LIBRTE_IEEE1588\n \t\tif (ol_flags & RTE_MBUF_F_TX_IEEE1588_TMST)\n \t\t\tcmd_type_len |= NGBE_TXD_1588;\n-#endif\n \n \t\tolinfo_status = 0;\n \t\tif (tx_ol_req) {\n@@ -920,7 +912,6 @@ ngbe_rxd_pkt_info_to_pkt_flags(uint32_t pkt_info)\n \t\tRTE_MBUF_F_RX_RSS_HASH, 0, 0, 0,\n \t\t0, 0, 0, RTE_MBUF_F_RX_FDIR,\n \t};\n-#ifdef RTE_LIBRTE_IEEE1588\n \tstatic uint64_t ip_pkt_etqf_map[8] = {\n \t\t0, 0, 0, RTE_MBUF_F_RX_IEEE1588_PTP,\n \t\t0, 0, 0, 0,\n@@ -931,9 +922,6 @@ ngbe_rxd_pkt_info_to_pkt_flags(uint32_t pkt_info)\n \t\t ip_rss_types_map[NGBE_RXD_RSSTYPE(pkt_info)];\n \telse\n \t\treturn ip_rss_types_map[NGBE_RXD_RSSTYPE(pkt_info)];\n-#else\n-\treturn ip_rss_types_map[NGBE_RXD_RSSTYPE(pkt_info)];\n-#endif\n }\n \n static inline uint64_t\n@@ -950,10 +938,9 @@ rx_desc_status_to_pkt_flags(uint32_t rx_status, uint64_t vlan_flags)\n \t\t vlan_flags & RTE_MBUF_F_RX_VLAN_STRIPPED)\n \t\t ? vlan_flags : 0;\n \n-#ifdef RTE_LIBRTE_IEEE1588\n \tif (rx_status & NGBE_RXD_STAT_1588)\n \t\tpkt_flags = pkt_flags | RTE_MBUF_F_RX_IEEE1588_TMST;\n-#endif\n+\n \treturn pkt_flags;\n }\n \ndiff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c\nindex ac1bba08a3..ba127bb790 100644\n--- a/drivers/net/txgbe/txgbe_rxtx.c\n+++ b/drivers/net/txgbe/txgbe_rxtx.c\n@@ -42,12 +42,6 @@\n #include \"txgbe_ethdev.h\"\n #include \"txgbe_rxtx.h\"\n \n-#ifdef RTE_LIBRTE_IEEE1588\n-#define TXGBE_TX_IEEE1588_TMST RTE_MBUF_F_TX_IEEE1588_TMST\n-#else\n-#define TXGBE_TX_IEEE1588_TMST 0\n-#endif\n-\n /* Bit Mask to indicate what bits required for building TX context */\n static const u64 TXGBE_TX_OFFLOAD_MASK = (RTE_MBUF_F_TX_IP_CKSUM |\n \t\tRTE_MBUF_F_TX_OUTER_IPV6 |\n@@ -63,7 +57,7 @@ static const u64 TXGBE_TX_OFFLOAD_MASK = (RTE_MBUF_F_TX_IP_CKSUM |\n #ifdef RTE_LIB_SECURITY\n \t\tRTE_MBUF_F_TX_SEC_OFFLOAD |\n #endif\n-\t\tTXGBE_TX_IEEE1588_TMST);\n+\t\tRTE_MBUF_F_TX_IEEE1588_TMST);\n \n #define TXGBE_TX_OFFLOAD_NOTSUP_MASK \\\n \t\t(RTE_MBUF_F_TX_OFFLOAD_MASK ^ TXGBE_TX_OFFLOAD_MASK)\n@@ -915,10 +909,8 @@ txgbe_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n \t\t */\n \t\tcmd_type_len = TXGBE_TXD_FCS;\n \n-#ifdef RTE_LIBRTE_IEEE1588\n \t\tif (ol_flags & RTE_MBUF_F_TX_IEEE1588_TMST)\n \t\t\tcmd_type_len |= TXGBE_TXD_1588;\n-#endif\n \n \t\tolinfo_status = 0;\n \t\tif (tx_ol_req) {\n@@ -1102,7 +1094,6 @@ txgbe_rxd_pkt_info_to_pkt_flags(uint32_t pkt_info)\n \t\tRTE_MBUF_F_RX_RSS_HASH, 0, 0, 0,\n \t\t0, 0, 0, RTE_MBUF_F_RX_FDIR,\n \t};\n-#ifdef RTE_LIBRTE_IEEE1588\n \tstatic uint64_t ip_pkt_etqf_map[8] = {\n \t\t0, 0, 0, RTE_MBUF_F_RX_IEEE1588_PTP,\n \t\t0, 0, 0, 0,\n@@ -1113,9 +1104,6 @@ txgbe_rxd_pkt_info_to_pkt_flags(uint32_t pkt_info)\n \t\t ip_rss_types_map[TXGBE_RXD_RSSTYPE(pkt_info)];\n \telse\n \t\treturn ip_rss_types_map[TXGBE_RXD_RSSTYPE(pkt_info)];\n-#else\n-\treturn ip_rss_types_map[TXGBE_RXD_RSSTYPE(pkt_info)];\n-#endif\n }\n \n static inline uint64_t\n@@ -1132,10 +1120,9 @@ rx_desc_status_to_pkt_flags(uint32_t rx_status, uint64_t vlan_flags)\n \t\t vlan_flags & RTE_MBUF_F_RX_VLAN_STRIPPED)\n \t\t ? vlan_flags : 0;\n \n-#ifdef RTE_LIBRTE_IEEE1588\n \tif (rx_status & TXGBE_RXD_STAT_1588)\n \t\tpkt_flags = pkt_flags | RTE_MBUF_F_RX_IEEE1588_TMST;\n-#endif\n+\n \treturn pkt_flags;\n }\n \n", "prefixes": [] }