From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by dpdk.org (Postfix) with ESMTP id 79A811B350 for ; Tue, 16 Jan 2018 19:26:05 +0100 (CET) Received: by mail-pg0-f66.google.com with SMTP id z17so9916643pgc.4 for ; Tue, 16 Jan 2018 10:26:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MilCPq+sKXQ9iqiHrepPC9qsJ5QTKPFy1cPHKZYuZro=; b=SyUZCSRT53NJ/Kq+4jZ0id91JNq37NmRzge/8ltoW5zYtrbMzTHXcCDtW7dvOf3AY5 mbgFjQaoD6ghZTKfZwvMCbRDFYN5MpeZB/SoIR9qlqc5fYKq7bM6k82lbYdwJfGTXoyQ 6X5PVsrr9MJLPIo/zdhLKD43BPfgvF398X4NNV/jSnlRNBEOo5sj3mXXutS0sEVz6jpl gmC+lHQwjHC5fp8xq/Pxt/bt+HYs9zrjf0zYFAHIXcS1ycpPfGj+gp6RimbuyVak5hzd 8ixKYQ+9D3CQpBRey3a+QMwoE2kRBdG99g5LcO2TjOhvMIhxEQqjTpBvQaAADoZbBBxO ZtsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MilCPq+sKXQ9iqiHrepPC9qsJ5QTKPFy1cPHKZYuZro=; b=Zt8MVi13+lfZUjG3VnJj7KeOL3kmgR+t+4P37+ev+k4O8LFFqBIFMPZagF297wdZ9z a5AwpcFDFW1BV16QFoPFS9sS55beWnTFdcBedtgF8yuBwSYfytWqXUubMs7kBXhh2KWp cV2suPb1V1jA8xThEtZp6KuMlc0Wsq0NhU/uRv49ggOGUiVj9ze0lSt9sLdbNoeDbZG4 LfmgrB38XMIamEKHcI+MN+ZN44CGLx0NSwHVu8YvguG/aHVzOxrqP2j3KUzykJr4nygj KPNeiroaGtlDF0m9bawwxWdj3drpt8jDxF6p7NURXbojiI1loP+r11qTqh2mahMHIEZN lj6g== X-Gm-Message-State: AKGB3mIMRq2bF4FlumYkfoj9I5K1W/OM1ElDqA+5WPkju08spXquIqR+ O+K7psFVz7b5Vn0Q5adqIj8pTCgyqQc= X-Google-Smtp-Source: ACJfBotFNo+NTGMzmvICoUlj+wZiRz3MVIgjirgQG0CRa1xxekH9B8e9Wjj+eF2N01pOFHmhf4JVJw== X-Received: by 10.99.122.18 with SMTP id v18mr23485225pgc.128.1516127164251; Tue, 16 Jan 2018 10:26:04 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id x17sm3940497pge.50.2018.01.16.10.26.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 10:26:03 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 16 Jan 2018 10:25:45 -0800 Message-Id: <20180116182558.6254-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180116182558.6254-1-stephen@networkplumber.org> References: <20180116182558.6254-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v4 02/15] ethdev: add linkstatus get/set helper functions 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: , X-List-Received-Date: Tue, 16 Jan 2018 18:26:05 -0000 Many drivers are all doing copy/paste of the same code to atomically update the link status. Reduce duplication, and allow for future changes by having common function for this. Signed-off-by: Stephen Hemminger --- lib/librte_ether/rte_ethdev.c | 22 +++------------ lib/librte_ether/rte_ethdev.h | 62 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 18 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index a524af740f4a..d6433af35a19 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -1447,20 +1447,6 @@ rte_eth_allmulticast_get(uint16_t port_id) return dev->data->all_multicast; } -static inline int -rte_eth_dev_atomic_read_link_status(struct rte_eth_dev *dev, - struct rte_eth_link *link) -{ - struct rte_eth_link *dst = link; - struct rte_eth_link *src = &(dev->data->dev_link); - - if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst, - *(uint64_t *)src) == 0) - return -1; - - return 0; -} - void rte_eth_link_get(uint16_t port_id, struct rte_eth_link *eth_link) { @@ -1469,8 +1455,8 @@ rte_eth_link_get(uint16_t port_id, struct rte_eth_link *eth_link) RTE_ETH_VALID_PORTID_OR_RET(port_id); dev = &rte_eth_devices[port_id]; - if (dev->data->dev_conf.intr_conf.lsc != 0) - rte_eth_dev_atomic_read_link_status(dev, eth_link); + if (dev->data->dev_conf.intr_conf.lsc) + rte_eth_linkstatus_get(dev, eth_link); else { RTE_FUNC_PTR_OR_RET(*dev->dev_ops->link_update); (*dev->dev_ops->link_update)(dev, 1); @@ -1486,8 +1472,8 @@ rte_eth_link_get_nowait(uint16_t port_id, struct rte_eth_link *eth_link) RTE_ETH_VALID_PORTID_OR_RET(port_id); dev = &rte_eth_devices[port_id]; - if (dev->data->dev_conf.intr_conf.lsc != 0) - rte_eth_dev_atomic_read_link_status(dev, eth_link); + if (dev->data->dev_conf.intr_conf.lsc) + rte_eth_linkstatus_get(dev, eth_link); else { RTE_FUNC_PTR_OR_RET(*dev->dev_ops->link_update); (*dev->dev_ops->link_update)(dev, 0); diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index b10e2a92da71..ec8255656967 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -2218,6 +2218,68 @@ int rte_eth_dev_set_link_down(uint16_t port_id); */ void rte_eth_dev_close(uint16_t port_id); + +/** + * @internal + * Atomically set the link status for the specific device. + * It is for use by DPDK device driver use only. + * User applications should not call it + * + * @param dev + * Pointer to struct rte_eth_dev. + * @param link + * New link status value. + * @return + * 1 if link status has changed; + * 0 if link status is unchanged. + */ +static inline int +rte_eth_linkstatus_set(struct rte_eth_dev *dev, + const struct rte_eth_link *new_link) +{ + volatile uint64_t *dev_link + = (volatile uint64_t *)&(dev->data->dev_link); + union { + uint64_t val64; + struct rte_eth_link link; + } orig; + + RTE_BUILD_BUG_ON(sizeof(*new_link) != sizeof(uint64_t)); + + orig.val64 = rte_atomic64_exchange(dev_link, + *(const uint64_t *)new_link); + + return orig.link.link_status != new_link->link_status; +} + +/** + * @internal + * Atomically get the link speed and status. + * + * @param dev + * Pointer to struct rte_eth_dev. + * @param link + * link status value. + */ +static inline void +rte_eth_linkstatus_get(const struct rte_eth_dev *dev, + struct rte_eth_link *link) +{ + volatile uint64_t *src = (uint64_t *)&(dev->data->dev_link); + uint64_t *dst = (uint64_t *)link; + + RTE_BUILD_BUG_ON(sizeof(*link) != sizeof(uint64_t)); + + /* can't use rte_atomic64_read because it returns signed int */ +#ifdef __LP64__ + *dst = *src; +#else + do { + *dst = *src; + } while (!rte_atomic64_cmpset(src, *dst, *dst)); +#endif +} + /** * Reset a Ethernet device and keep its port id. * -- 2.15.1