From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by dpdk.org (Postfix) with ESMTP id DA6BE1B1D0 for ; Fri, 26 Jan 2018 03:01:58 +0100 (CET) Received: by mail-pf0-f193.google.com with SMTP id b25so7195378pfd.9 for ; Thu, 25 Jan 2018 18:01:58 -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=DrZRaxxRi6NbbX/ILOzai1wF8f+f6qjku8YUBPzOc6E=; b=lpOLDjEyD7duPYS6mxH/DjMbJzWx0IbaqASSKdTRHbZqjvDsB05BdzmCbrGluGaYbH KJZioIkPuG2EVh6akWB9RVV7GctinKjlO0jBLBE2wMK5a/y0Cxax3rTbFGqFAl0RDuT0 NFLc/1a5pYO7tWS98wrlSwBNpUSznkzjy1lMcywBRPK0Rgn7XSJSP1jkpDKyf65Wkh/G wbJSe3m7NtXbDW38luJk4x7NPTz/Rl34ovQ3iHtXp7pdYE8uHzSCYyB0nFKD1dnnDMGq DHBVZSxlm7W7mDwG8Abnyp2jSvqLi3f39SjeEn7ShNUhydnm4HfkGpM4Z/Xshal63MJ8 ss6w== 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=DrZRaxxRi6NbbX/ILOzai1wF8f+f6qjku8YUBPzOc6E=; b=Pb2LTt+nDBupJsx547hd4irW56geAXwkudDK3p72A/SuGHlplf8zivjc9rWHLLCmoq /abzxfcvc2umr074gJZSp+s+WQjX02aU+SL+ojYaVgzRzvwfQGqygkNMZkENa1fKZ2FS mjDbT7zoiWxXxD/08IEDYiBOjB0ap9BrY2Q9JkZ2iIjZ74leDVXMQcc/+PbhjfyexgZH URSxC2H5PCuZOxWQLjHstq6v9QOYec3rDHkXJP63tBsO6toki0MhnjWdcrXdI6g/0jps XdcQgPBrRRmKRPGPk54ADO9o3M92FvcchCLWIH1s5Yj4LO/qvPDhoev8s/x1EU9vgMJc FEFA== X-Gm-Message-State: AKwxytfhXb1et2sgO/V/HQmKSORKfWTw0y6/NwMkFiblNaKrm2ogx7p4 jPTeX43gkCTPzcLzNIhqnKCNjuwFvVk= X-Google-Smtp-Source: AH8x227mvMgM7XUvzwDtEB6nNLK8DKaFrLL8c6le6ipwxcYVJKJLnBxAdHxVeWZAaHkXuHk9WZu43w== X-Received: by 2002:a17:902:7083:: with SMTP id z3-v6mr13137584plk.404.1516932117798; Thu, 25 Jan 2018 18:01:57 -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.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jan 2018 18:01:57 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 25 Jan 2018 18:01:40 -0800 Message-Id: <20180126020151.979-5-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 04/15] net/vmxnet3: use rte_eth_linkstatus_set 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:01:59 -0000 Use new rte_eth_link_update helper. Also remove no longer necessary include of rte_atomic.h Signed-off-by: Stephen Hemminger --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 63 ++---------------------------------- 1 file changed, 3 insertions(+), 60 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index a2fb93cc984c..598dc344047d 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -160,59 +159,6 @@ gpa_zone_reserve(struct rte_eth_dev *dev, uint32_t size, return rte_memzone_reserve_aligned(z_name, size, socket_id, 0, align); } -/** - * Atomically reads the 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 int -vmxnet3_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 write to. - * - Pointer to the buffer to be saved with the link status. - * - * @return - * - On success, zero. - * - On failure, negative value. - */ -static int -vmxnet3_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; -} - /* * This function is based on vmxnet3_disable_intr() */ @@ -853,7 +799,7 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev) /* Clear recorded link status */ memset(&link, 0, sizeof(link)); - vmxnet3_dev_atomic_write_link_status(dev, &link); + rte_eth_linkstatus_set(dev, &link); } /* @@ -1132,11 +1078,10 @@ __vmxnet3_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) { struct vmxnet3_hw *hw = dev->data->dev_private; - struct rte_eth_link old = { 0 }, link; + struct rte_eth_link link; uint32_t ret; memset(&link, 0, sizeof(link)); - vmxnet3_dev_atomic_read_link_status(dev, &old); VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_GET_LINK); ret = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD); @@ -1148,9 +1093,7 @@ __vmxnet3_dev_link_update(struct rte_eth_dev *dev, link.link_autoneg = ETH_LINK_AUTONEG; } - vmxnet3_dev_atomic_write_link_status(dev, &link); - - return (old.link_status == link.link_status) ? -1 : 0; + return rte_eth_linkstatus_set(dev, &link); } static int -- 2.15.1