From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 0AC8E5B40; Tue, 25 Sep 2018 11:49:49 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Sep 2018 02:49:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,301,1534834800"; d="scan'208";a="75730629" Received: from unknown (HELO localhost.localdomain.localdomain) ([10.224.122.193]) by orsmga007.jf.intel.com with ESMTP; 25 Sep 2018 02:49:47 -0700 From: Nikhil Rao To: jerin.jacob@caviumnetworks.com Cc: dev@dpdk.org, Nikhil Rao , stable@dpdk.org Date: Tue, 25 Sep 2018 15:19:05 +0530 Message-Id: <1537868945-149389-1-git-send-email-nikhil.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1536150078-89772-1-git-send-email-nikhil.rao@intel.com> References: <1536150078-89772-1-git-send-email-nikhil.rao@intel.com> Subject: [dpdk-stable] [PATCH v3] eventdev: fix port id argument in Rx adapter caps API X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Sep 2018 09:49:50 -0000 Make the ethernet port id passed into rte_event_eth_rx_adapter_caps_get() 16 bit. Also, update the event rx adapter test to use 16 bit ethernet port ids. Fixes: c2189c907dd1 ("eventdev: make ethdev port identifiers 16-bit") Cc: stable@dpdk.org Signed-off-by: Nikhil Rao Acked-by: Jerin Jacob --- v2: * squash changes to autotest and library into a single patch (Jerin Jacob) * add update to release notes (Jerin Jacob) v3: * update meson.build (Jerin Jacob) lib/librte_eventdev/rte_eventdev.h | 2 +- lib/librte_eventdev/rte_eventdev.c | 2 +- test/test/test_event_eth_rx_adapter.c | 6 +++--- doc/guides/rel_notes/release_18_11.rst | 4 +++- lib/librte_eventdev/Makefile | 2 +- lib/librte_eventdev/meson.build | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/librte_eventdev/rte_eventdev.h index a24213e..8541109 100644 --- a/lib/librte_eventdev/rte_eventdev.h +++ b/lib/librte_eventdev/rte_eventdev.h @@ -1112,7 +1112,7 @@ struct rte_event { * */ int -rte_event_eth_rx_adapter_caps_get(uint8_t dev_id, uint8_t eth_port_id, +rte_event_eth_rx_adapter_caps_get(uint8_t dev_id, uint16_t eth_port_id, uint32_t *caps); #define RTE_EVENT_TIMER_ADAPTER_CAP_INTERNAL_PORT (1ULL << 0) diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c index 0a8572b..b1914dc 100644 --- a/lib/librte_eventdev/rte_eventdev.c +++ b/lib/librte_eventdev/rte_eventdev.c @@ -109,7 +109,7 @@ } int -rte_event_eth_rx_adapter_caps_get(uint8_t dev_id, uint8_t eth_port_id, +rte_event_eth_rx_adapter_caps_get(uint8_t dev_id, uint16_t eth_port_id, uint32_t *caps) { struct rte_eventdev *dev; diff --git a/test/test/test_event_eth_rx_adapter.c b/test/test/test_event_eth_rx_adapter.c index 4641640..592bcaa 100644 --- a/test/test/test_event_eth_rx_adapter.c +++ b/test/test/test_event_eth_rx_adapter.c @@ -32,7 +32,7 @@ struct event_eth_rx_adapter_test_params { static struct event_eth_rx_adapter_test_params default_params; static inline int -port_init_common(uint8_t port, const struct rte_eth_conf *port_conf, +port_init_common(uint16_t port, const struct rte_eth_conf *port_conf, struct rte_mempool *mp) { const uint16_t rx_ring_size = 512, tx_ring_size = 512; @@ -94,7 +94,7 @@ struct event_eth_rx_adapter_test_params { } static inline int -port_init_rx_intr(uint8_t port, struct rte_mempool *mp) +port_init_rx_intr(uint16_t port, struct rte_mempool *mp) { static const struct rte_eth_conf port_conf_default = { .rxmode = { @@ -110,7 +110,7 @@ struct event_eth_rx_adapter_test_params { } static inline int -port_init(uint8_t port, struct rte_mempool *mp) +port_init(uint16_t port, struct rte_mempool *mp) { static const struct rte_eth_conf port_conf_default = { .rxmode = { diff --git a/doc/guides/rel_notes/release_18_11.rst b/doc/guides/rel_notes/release_18_11.rst index 97daad1..842b46b 100644 --- a/doc/guides/rel_notes/release_18_11.rst +++ b/doc/guides/rel_notes/release_18_11.rst @@ -99,6 +99,8 @@ API Changes flag the MAC can be properly configured in any case. This is particularly important for bonding. +* eventdev: Type of 2nd parameter to ``rte_event_eth_rx_adapter_caps_get()`` + has been changed from uint8_t to uint16_t. ABI Changes ----------- @@ -162,7 +164,7 @@ The libraries prepended with a plus sign were incremented in this version. librte_distributor.so.1 librte_eal.so.8 librte_ethdev.so.10 - librte_eventdev.so.4 + + librte_eventdev.so.6 librte_flow_classify.so.1 librte_gro.so.1 librte_gso.so.1 diff --git a/lib/librte_eventdev/Makefile b/lib/librte_eventdev/Makefile index 47f599a..ce800ea 100644 --- a/lib/librte_eventdev/Makefile +++ b/lib/librte_eventdev/Makefile @@ -8,7 +8,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_eventdev.a # library version -LIBABIVER := 5 +LIBABIVER := 6 # build flags CFLAGS += -DALLOW_EXPERIMENTAL_API diff --git a/lib/librte_eventdev/meson.build b/lib/librte_eventdev/meson.build index 3cbaf29..3c4e510 100644 --- a/lib/librte_eventdev/meson.build +++ b/lib/librte_eventdev/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -version = 5 +version = 6 allow_experimental_apis = true if host_machine.system() == 'linux' -- 1.8.3.1