From patchwork Mon Oct 28 10:49:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 62103 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B50F21BEE4; Mon, 28 Oct 2019 11:50:04 +0100 (CET) Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by dpdk.org (Postfix) with ESMTP id A00221BEE3 for ; Mon, 28 Oct 2019 11:50:02 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 4E85D48F; Mon, 28 Oct 2019 06:50:01 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 28 Oct 2019 06:50:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=ei+SYFNd143byg4d1PEz9rm HDC8n/Fjv6M6rIVsFEQY=; b=WTXkA1xFTCylliAFBxtknryV8SfUW1ho+dXlwDL P47EcsTCN6mPBgfe8n8Fg7mYHBGh4VENKbDVuS9Oa7JCLoUQfZHrU11jxgwh9zSF gBbv5whyVq9gB2/04DnOFhwVOKC8jPkrk9CQ4nMjAs/fi2Iik/GpzjUA9/hF7DGG GFT8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=ei+SYFNd143byg4d1 PEz9rmHDC8n/Fjv6M6rIVsFEQY=; b=I4yxH9An6nT+qvtJrsbJuwRuo/zQTVbgF TG/zPx7Pb7H+FvCaYXtmRlH41yZnYhOWMcVSDXyihkMUxGVKmHvQ6rdhciHjCZZy EUVgF0mAsykrqAfrc78TaROucL+V6EoKhH6jEGI0wGaSaKL84TEuF/jp9OP3nQFE Ejz4PKYvpyOSlbKIzAqzV/8PQrz4gtFLeKrbVDgY19YLnqfV50TBvtJZrfhplPMf pdBMHy0GFsVmlOU1mJAk938DvdUjSJhrsy5Pj6Z3aLJKqYNC/1HrG6lOamh0bJv+ G9fMawV+e6X07ypXI8wofD04Nbl2Vj5su4vcNYTd45PNwkOTCHBFQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrleelgddvtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghsucfo ohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucfkphepje ejrddufeegrddvtdefrddukeegnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgr shesmhhonhhjrghlohhnrdhnvghtnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 1560E8005B; Mon, 28 Oct 2019 06:49:57 -0400 (EDT) From: Thomas Monjalon To: Neil Horman , John McNamara , Marko Kovacevic , Ferruh Yigit , Andrew Rybchenko Cc: dev@dpdk.org Date: Mon, 28 Oct 2019 11:49:34 +0100 Message-Id: <20191028104934.21174-1-thomas@monjalon.net> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] ethdev: remove deprecated port count function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The function rte_eth_dev_count() was marked as deprecated in DPDK 18.05 in commit d9a42a69febf ("ethdev: deprecate port count function"). It was planned to be removed after 19.11 LTS release, but given we must not break ABI between 19.11 and 20.11, it is removed now. Note the ABI version is not dumped in this commit because other changes already did. Signed-off-by: Thomas Monjalon Reviewed-by: David Marchand Reviewed-by: Andrew Rybchenko Acked-by: Neil Horman Reviewed-by: Jerin Jacob --- doc/guides/rel_notes/deprecation.rst | 5 ----- doc/guides/rel_notes/release_19_11.rst | 5 +++++ lib/librte_ethdev/rte_ethdev.c | 6 ------ lib/librte_ethdev/rte_ethdev.h | 15 --------------- lib/librte_ethdev/rte_ethdev_version.map | 1 - 5 files changed, 5 insertions(+), 27 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 4249aab833..c10dc301b2 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -48,11 +48,6 @@ Deprecation Notices structure would be made internal (or removed if all dependencies are cleared) in future releases. -* ethdev: The function ``rte_eth_dev_count`` will be removed in DPDK 20.02. - It is replaced by the function ``rte_eth_dev_count_avail``. - If the intent is to iterate over ports, ``RTE_ETH_FOREACH_*`` macros - are better port iterators. - * ethdev: the legacy filter API, including ``rte_eth_dev_filter_supported()``, ``rte_eth_dev_filter_ctrl()`` as well as filter types MACVLAN, ETHERTYPE, FLEXIBLE, SYN, NTUPLE, TUNNEL, FDIR, diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/release_19_11.rst index ae8e7b2f09..fdba8af04a 100644 --- a/doc/guides/rel_notes/release_19_11.rst +++ b/doc/guides/rel_notes/release_19_11.rst @@ -333,6 +333,11 @@ API Changes * ethdev: changed ``rte_eth_dev_owner_delete`` return value from ``void`` to ``int`` to provide a way to report various error conditions. +* ethdev: The deprecated function ``rte_eth_dev_count`` was removed. + The function ``rte_eth_dev_count_avail`` is a drop-in replacement. + If the intent is to iterate over ports, ``RTE_ETH_FOREACH_*`` macros + are better port iterators. + * event: The function ``rte_event_eth_tx_adapter_enqueue`` takes an additional input as ``flags``. Flag ``RTE_EVENT_ETH_TX_ADAPTER_ENQUEUE_SAME_DEST`` which has been introduced in this release is used when used when all the packets diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 7743205d38..809da09cfc 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -772,12 +772,6 @@ rte_eth_dev_get_sec_ctx(uint16_t port_id) return rte_eth_devices[port_id].security_ctx; } -uint16_t -rte_eth_dev_count(void) -{ - return rte_eth_dev_count_avail(); -} - uint16_t rte_eth_dev_count_avail(void) { diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index c36c1b631f..98b1db8a6e 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -1653,21 +1653,6 @@ __rte_experimental int rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner); -/** - * Get the total number of Ethernet devices that have been successfully - * initialized by the matching Ethernet driver during the PCI probing phase - * and that are available for applications to use. These devices must be - * accessed by using the ``RTE_ETH_FOREACH_DEV()`` macro to deal with - * non-contiguous ranges of devices. - * These non-contiguous ranges can be created by calls to hotplug functions or - * by some PMDs. - * - * @return - * - The total number of usable Ethernet devices. - */ -__rte_deprecated -uint16_t rte_eth_dev_count(void); - /** * Get the number of ports which are usable for the application. * diff --git a/lib/librte_ethdev/rte_ethdev_version.map b/lib/librte_ethdev/rte_ethdev_version.map index e59d51648f..4b31668a55 100644 --- a/lib/librte_ethdev/rte_ethdev_version.map +++ b/lib/librte_ethdev/rte_ethdev_version.map @@ -12,7 +12,6 @@ DPDK_2.2 { rte_eth_dev_callback_unregister; rte_eth_dev_close; rte_eth_dev_configure; - rte_eth_dev_count; rte_eth_dev_default_mac_addr_set; rte_eth_dev_filter_supported; rte_eth_dev_flow_ctrl_get;