From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by dpdk.org (Postfix) with ESMTP id E286D558A for ; Mon, 14 Mar 2016 22:57:32 +0100 (CET) Received: by mail-wm0-f42.google.com with SMTP id p65so1798810wmp.0 for ; Mon, 14 Mar 2016 14:57:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rVuNJzYr5+AeX0WXqwDYjYPwf7A7NsHTGf2d+byNOPk=; b=Frl8an58XIclzYnX2gbfngVsnsuo967l6MogKwok+9MQmT6BOj16fJRZPQZyJ2IXnC GAjtgmtsz4dHA/Jzk9wtUiw/9ktRyh+QgbFYEONegKnVoFKHJk7lXvdHjArdyp2CyiGK dtQMwkyQmHollZoQQMl/03Kd9VZBvsgxxiKh6WXvVCGELyrhrHRjLpccDkKgNd/A14sl +u+8fiOGG1er5aVbt4D8cMEJ3OM/WqYOh1w3k2hr7UFNqp7N6x/ptfaa3gmoHfIsDQ5D DiDQiatUmhVqHpc3IH4drFeD8L2jNNHnVJCWDRjAE3DiBFiVmjXFtQzlT+Chsin+t6F6 YFLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rVuNJzYr5+AeX0WXqwDYjYPwf7A7NsHTGf2d+byNOPk=; b=izQFnZlpGEvY554VFSM6U76s6otUS7FZ+Pq2VfGKNr4gmy7dOF3Fwlej7xeCFAt3SA I/0s8geE/X9bzjQhVt5yup8+9GOoqu9qTEh7F0WbBcUV4t4dCUvd5+khp/J+09cNmTjc MfdMLQYdTjbh/zuX4+C6sf1gff2lhbxiLyvVjFLbiF1yo/1RyPoubuR3SvVsXyPxRbQw TvnqiWL0b7uP8T/CxYdHz/j2Tm1UepwW/OfhxpoVYLiiV6yjQOm6ezk0od1Qbz2HeME0 4DPULRJuYbo9AWWpAd6P0vmEq4NRI2Z67fZ0lkH4rJ6t17lma5ZO3nF9oeD0D5Fbcn15 SwdA== X-Gm-Message-State: AD7BkJKfIrFVGm3ZTc2Oc5FpsiFc8g0mx+ZkyEvF7r9RFVymA+0hOyD13u1BS/DRTbAugsPn X-Received: by 10.194.184.112 with SMTP id et16mr26837774wjc.75.1457992652793; Mon, 14 Mar 2016 14:57:32 -0700 (PDT) Received: from XPS13.localdomain (91.111.75.86.rev.sfr.net. [86.75.111.91]) by smtp.gmail.com with ESMTPSA id w133sm17918804wmd.3.2016.03.14.14.57.31 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 14 Mar 2016 14:57:32 -0700 (PDT) From: Thomas Monjalon To: marcdevel@gmail.com, bruce.richardson@intel.com, declan.doherty@intel.com, konstantin.ananyev@intel.com, wenzhuo.lu@intel.com, helin.zhang@intel.com, jing.d.chen@intel.com, harish.patil@qlogic.com, rahul.lakkireddy@chelsio.com, johndale@cisco.com, vido@cesnet.cz, adrien.mazarguil@6wind.com, alejandro.lucero@netronome.com Cc: dev@dpdk.org Date: Mon, 14 Mar 2016 22:55:45 +0100 Message-Id: <1457992546-32230-8-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457992546-32230-1-git-send-email-thomas.monjalon@6wind.com> References: <1456793151-1475-1-git-send-email-marcdevel@gmail.com> <1457992546-32230-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH v10 7/8] ethdev: convert speed number to bitmap flag X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Mar 2016 21:57:33 -0000 From: Marc Sune It is a helper for the bitmap configuration. Signed-off-by: Marc Sune Signed-off-by: Thomas Monjalon --- lib/librte_ether/rte_ethdev.c | 31 +++++++++++++++++++++++++++++++ lib/librte_ether/rte_ethdev.h | 13 +++++++++++++ lib/librte_ether/rte_ether_version.map | 1 + 3 files changed, 45 insertions(+) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index f0e7473..4594f41 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -862,6 +862,37 @@ rte_eth_dev_tx_queue_config(struct rte_eth_dev *dev, uint16_t nb_queues) return 0; } +uint32_t +rte_eth_speed_bitflag(uint32_t speed, int duplex) +{ + switch (speed) { + case ETH_SPEED_NUM_10M: + return duplex ? ETH_LINK_SPEED_10M : ETH_LINK_SPEED_10M_HD; + case ETH_SPEED_NUM_100M: + return duplex ? ETH_LINK_SPEED_100M : ETH_LINK_SPEED_100M_HD; + case ETH_SPEED_NUM_1G: + return ETH_LINK_SPEED_1G; + case ETH_SPEED_NUM_2_5G: + return ETH_LINK_SPEED_2_5G; + case ETH_SPEED_NUM_5G: + return ETH_LINK_SPEED_5G; + case ETH_SPEED_NUM_10G: + return ETH_LINK_SPEED_10G; + case ETH_SPEED_NUM_20G: + return ETH_LINK_SPEED_20G; + case ETH_SPEED_NUM_25G: + return ETH_LINK_SPEED_25G; + case ETH_SPEED_NUM_40G: + return ETH_LINK_SPEED_40G; + case ETH_SPEED_NUM_50G: + return ETH_LINK_SPEED_50G; + case ETH_SPEED_NUM_56G: + return ETH_LINK_SPEED_56G; + default: + return 0; + } +} + int rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, const struct rte_eth_conf *dev_conf) diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 08881de..5e3bd04 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1869,6 +1869,19 @@ struct eth_driver { void rte_eth_driver_register(struct eth_driver *eth_drv); /** + * Convert a numerical speed in Mbps to a bitmap flag that can be used in + * the bitmap link_speeds of the struct rte_eth_conf + * + * @param speed + * Numerical speed value in Mbps + * @param duplex + * ETH_LINK_[HALF/FULL]_DUPLEX (only for 10/100M speeds) + * @return + * 0 if the speed cannot be mapped + */ +uint32_t rte_eth_speed_bitflag(uint32_t speed, int duplex); + +/** * Configure an Ethernet device. * This function must be invoked first before any other function in the * Ethernet API. This function can also be re-invoked when a device is in the diff --git a/lib/librte_ether/rte_ether_version.map b/lib/librte_ether/rte_ether_version.map index 5cb4d79..13d9f2e 100644 --- a/lib/librte_ether/rte_ether_version.map +++ b/lib/librte_ether/rte_ether_version.map @@ -124,6 +124,7 @@ DPDK_16.04 { rte_eth_dev_set_vlan_ether_type; rte_eth_dev_udp_tunnel_port_add; rte_eth_dev_udp_tunnel_port_delete; + rte_eth_speed_bitflag; rte_eth_tx_buffer_count_callback; rte_eth_tx_buffer_drop_callback; rte_eth_tx_buffer_init; -- 2.7.0