From patchwork Sun Jan 21 18:59:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 34183 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CB1B51B01E; Sun, 21 Jan 2018 20:00:12 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 952A9A49A for ; Sun, 21 Jan 2018 20:00:08 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Jan 2018 11:00:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,392,1511856000"; d="scan'208";a="28253617" Received: from silpixa00372839.ir.intel.com (HELO silpixa00372839.ger.corp.intel.com) ([10.237.222.154]) by orsmga002.jf.intel.com with ESMTP; 21 Jan 2018 11:00:06 -0800 From: Ferruh Yigit To: Bruce Richardson , Konstantin Ananyev , Shrikrishna Khare Cc: dev@dpdk.org, Ferruh Yigit , Stephen Hemminger Date: Sun, 21 Jan 2018 18:59:46 +0000 Message-Id: <20180121185956.32970-4-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180121185956.32970-1-ferruh.yigit@intel.com> References: <20180116183755.24542-1-stephen@networkplumber.org> <20180121185956.32970-1-ferruh.yigit@intel.com> Subject: [dpdk-dev] [PATCH v6 04/14] net/vmxnet3: use ethdev linkstatus helper 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Stephen Hemminger Use new rte_eth_link_update helper. Also remove no longer necessary include of rte_atomic.h Signed-off-by: Stephen Hemminger Signed-off-by: Ferruh Yigit --- v6: * Keep logic exact same, only use new APIs to get/set link --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 80 +++++++----------------------------- 1 file changed, 14 insertions(+), 66 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index d3b704b40..fc495388e 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() */ @@ -817,8 +763,10 @@ 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_status = ETH_LINK_DOWN, + }; PMD_INIT_FUNC_TRACE(); @@ -852,8 +800,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); } /* @@ -1132,23 +1079,24 @@ __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 old; + struct rte_eth_link link = { + .link_speed = ETH_SPEED_NUM_10G, + .link_duplex = ETH_LINK_FULL_DUPLEX, + .link_autoneg = ETH_LINK_AUTONEG, + .link_status = ETH_LINK_DOWN, + }; uint32_t ret; - memset(&link, 0, sizeof(link)); - vmxnet3_dev_atomic_read_link_status(dev, &old); + rte_eth_linkstatus_get(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_AUTONEG; - } - vmxnet3_dev_atomic_write_link_status(dev, &link); + rte_eth_linkstatus_set(dev, &link); return (old.link_status == link.link_status) ? -1 : 0; }