From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by dpdk.org (Postfix) with ESMTP id 9BCD61B170 for ; Sat, 6 Jan 2018 02:07:03 +0100 (CET) Received: by mail-pl0-f68.google.com with SMTP id o2so4058545plk.12 for ; Fri, 05 Jan 2018 17:07:03 -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=/2xAAq9P48HQYkCZmKIkfwNCiZ4eqEwOY86gtGs3Sl4=; b=TJloOicg57GuYwpT002Wc1be8ITie8AUzFPB2kG+jya898yCIzY74b27mnaLcqalwp b0vAa7phbvXkXQqM8lM8+3ywL6s59/eQLqe3aawy7N0srQzwEq/aaAVHPTbAyUgPjx+3 GQgS3YmH7cO1FCQeFzLZ0b2DTk9SvVbKsksEyEtBPoKR70g3rJIB64FkdqrN9c+OXE7R mzni1Eu1pd4LmlLeYJO7z3mFVukN2U7F00446/4HCyad0w+T9M3JkfmnLlbsCb9wzbEN 6HNohc44wj0QUEcUC3Sg2XyR8thpzpI9bBDRCny0Uzy6O1E5vL+jp3U56SUTGzV1AlrH 8hXg== 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=/2xAAq9P48HQYkCZmKIkfwNCiZ4eqEwOY86gtGs3Sl4=; b=FoSCq23MM3jozc75W/6c+j9/zaHaST3ZUiikJa76Q/509MtBBb3vnrLXqsJKpgxSMJ alwO+stpbg0JQKRzbYDUHbYDMlEFexubpjMjYf/ZhD88sVQWR6L3/aa/Br7AF8gAaSxv 8YjzeAaTWn6cTSsJxOs2N8QycTb9tUjk5yTiQ0A5ghRAKTC1AwKHckAr7V+5PDPR+kD1 +y7ta5A192raAnLSeSlOHXrb/XF8QQ0sJ4tG9L3UbOzFB9iPj3NjXk8DKLIYvfYHdhBA /Pv1dkhO4Mh/wzpJNLe5a4jcUT2z6pZ+ghEovFAKfgLEPVbR/QqLSBVpHqHrkH36KGFB j2jg== X-Gm-Message-State: AKGB3mJV8fJ269zdTACNd/nSHANtz1ai//YrktTdp8//hieOibbF0HL6 TnVVOH4Koyu6GSyFJkqS3FBskN5HPHs= X-Google-Smtp-Source: ACJfBosea6mmQ2Hbtvdbl1iIOx8g5Z3AkETScYrQvBLW0tQHV9S+XbXdb86RvfeJyicFhhDt7wLyQg== X-Received: by 10.84.225.129 with SMTP id u1mr4977947plj.329.1515200822463; Fri, 05 Jan 2018 17:07:02 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id p14sm12385018pgn.37.2018.01.05.17.07.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jan 2018 17:07:01 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 5 Jan 2018 17:06:45 -0800 Message-Id: <20180106010656.9167-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180106010656.9167-1-stephen@networkplumber.org> References: <20180106010656.9167-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v2 04/15] 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: Sat, 06 Jan 2018 01:07:03 -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 | 85 +++++++----------------------------- 1 file changed, 15 insertions(+), 70 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index c2f12cdf2a4d..0149125affe9 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 @@ -157,59 +156,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() */ @@ -814,9 +760,13 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) static void vmxnet3_dev_stop(struct rte_eth_dev *dev) { - struct rte_eth_link link; struct vmxnet3_hw *hw = dev->data->dev_private; - + struct rte_eth_link link = { + .link_speed = ETH_SPEED_NUM_10G, + .link_duplex = ETH_LINK_FULL_DUPLEX, + .link_autoneg = ETH_LINK_SPEED_FIXED, + .link_status = ETH_LINK_DOWN, + }; PMD_INIT_FUNC_TRACE(); if (hw->adapter_stopped == 1) { @@ -849,8 +799,7 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev) vmxnet3_dev_clear_queues(dev); /* Clear recorded link status */ - memset(&link, 0, sizeof(link)); - vmxnet3_dev_atomic_write_link_status(dev, &link); + _rte_eth_linkstatus_set(dev, &link); } /* @@ -1130,25 +1079,21 @@ __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 = { + .link_speed = ETH_SPEED_NUM_10G, + .link_duplex = ETH_LINK_FULL_DUPLEX, + .link_autoneg = ETH_LINK_SPEED_FIXED, + .link_status = ETH_LINK_DOWN, + }; 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); - if (ret & 0x1) { + if (ret & 0x1) link.link_status = ETH_LINK_UP; - link.link_duplex = ETH_LINK_FULL_DUPLEX; - link.link_speed = ETH_SPEED_NUM_10G; - 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_linkstatus_set(dev, &link); } static int -- 2.15.1