From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by dpdk.org (Postfix) with ESMTP id 879391B296 for ; Fri, 26 Jan 2018 03:02:01 +0100 (CET) Received: by mail-pf0-f194.google.com with SMTP id c6so7201976pfi.8 for ; Thu, 25 Jan 2018 18:02:01 -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=bME6UqA2Gvw2N3otP1d/TzkSwgTSpT7M3VpJqmD0QRA=; b=IBJf6a7zPDx7n+VtWm0mDFnN/AboecccZ192taoRYQhfDeuMFnNamLQlp6Vfixr/Zy SoxUKK23I2NG8Mujpmgnt4IXQJZCAxvsepT5ch+7kdqHxtynqdccVcZJ7jv8koxgxUGo cfKtHaYWeQLKiSmRC33yhZXYR5Ch2QG3UZGKKP4DusaPewezlgOPVs/iN5aeY1PvgTfe as2ONZIPMoz5TYznD0dSlOL4xjOH5CixxT+kpuJM0lFKoOr3Cg/6coot6jXOGcRA9rU4 2nFLXe8p1ZGfJZo7emE61bSa8QJXnDM88k190BfzGfQnBSWmwDAF7lqAbpoETYd6DDxh hnTg== 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=bME6UqA2Gvw2N3otP1d/TzkSwgTSpT7M3VpJqmD0QRA=; b=qgqboXX0SiHAbvYyWRlusZ4f3xGM/9U1kVH78nDFCDnXUUnDrZo6dHmgwfsr7SIHfl 2FqCb40JOCFUDEOBh8XhyQMaL7ZEBzgaJ6kSXDwXUELRPnYtxD0kkdUshmKD8ZW7Sih+ vCVT894t658NavZnz6ypVQ+SMaYeD4/vgY9G+Iz6g6YDjVwS2vkBOiHsiAzh9ksVka8s 82c8HVDoukP2+E1YWSzidVYxhflURXwaGjZnLa3U/MShxsjV2QCLp/0pnEoBy6oEESKy HNuRiCWKvCOWxa4PeRhQ3UqTZ8DDh0FOHErCumTCxjWQCCZThafXF6D26ZObIbOKxE0c lnNw== X-Gm-Message-State: AKwxytcz73raJBNhBMW/pJ9lfrRk6Rzj2LZomI8/kRHBfL6Vrs0S62cs xWYuyBvDWiB3L3P+M+9v32SzjXfdqi0= X-Google-Smtp-Source: AH8x224P1D5Do7xr34/48BoC3pZdicSHnUv/52zNLpmrURk+bKSJrXeAVlkp+529gkcgL5xy2sI5Zg== X-Received: by 2002:a17:902:20e3:: with SMTP id v32-v6mr13377297plg.405.1516932120111; Thu, 25 Jan 2018 18:02:00 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id d5sm22141492pfk.2.2018.01.25.18.01.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jan 2018 18:01:59 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 25 Jan 2018 18:01:42 -0800 Message-Id: <20180126020151.979-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180126020151.979-1-stephen@networkplumber.org> References: <20180126020151.979-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v8 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: Fri, 26 Jan 2018 02:02:02 -0000 Use new rte_eth_linkstatus_get/set helper function. Signed-off-by: Stephen Hemminger --- drivers/net/nfp/nfp_net.c | 72 +++++------------------------------------------ 1 file changed, 7 insertions(+), 65 deletions(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index 0044699237ac..d1ba1a117409 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,8 +948,9 @@ 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; + int ret; static const uint32_t ls_to_ethtool[] = { [NFP_NET_CFG_STS_LINK_RATE_UNSUPPORTED] = ETH_SPEED_NUM_NONE, @@ -1017,9 +967,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 +984,14 @@ 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); + ret = rte_eth_linkstatus_set(dev, &link); + if (ret == 0) { 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; + return ret; } static int @@ -1376,8 +1321,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 +1374,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