DPDK patches and discussions
 help / color / mirror / Atom feed
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
	Ferruh Yigit <ferruh.yigit@intel.com>
Subject: [dpdk-dev] [PATCH v7 06/15] net/nfp: use rte_eth_linkstatus functions
Date: Mon, 22 Jan 2018 15:54:49 -0800	[thread overview]
Message-ID: <20180122235458.28562-7-stephen@networkplumber.org> (raw)
In-Reply-To: <20180122235458.28562-1-stephen@networkplumber.org>

Use new rte_eth_linkstatus_get/set helper function.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>

---
 drivers/net/nfp/nfp_net.c | 77 +++++------------------------------------------
 1 file changed, 7 insertions(+), 70 deletions(-)

diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index 0044699237ac..7c9832374027 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -213,57 +213,6 @@ nn_cfg_writeq(struct nfp_net_hw *hw, int off, uint64_t val)
 	nn_writeq(rte_cpu_to_le_64(val), hw->ctrl_bar + off);
 }
 
-/*
- * Atomically reads 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
-nfp_net_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
-nfp_net_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 void
 nfp_net_rx_queue_release_mbufs(struct nfp_net_rxq *rxq)
 {
@@ -999,7 +948,7 @@ static int
 nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete)
 {
 	struct nfp_net_hw *hw;
-	struct rte_eth_link link, old;
+	struct rte_eth_link link;
 	uint32_t nn_link_status;
 
 	static const uint32_t ls_to_ethtool[] = {
@@ -1017,9 +966,6 @@ nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete)
 
 	hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
-	memset(&old, 0, sizeof(old));
-	nfp_net_dev_atomic_read_link_status(dev, &old);
-
 	nn_link_status = nn_cfg_readl(hw, NFP_NET_CFG_STS);
 
 	memset(&link, 0, sizeof(struct rte_eth_link));
@@ -1037,16 +983,10 @@ nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete)
 	else
 		link.link_speed = ls_to_ethtool[nn_link_status];
 
-	if (old.link_status != link.link_status) {
-		nfp_net_dev_atomic_write_link_status(dev, &link);
-		if (link.link_status)
-			PMD_DRV_LOG(INFO, "NIC Link is Up\n");
-		else
-			PMD_DRV_LOG(INFO, "NIC Link is Down\n");
-		return 0;
-	}
-
-	return -1;
+	if (rte_eth_linkstatus_set(dev, &link))
+		PMD_DRV_LOG(INFO, "NIC Link is %s\n",
+			    link.link_status ? "Up" : "Down");
+	return 0;
 }
 
 static int
@@ -1376,8 +1316,7 @@ nfp_net_dev_link_status_print(struct rte_eth_dev *dev)
 	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
 	struct rte_eth_link link;
 
-	memset(&link, 0, sizeof(link));
-	nfp_net_dev_atomic_read_link_status(dev, &link);
+	rte_eth_linkstatus_get(dev, &link);
 	if (link.link_status)
 		RTE_LOG(INFO, PMD, "Port %d: Link Up - speed %u Mbps - %s\n",
 			dev->data->port_id, link.link_speed,
@@ -1430,9 +1369,7 @@ nfp_net_dev_interrupt_handler(void *param)
 
 	PMD_DRV_LOG(DEBUG, "We got a LSC interrupt!!!\n");
 
-	/* get the link status */
-	memset(&link, 0, sizeof(link));
-	nfp_net_dev_atomic_read_link_status(dev, &link);
+	rte_eth_linkstatus_get(dev, &link);
 
 	nfp_net_link_update(dev, 0);
 
-- 
2.15.1

  parent reply	other threads:[~2018-01-22 23:55 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-22 23:54 [dpdk-dev] [PATCH v7 00/15] common linkstatus functions Stephen Hemminger
2018-01-22 23:54 ` [dpdk-dev] [PATCH v7 01/15] eal: introduce atomic exchange operation Stephen Hemminger
2018-01-22 23:54 ` [dpdk-dev] [PATCH v7 02/15] ethdev: add linkstatus get/set helper functions Stephen Hemminger
2018-01-23  0:07   ` [dpdk-dev] [PACH v7 02a] typo in i686 version of rte_atomic64_exchange Stephen Hemminger
2018-01-22 23:54 ` [dpdk-dev] [PATCH v7 03/15] net/virtio: use eth_linkstatus_set Stephen Hemminger
2018-01-22 23:54 ` [dpdk-dev] [PATCH v7 04/15] net/vmxnet3: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-22 23:54 ` [dpdk-dev] [PATCH v7 05/15] net/dpaa2: " Stephen Hemminger
2018-01-22 23:54 ` Stephen Hemminger [this message]
2018-01-22 23:54 ` [dpdk-dev] [PATCH v7 07/15] net/e1000: use rte_eth_linkstatus helpers Stephen Hemminger
2018-01-22 23:54 ` [dpdk-dev] [PATCH v7 08/15] net/ixgbe: use rte_eth_linkstatus functions Stephen Hemminger
2018-01-23 12:27   ` Neil Horman
2018-01-25 13:45     ` Ferruh Yigit
2018-01-22 23:54 ` [dpdk-dev] [PATCH v7 09/15] net/sfc: use new " Stephen Hemminger
2018-01-22 23:54 ` [dpdk-dev] [PATCH v7 10/15] net/i40e: use " Stephen Hemminger
2018-01-22 23:54 ` [dpdk-dev] [PATCH v7 11/15] net/liquidio: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-22 23:54 ` [dpdk-dev] [PATCH v7 12/15] net/thunderx: " Stephen Hemminger
2018-01-22 23:54 ` [dpdk-dev] [PATCH v7 13/15] net/szedata: use _rte_eth_linkstatus_set Stephen Hemminger
2018-01-22 23:54 ` [dpdk-dev] [PATCH v7 14/15] net/octeontx: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-22 23:54 ` [dpdk-dev] [PATCH v7 15/15] net/enic: " Stephen Hemminger
2018-01-25 13:51 ` [dpdk-dev] [PATCH v7 00/15] common linkstatus functions 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=20180122235458.28562-7-stephen@networkplumber.org \
    --to=stephen@networkplumber.org \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).