From 422aa32c4c502e99013549e0933eb723fc535305 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Fri, 10 Jul 2020 21:51:29 +0530 Subject: [PATCH 1/1] net/dpaa2: remove Rx timestamp enable PMD API This experimental API is no longer required as the same purpose can be solved with standard DEV_RX_OFFLOAD_TIMESTAMP Signed-off-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_ethdev.c | 8 +------- drivers/net/dpaa2/dpaa2_ethdev.h | 2 +- drivers/net/dpaa2/dpaa2_rxtx.c | 2 +- drivers/net/dpaa2/rte_pmd_dpaa2.h | 21 +-------------------- drivers/net/dpaa2/rte_pmd_dpaa2_version.map | 1 - 5 files changed, 4 insertions(+), 30 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index e0833b7348..d6658f20bf 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -64,7 +64,7 @@ static uint64_t dev_tx_offloads_nodis = DEV_TX_OFFLOAD_MULTI_SEGS; /* enable timestamp in mbuf */ -enum pmd_dpaa2_ts dpaa2_enable_ts; +bool dpaa2_enable_ts; struct rte_dpaa2_xstats_name_off { char name[RTE_ETH_XSTATS_NAME_SIZE]; @@ -106,12 +106,6 @@ static int dpaa2_dev_set_link_up(struct rte_eth_dev *dev); static int dpaa2_dev_set_link_down(struct rte_eth_dev *dev); static int dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); -void -rte_pmd_dpaa2_set_timestamp(enum pmd_dpaa2_ts enable) -{ - dpaa2_enable_ts = enable; -} - static int dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) { diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 2bc0f3f5a8..2e6d26d4f9 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -91,7 +91,7 @@ #define DPAA2_PKT_TYPE_VLAN_2 0x0260 /* enable timestamp in mbuf*/ -extern enum pmd_dpaa2_ts dpaa2_enable_ts; +extern bool dpaa2_enable_ts; #define DPAA2_QOS_TABLE_RECONFIGURE 1 #define DPAA2_FS_TABLE_RECONFIGURE 2 diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index eb2e84256d..86cb952684 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -108,7 +108,7 @@ dpaa2_dev_rx_parse_new(struct rte_mbuf *m, const struct qbman_fd *fd, m->hash.rss = fd->simple.flc_hi; m->ol_flags |= PKT_RX_RSS_HASH; - if (dpaa2_enable_ts == PMD_DPAA2_ENABLE_TS) { + if (dpaa2_enable_ts) { m->timestamp = annotation->word2; m->ol_flags |= PKT_RX_TIMESTAMP; DPAA2_PMD_DP_DEBUG("pkt timestamp:0x%" PRIx64 "", m->timestamp); diff --git a/drivers/net/dpaa2/rte_pmd_dpaa2.h b/drivers/net/dpaa2/rte_pmd_dpaa2.h index ca7bf7d468..ec8df75af9 100644 --- a/drivers/net/dpaa2/rte_pmd_dpaa2.h +++ b/drivers/net/dpaa2/rte_pmd_dpaa2.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2018-2019 NXP + * Copyright 2018-2020 NXP */ #ifndef _RTE_PMD_DPAA2_H @@ -17,25 +17,6 @@ #include -enum pmd_dpaa2_ts { - PMD_DPAA2_DISABLE_TS, - PMD_DPAA2_ENABLE_TS -}; - -/** - * @warning - * @b EXPERIMENTAL: this API may change, or be removed, without prior notice - * - * Enable/Disable timestamping update in mbuf for LX2160 kind of devices. - * For LS2088/LS1088 devices, timestamping will be updated in mbuf without - * calling this API. - * - * @param pmd_dpaa2_ts - * Enum to enable/disable timestamp update in mbuf for LX2160 devices. - */ -__rte_experimental -void rte_pmd_dpaa2_set_timestamp(enum pmd_dpaa2_ts); - /** * @warning * @b EXPERIMENTAL: this API may change, or be removed, without prior notice diff --git a/drivers/net/dpaa2/rte_pmd_dpaa2_version.map b/drivers/net/dpaa2/rte_pmd_dpaa2_version.map index c3a457d2b9..72d1b2b1c8 100644 --- a/drivers/net/dpaa2/rte_pmd_dpaa2_version.map +++ b/drivers/net/dpaa2/rte_pmd_dpaa2_version.map @@ -3,7 +3,6 @@ EXPERIMENTAL { rte_pmd_dpaa2_mux_flow_create; rte_pmd_dpaa2_set_custom_hash; - rte_pmd_dpaa2_set_timestamp; }; INTERNAL { -- 2.20.1