From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by dpdk.org (Postfix) with ESMTP id 18EA31B171 for ; Tue, 23 Jan 2018 00:55:10 +0100 (CET) Received: by mail-pg0-f68.google.com with SMTP id s9so8332681pgq.13 for ; Mon, 22 Jan 2018 15:55:10 -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=oVFu77VbbTzJGVo667hJ+rrZqNN98XEKOX4cQerQLLM=; b=UPcc2I8rmhGlRuueLhaiSKWMVbrWrXOQwq9whg1ZhWqdqlHRwILqg/vm3rQEvQPmJ6 z64KqON/b7tJFPU/s2OUfyOgKwe/0CelFvdt9uk0MbANzbetE8tAHOG9/x74YpjIyGSW kQgX+ssaZ5gUlH449JBcs3vsHaf3AJ5AQ1wxqAK5Q1jBVfyuYfihQnCig1UZdddvH9le +RMxS31OSNzXK2jU18wX3afpx5JJhqLpk2OXT8z3GyvkTNlCBTnX+3q8dSa30pWyyhTI ijOit28O9QOdT1RahQKvdwlcNPziJIRK39QQWECxYpjD9Tr9B7xbDk25r6LIzFiEgA5T 0nYQ== 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=oVFu77VbbTzJGVo667hJ+rrZqNN98XEKOX4cQerQLLM=; b=pFMOfYYzZRnQZ8c2EZfI5qwMbNkK9lOwYzb5K35NN6etZsvZf+q9wh/YIMr8YDz39S B438u7fI7YGEgSJjcz266X5DDbjtsISGoG8GE5MlnSyk30XjwT0oJBrXI7ZC6eRfK+En EzUsIb6iPs8Lry0Md5bgrZoh/Vr8exbSxQZXbgiiLKTw3jjXcG/TixyBM2WIkucJPZLD dOEh1zes6Xh+Iuu6GO2k2aAbrtUXFboypVhFx0NOqHnz0hg+Z6N05xB0BKypIrrfiNA1 CvkRdAh20S+M7e6uVwVvtMT9lxg4iFdoYQ5gFeKkiRlyMen6sxivabRgYK8KUNh3MeM5 wZug== X-Gm-Message-State: AKwxytf3oQ2nXyWXElIMHMcwreMqo4k+bTe42yNeStj89mpo9NJvVIT5 aOIV5jhPzA9+x1zbH6k6i7YwYIZ9+jk= X-Google-Smtp-Source: AH8x224sO53kv4wT8W5za/uLJ2IHuFddMWetwoNnlVVbBhNohjMm7VBkDOm0h/9eII2InjXR7/FdPA== X-Received: by 2002:a17:902:2983:: with SMTP id h3-v6mr3885596plb.76.1516665309768; Mon, 22 Jan 2018 15:55:09 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id a24sm1623825pff.160.2018.01.22.15.55.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 15:55:08 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Ferruh Yigit Date: Mon, 22 Jan 2018 15:54:49 -0800 Message-Id: <20180122235458.28562-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180122235458.28562-1-stephen@networkplumber.org> References: <20180122235458.28562-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v7 06/15] net/nfp: use rte_eth_linkstatus 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: Mon, 22 Jan 2018 23:55:11 -0000 Use new rte_eth_linkstatus_get/set helper function. Signed-off-by: Stephen Hemminger Signed-off-by: Ferruh Yigit --- drivers/net/nfp/nfp_net.c | 77 +++++------------------------------------------ 1 file changed, 7 insertions(+), 70 deletions(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index 0044699237ac..7c9832374027 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -213,57 +213,6 @@ nn_cfg_writeq(struct nfp_net_hw *hw, int off, uint64_t val) nn_writeq(rte_cpu_to_le_64(val), hw->ctrl_bar + off); } -/* - * Atomically reads link status information from global structure rte_eth_dev. - * - * @param dev - * - Pointer to the structure rte_eth_dev to read from. - * - Pointer to the buffer to be saved with the link status. - * - * @return - * - On success, zero. - * - On failure, negative value. - */ -static inline int -nfp_net_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; -} - -/* - * Atomically writes the link status information into global - * structure rte_eth_dev. - * - * @param dev - * - Pointer to the structure rte_eth_dev to read from. - * - Pointer to the buffer to be saved with the link status. - * - * @return - * - On success, zero. - * - On failure, negative value. - */ -static inline int -nfp_net_dev_atomic_write_link_status(struct rte_eth_dev *dev, - struct rte_eth_link *link) -{ - struct rte_eth_link *dst = &dev->data->dev_link; - struct rte_eth_link *src = link; - - if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst, - *(uint64_t *)src) == 0) - return -1; - - return 0; -} - static void nfp_net_rx_queue_release_mbufs(struct nfp_net_rxq *rxq) { @@ -999,7 +948,7 @@ static int nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) { struct nfp_net_hw *hw; - struct rte_eth_link link, old; + struct rte_eth_link link; uint32_t nn_link_status; static const uint32_t ls_to_ethtool[] = { @@ -1017,9 +966,6 @@ nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); - memset(&old, 0, sizeof(old)); - nfp_net_dev_atomic_read_link_status(dev, &old); - nn_link_status = nn_cfg_readl(hw, NFP_NET_CFG_STS); memset(&link, 0, sizeof(struct rte_eth_link)); @@ -1037,16 +983,10 @@ nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) else link.link_speed = ls_to_ethtool[nn_link_status]; - if (old.link_status != link.link_status) { - nfp_net_dev_atomic_write_link_status(dev, &link); - if (link.link_status) - PMD_DRV_LOG(INFO, "NIC Link is Up\n"); - else - PMD_DRV_LOG(INFO, "NIC Link is Down\n"); - return 0; - } - - return -1; + if (rte_eth_linkstatus_set(dev, &link)) + PMD_DRV_LOG(INFO, "NIC Link is %s\n", + link.link_status ? "Up" : "Down"); + return 0; } static int @@ -1376,8 +1316,7 @@ nfp_net_dev_link_status_print(struct rte_eth_dev *dev) struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_eth_link link; - memset(&link, 0, sizeof(link)); - nfp_net_dev_atomic_read_link_status(dev, &link); + rte_eth_linkstatus_get(dev, &link); if (link.link_status) RTE_LOG(INFO, PMD, "Port %d: Link Up - speed %u Mbps - %s\n", dev->data->port_id, link.link_speed, @@ -1430,9 +1369,7 @@ nfp_net_dev_interrupt_handler(void *param) PMD_DRV_LOG(DEBUG, "We got a LSC interrupt!!!\n"); - /* get the link status */ - memset(&link, 0, sizeof(link)); - nfp_net_dev_atomic_read_link_status(dev, &link); + rte_eth_linkstatus_get(dev, &link); nfp_net_link_update(dev, 0); -- 2.15.1