From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH v8 04/15] net/vmxnet3: use rte_eth_linkstatus_set
Date: Thu, 25 Jan 2018 18:01:40 -0800 [thread overview]
Message-ID: <20180126020151.979-5-stephen@networkplumber.org> (raw)
In-Reply-To: <20180126020151.979-1-stephen@networkplumber.org>
Use new rte_eth_link_update helper.
Also remove no longer necessary include of rte_atomic.h
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
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 <rte_debug.h>
#include <rte_pci.h>
#include <rte_bus_pci.h>
-#include <rte_atomic.h>
#include <rte_branch_prediction.h>
#include <rte_memory.h>
#include <rte_memzone.h>
@@ -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
next prev parent reply other threads:[~2018-01-26 2:01 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-26 2:01 [PATCH v8 00/15] common linkstatus functions Stephen Hemminger
2018-01-26 2:01 ` [PATCH v8 01/15] eal: introduce atomic exchange operation Stephen Hemminger
2018-01-26 17:14 ` Thomas Monjalon
2018-01-26 17:24 ` Bruce Richardson
2018-01-26 21:54 ` Stephen Hemminger
2018-01-29 9:51 ` Bruce Richardson
2018-01-26 17:59 ` Ananyev, Konstantin
2018-01-26 2:01 ` [PATCH v8 02/15] ethdev: add linkstatus get/set helper functions Stephen Hemminger
2018-01-26 2:01 ` [PATCH v8 03/15] net/virtio: use eth_linkstatus_set Stephen Hemminger
2018-01-26 2:01 ` Stephen Hemminger [this message]
2018-01-26 2:01 ` [PATCH v8 05/15] net/dpaa2: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-26 2:01 ` [PATCH v8 06/15] net/nfp: use rte_eth_linkstatus functions Stephen Hemminger
2018-01-26 2:01 ` [PATCH v8 07/15] net/e1000: use rte_eth_linkstatus helpers Stephen Hemminger
2018-01-26 2:01 ` [PATCH v8 08/15] net/ixgbe: use rte_eth_linkstatus functions Stephen Hemminger
2018-01-26 2:01 ` [PATCH v8 09/15] net/sfc: use new " Stephen Hemminger
2018-01-26 6:31 ` Andrew Rybchenko
2018-01-26 2:01 ` [PATCH v8 10/15] net/i40e: use " Stephen Hemminger
2018-01-26 2:01 ` [PATCH v8 11/15] net/liquidio: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-26 2:01 ` [PATCH v8 12/15] net/thunderx: " Stephen Hemminger
2018-01-26 2:01 ` [PATCH v8 13/15] net/szedata: use _rte_eth_linkstatus_set Stephen Hemminger
2018-01-26 2:01 ` [PATCH v8 14/15] net/octeontx: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-26 2:01 ` [PATCH v8 15/15] net/enic: " Stephen Hemminger
2018-03-15 17:38 ` [PATCH v8 00/15] common linkstatus functions Ferruh Yigit
2018-03-16 10:31 ` Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180126020151.979-5-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.