From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH v8 09/15] net/sfc: use new rte_eth_linkstatus functions
Date: Thu, 25 Jan 2018 18:01:45 -0800 [thread overview]
Message-ID: <20180126020151.979-10-stephen@networkplumber.org> (raw)
In-Reply-To: <20180126020151.979-1-stephen@networkplumber.org>
Use the new API rte_eth_linkstatus_set to handle link status update.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/sfc/sfc_ethdev.c | 24 +++++-------------------
drivers/net/sfc/sfc_ev.c | 20 ++------------------
2 files changed, 7 insertions(+), 37 deletions(-)
diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 89a452907621..7d51db979a03 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -236,22 +236,13 @@ static int
sfc_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
{
struct sfc_adapter *sa = dev->data->dev_private;
- struct rte_eth_link *dev_link = &dev->data->dev_link;
- struct rte_eth_link old_link;
struct rte_eth_link current_link;
+ int ret;
sfc_log_init(sa, "entry");
-retry:
- EFX_STATIC_ASSERT(sizeof(*dev_link) == sizeof(rte_atomic64_t));
- *(int64_t *)&old_link = rte_atomic64_read((rte_atomic64_t *)dev_link);
-
if (sa->state != SFC_ADAPTER_STARTED) {
sfc_port_link_mode_to_info(EFX_LINK_UNKNOWN, ¤t_link);
- if (!rte_atomic64_cmpset((volatile uint64_t *)dev_link,
- *(uint64_t *)&old_link,
- *(uint64_t *)¤t_link))
- goto retry;
} else if (wait_to_complete) {
efx_link_mode_t link_mode;
@@ -259,21 +250,16 @@ sfc_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete)
link_mode = EFX_LINK_UNKNOWN;
sfc_port_link_mode_to_info(link_mode, ¤t_link);
- if (!rte_atomic64_cmpset((volatile uint64_t *)dev_link,
- *(uint64_t *)&old_link,
- *(uint64_t *)¤t_link))
- goto retry;
} else {
sfc_ev_mgmt_qpoll(sa);
- *(int64_t *)¤t_link =
- rte_atomic64_read((rte_atomic64_t *)dev_link);
+ rte_eth_linkstatus_get(dev, ¤t_link);
}
- if (old_link.link_status != current_link.link_status)
+ ret = rte_eth_linkstatus_set(dev, ¤t_link);
+ if (ret == 0)
sfc_info(sa, "Link status is %s",
current_link.link_status ? "UP" : "DOWN");
-
- return old_link.link_status == current_link.link_status ? 0 : -1;
+ return ret;
}
static void
diff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c
index 7abe61ae5ff1..273a92ccb222 100644
--- a/drivers/net/sfc/sfc_ev.c
+++ b/drivers/net/sfc/sfc_ev.c
@@ -382,27 +382,11 @@ sfc_ev_link_change(void *arg, efx_link_mode_t link_mode)
{
struct sfc_evq *evq = arg;
struct sfc_adapter *sa = evq->sa;
- struct rte_eth_link *dev_link = &sa->eth_dev->data->dev_link;
struct rte_eth_link new_link;
- uint64_t new_link_u64;
- uint64_t old_link_u64;
-
- EFX_STATIC_ASSERT(sizeof(*dev_link) == sizeof(rte_atomic64_t));
sfc_port_link_mode_to_info(link_mode, &new_link);
-
- new_link_u64 = *(uint64_t *)&new_link;
- do {
- old_link_u64 = rte_atomic64_read((rte_atomic64_t *)dev_link);
- if (old_link_u64 == new_link_u64)
- break;
-
- if (rte_atomic64_cmpset((volatile uint64_t *)dev_link,
- old_link_u64, new_link_u64)) {
- evq->sa->port.lsc_seq++;
- break;
- }
- } while (B_TRUE);
+ if (rte_eth_linkstatus_set(sa->eth_dev, &new_link))
+ evq->sa->port.lsc_seq++;
return B_FALSE;
}
--
2.15.1
next prev parent reply other threads:[~2018-01-26 2:02 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 ` [PATCH v8 04/15] net/vmxnet3: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-26 2:01 ` [PATCH v8 05/15] net/dpaa2: " 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 ` Stephen Hemminger [this message]
2018-01-26 6:31 ` [PATCH v8 09/15] net/sfc: use new " 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-10-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.