All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH v2 05/15] dpaa2: use rte_eth_linkstatus_set
Date: Fri,  5 Jan 2018 17:06:46 -0800	[thread overview]
Message-ID: <20180106010656.9167-6-stephen@networkplumber.org> (raw)
In-Reply-To: <20180106010656.9167-1-stephen@networkplumber.org>

Use new helper function to update the link status.
As a good side effect this fixes a but because this driver was not
returning correct status (should be -1 in link_status changed).

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/dpaa2/dpaa2_ethdev.c | 65 +++++-----------------------------------
 1 file changed, 7 insertions(+), 58 deletions(-)

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 2f99d95d2216..c0fc59ab148f 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -56,58 +56,6 @@ static int dpaa2_dev_set_link_up(struct rte_eth_dev *dev);
 static int dpaa2_dev_set_link_down(struct rte_eth_dev *dev);
 static int dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
 
-/**
- * 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 inline int
-dpaa2_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 read from.
- *   - Pointer to the buffer to be saved with the link status.
- *
- * @return
- *   - On success, zero.
- *   - On failure, negative value.
- */
-static inline int
-dpaa2_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;
-}
-
 static int
 dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
 {
@@ -804,7 +752,7 @@ dpaa2_dev_stop(struct rte_eth_dev *dev)
 
 	/* clear the recorded link status */
 	memset(&link, 0, sizeof(link));
-	dpaa2_dev_atomic_write_link_status(dev, &link);
+	_rte_eth_link_write(dev, &link);
 }
 
 static void
@@ -836,7 +784,7 @@ dpaa2_dev_close(struct rte_eth_dev *dev)
 	}
 
 	memset(&link, 0, sizeof(link));
-	dpaa2_dev_atomic_write_link_status(dev, &link);
+	_rte_eth_link_write(dev, &link);
 }
 
 static void
@@ -1291,8 +1239,8 @@ dpaa2_dev_link_update(struct rte_eth_dev *dev,
 		RTE_LOG(ERR, PMD, "dpni is NULL\n");
 		return 0;
 	}
-	memset(&old, 0, sizeof(old));
-	dpaa2_dev_atomic_read_link_status(dev, &old);
+
+	_rte_eth_link_read(dev, &old);
 
 	ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state);
 	if (ret < 0) {
@@ -1314,13 +1262,14 @@ dpaa2_dev_link_update(struct rte_eth_dev *dev,
 	else
 		link.link_duplex = ETH_LINK_FULL_DUPLEX;
 
-	dpaa2_dev_atomic_write_link_status(dev, &link);
+	ret = _rte_eth_linkstatus_set(dev, &link);
 
 	if (link.link_status)
 		PMD_DRV_LOG(INFO, "Port %d Link is Up\n", dev->data->port_id);
 	else
 		PMD_DRV_LOG(INFO, "Port %d Link is Down", dev->data->port_id);
-	return 0;
+
+	return ret;
 }
 
 /**
-- 
2.15.1

  parent reply	other threads:[~2018-01-06  1:07 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-06  1:06 [PATCH v2 00/15] common ethdev linkstatus functions Stephen Hemminger
2018-01-06  1:06 ` [PATCH v2 01/15] eal: introduce atomic exchange operation Stephen Hemminger
2018-01-06  1:06 ` [PATCH v2 02/15] ethdev: add linkstatus get/set helper functions Stephen Hemminger
2018-01-06 10:49   ` Andrew Rybchenko
2018-01-06 14:24     ` Stephen Hemminger
2018-01-06 14:35       ` Andrew Rybchenko
2018-01-06  1:06 ` [PATCH v2 03/15] virtio: use eth_linkstatus_set Stephen Hemminger
2018-01-06  3:10   ` Tiwei Bie
2018-01-08 17:03     ` Stephen Hemminger
2018-01-06  1:06 ` [PATCH v2 04/15] vmxnet3: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-06  1:06 ` Stephen Hemminger [this message]
2018-01-06  1:06 ` [PATCH v2 06/15] nfp: use rte_eth_linkstatus functions Stephen Hemminger
2018-01-06  1:06 ` [PATCH v2 07/15] e1000: use rte_eth_linkstatus helpers Stephen Hemminger
2018-01-06  1:06 ` [PATCH v2 08/15] ixgbe: use rte_eth_linkstatus functions Stephen Hemminger
2018-01-06  1:06 ` [PATCH v2 09/15] sfc: use new " Stephen Hemminger
2018-01-06 11:10   ` Andrew Rybchenko
2018-01-06  1:06 ` [PATCH v2 10/15] i40e: use " Stephen Hemminger
2018-01-06  1:06 ` [PATCH v2 11/15] liquidio: use _rte_eth_linkstatus_set Stephen Hemminger
2018-01-06  1:06 ` [PATCH v2 12/15] thunderx: " Stephen Hemminger
2018-01-06  1:06 ` [PATCH v2 13/15] szedata: " Stephen Hemminger
2018-01-06  1:06 ` [PATCH v2 14/15] octeontx: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-06  1:06 ` [PATCH v2 15/15] enic: use _rte_eth_linkstatus_set Stephen Hemminger

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=20180106010656.9167-6-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.