This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".

The branch, master has been updated via 7599dfb05bf942eaad227462f1a58a78aac9e67d (commit) from c175ae14ed7122dce26e89a4fc464eba7208bb22 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 7599dfb05bf942eaad227462f1a58a78aac9e67d Author: Matias Elo matias.elo@nokia.com Date: Wed Feb 14 11:03:49 2018 +0200

linux-gen: dpdk: port ID is two bytes long

Starting from DPDK v17.05 port ID is 2 bytes long.

Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --git a/platform/linux-generic/include/odp_packet_dpdk.h b/platform/linux-generic/include/odp_packet_dpdk.h index 24292655..ec60b872 100644 --- a/platform/linux-generic/include/odp_packet_dpdk.h +++ b/platform/linux-generic/include/odp_packet_dpdk.h @@ -54,13 +54,13 @@ typedef struct ODP_ALIGNED_CACHE { unsigned min_rx_burst; /**< minimum RX burst size */ odp_pktin_hash_proto_t hash; /**< Packet input hash protocol */ uint16_t mtu; /**< maximum transmission unit */ + uint16_t port_id; /**< DPDK port identifier */ /** Use system call to get/set vdev promisc mode */ uint8_t vdev_sysc_promisc; uint8_t lockless_rx; /**< no locking for rx */ uint8_t lockless_tx; /**< no locking for tx */ - uint8_t port_id; /**< DPDK port identifier */ - /* --- 34 bytes --- */ - odp_ticketlock_t rx_lock[PKTIO_MAX_QUEUES]; /**< RX queue locks */ + /** RX queue locks */ + odp_ticketlock_t ODP_ALIGNED_CACHE rx_lock[PKTIO_MAX_QUEUES]; odp_ticketlock_t tx_lock[PKTIO_MAX_QUEUES]; /**< TX queue locks */ /** cache for storing extra RX packets */ pkt_cache_t rx_cache[PKTIO_MAX_QUEUES]; diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index dd9da264..6dc60238 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -820,7 +820,7 @@ static int dpdk_netdev_is_valid(const char *s) return 1; }

-static uint32_t dpdk_vdev_mtu_get(uint8_t port_id) +static uint32_t dpdk_vdev_mtu_get(uint16_t port_id) { struct rte_eth_dev_info dev_info; struct ifreq ifr; @@ -871,7 +871,7 @@ static uint32_t dpdk_frame_maxlen(pktio_entry_t *pktio_entry) return pkt_dpdk->mtu; }

-static int dpdk_vdev_promisc_mode_get(uint8_t port_id) +static int dpdk_vdev_promisc_mode_get(uint16_t port_id) { struct rte_eth_dev_info dev_info; struct ifreq ifr; @@ -894,7 +894,7 @@ static int dpdk_vdev_promisc_mode_get(uint8_t port_id) return mode; }

-static int dpdk_vdev_promisc_mode_set(uint8_t port_id, int enable) +static int dpdk_vdev_promisc_mode_set(uint16_t port_id, int enable) { struct rte_eth_dev_info dev_info; struct ifreq ifr; @@ -1150,7 +1150,7 @@ static int dpdk_pktio_term(void) return 0;

#if RTE_VERSION >= RTE_VERSION_NUM(17, 8, 0, 0) - uint8_t port_id; + uint16_t port_id;

RTE_ETH_FOREACH_DEV(port_id) { rte_eth_dev_close(port_id); @@ -1409,7 +1409,7 @@ static int dpdk_start(pktio_entry_t *pktio_entry) struct rte_eth_dev_info dev_info; struct rte_eth_rxconf *rxconf; pkt_dpdk_t *pkt_dpdk = &pktio_entry->s.pkt_dpdk; - uint8_t port_id = pkt_dpdk->port_id; + uint16_t port_id = pkt_dpdk->port_id; int ret; unsigned i;

@@ -1653,7 +1653,7 @@ static int dpdk_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr)

static int dpdk_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable) { - uint8_t port_id = pktio_entry->s.pkt_dpdk.port_id; + uint16_t port_id = pktio_entry->s.pkt_dpdk.port_id;

if (pktio_entry->s.pkt_dpdk.vdev_sysc_promisc) return dpdk_vdev_promisc_mode_set(port_id, enable); @@ -1668,7 +1668,7 @@ static int dpdk_promisc_mode_set(pktio_entry_t *pktio_entry, odp_bool_t enable)

static int dpdk_promisc_mode_get(pktio_entry_t *pktio_entry) { - uint8_t port_id = pktio_entry->s.pkt_dpdk.port_id; + uint16_t port_id = pktio_entry->s.pkt_dpdk.port_id;

if (pktio_entry->s.pkt_dpdk.vdev_sysc_promisc) return dpdk_vdev_promisc_mode_get(port_id);

-----------------------------------------------------------------------

Summary of changes: platform/linux-generic/include/odp_packet_dpdk.h | 6 +++--- platform/linux-generic/pktio/dpdk.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-)

hooks/post-receive