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 625ED1B1B7 for ; Mon, 8 Jan 2018 18:45:29 +0100 (CET) Received: by mail-pg0-f68.google.com with SMTP id j2so4795695pgv.3 for ; Mon, 08 Jan 2018 09:45:29 -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=CYgDbKNhPPBfAAfB6sGIYJgkCNeGlwN5KHD4Qlf2qRR373ZLm6wGPu1sFpNaaWfb84 VGwJNLT3Q6nRfLxnF3ZeFNU0DQQ3JSWlii7iOGzDxueSP9/mH7eet+TtN1YJarrHEJ2U TI6D0WLdBGmROfA7hxQS3DoM9U0pH0MUnBF1I5NOpI+Z290H7RQbQvbNLaOV/EvKdPHb URcgenRDveAh1XxI9Hvav6UASRqNlXLC7XIxtQo3CiuDXQbmd9RjCn9OC2rtWJqIoqL1 oEfI4S9UZK3bFVb1zMcjOOgCIx5RRg6PnYyyAXeogCs4EzeR2SGNhdrm+273g+vaWCBw msZw== 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=IpKpZZreT+++295gMlzk/WFul/+ZdJ81g85yjwumjmhSX6WTmBajyioi1Pk045XT+Y qUeeT+9mHVcxix2zr6VOrNBoOEzpcvMTFGyFWYbF5CHxLVAJG2+DkbIcGwMIOfzrzhqh XWDys/IcAMMIU/8sHCTzxcbZSma5qSgLoksVG0W6PxDA1W4g20xSoOEwfdY1/gaFtHIJ 6BqD2uMPyuxoiEeyz2jEKCgdxdSE8o+a2tVFiHw1cdjJlR58xgc/9uchXx4zrwGRQvCT AB8Y979/uQwIBCw9HLy45juJwjBWCWPR6B6u1MH2oYchdipb9ZEvc/fELdju/lxOyvER PUBg== X-Gm-Message-State: AKGB3mJ1CwNUbfZrOKSv/3pzZ4l3rdVnoGwZKww8OUnzjZKNu8LJW/Mo TIjElvj0r6X9hvdbn0xztGycYdJIX88= X-Google-Smtp-Source: ACJfBot9SN+SPv8aHOk1KNL/bysqQR1Hswww++fkSittAn9Ww+xWYce39zk/ULFYMFQUAUXwIIIRXw== X-Received: by 10.84.160.202 with SMTP id v10mr12672846plg.53.1515433528094; Mon, 08 Jan 2018 09:45:28 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id j14sm10933142pfh.94.2018.01.08.09.45.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2018 09:45:26 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 8 Jan 2018 09:45:03 -0800 Message-Id: <20180108174514.14688-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180108174514.14688-1-stephen@networkplumber.org> References: <20180108174514.14688-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v3 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: Mon, 08 Jan 2018 17:45:29 -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