From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f174.google.com (mail-pf0-f174.google.com [209.85.192.174]) by dpdk.org (Postfix) with ESMTP id 553A3559A for ; Fri, 14 Jul 2017 20:30:41 +0200 (CEST) Received: by mail-pf0-f174.google.com with SMTP id q85so49113299pfq.1 for ; Fri, 14 Jul 2017 11:30:41 -0700 (PDT) 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=4vIWaxnDQ8rAG1M8y4ASbCAP3fVILXR0W2J9OpKO7NA=; b=AXxUo+qg2FimHgz5Zmsc4X9VKC9BG6cmHSO8LYbFcRp55I/+KOsp0b/d1SpnlWSH+z QN10Sajrw8DcQZ/5Gakp3U9IvqFwJFONr+TOtiYsvlTpKocEnMqwis4CmRcDB2IHmtly V2CpFAlGBAskh3kh3J2Q1hIlYPx5QcMfUuuKNY42jOjw6CptvilJuj3uCEvZ76dyET98 xAQg4WfNc2BkvgsXATi5N4oL+1WvCxWWxBKfuumcUF8dB3WJlCG2HdquzwC1aEZd2PNr eYgU0ionSNvNRMiJRyJ85I+2gM3N9c0E7M8A+svYHp8Wx9+MUdQK/IYdIb3xC/a9quDU yBDw== 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=4vIWaxnDQ8rAG1M8y4ASbCAP3fVILXR0W2J9OpKO7NA=; b=DOaMEbkntQ+4wP6BkSiKsw8crHYBH/7FVx8hj5QSrJwBSaGf+cbmLB9kvp2tUeNAve WpGKCe2bimI+rPE/bUcJEQQLK5QDfcXpuQldu7eqlJlHw5GOef/NAncRoJC4P9q7pIWc 32NszXOM0EFwUuWjcqIhRqK3wpyFhv4tr68mb2ha6DKhQvyfK15W6zJkURGGc5MWnuME g9OdQKMvnzYIhPyizdz05idsZqmW2meW8ZB31FxEnfpAXfK57iNQrVx1aXoIB7TqCRbp MuRl01ZQmpLLOhGLu3MYcXMkWFnjUsp7eOEqW51iLN2ZA4E1z79JVvEH/HhbTNYENUTI qA6g== X-Gm-Message-State: AIVw111l9DnsOzWLt2aS7iDKwLyDdXIBxZYknPuZus5oM/L98ttOFXUx PA4v1HrmZkQKwtWDtupDuw== X-Received: by 10.84.216.28 with SMTP id m28mr17258116pli.275.1500057040279; Fri, 14 Jul 2017 11:30:40 -0700 (PDT) Received: from xeon-e3.wavecable.com (76-14-207-240.or.wavecable.com. [76.14.207.240]) by smtp.gmail.com with ESMTPSA id r9sm22711163pfi.114.2017.07.14.11.30.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jul 2017 11:30:39 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 14 Jul 2017 11:30:17 -0700 Message-Id: <20170714183027.16021-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170714183027.16021-1-stephen@networkplumber.org> References: <20170714183027.16021-1-stephen@networkplumber.org> Subject: [dpdk-dev] [RFC 04/14] vmxnet3: use rte_eth_link_update 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, 14 Jul 2017 18:30:42 -0000 Use new _rte_eth_link_update helper. Also remove no longer necessary includes of rte_atomic.h Signed-off-by: Stephen Hemminger --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 66 ++---------------------------------- 1 file changed, 3 insertions(+), 63 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index 72ec67c01cdd..910afb9f0eeb 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include @@ -57,7 +56,6 @@ #include #include #include -#include #include #include #include @@ -186,59 +184,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() */ @@ -878,7 +823,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_link_update(dev, &link); } /* @@ -1154,12 +1099,9 @@ __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); @@ -1170,9 +1112,7 @@ __vmxnet3_dev_link_update(struct rte_eth_dev *dev, link.link_autoneg = ETH_LINK_SPEED_FIXED; } - vmxnet3_dev_atomic_write_link_status(dev, &link); - - return (old.link_status == link.link_status) ? -1 : 0; + return _rte_eth_link_update(dev, &link); } static int -- 2.11.0