All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ferruh Yigit <ferruh.yigit@intel.com>
To: Bruce Richardson <bruce.richardson@intel.com>,
	Konstantin Ananyev <konstantin.ananyev@intel.com>,
	Wenzhuo Lu <wenzhuo.lu@intel.com>
Cc: dev@dpdk.org, Ferruh Yigit <ferruh.yigit@intel.com>,
	Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH v6 07/14] net/e1000: use ethdev linkstatus helper functions
Date: Sun, 21 Jan 2018 18:59:49 +0000	[thread overview]
Message-ID: <20180121185956.32970-7-ferruh.yigit@intel.com> (raw)
In-Reply-To: <20180121185956.32970-1-ferruh.yigit@intel.com>

From: Stephen Hemminger <stephen@networkplumber.org>

Use new rte_eth_linkstatus_get/set API.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
v6:
* Keep logic exact same, only use new APIs to get/set link
---
 drivers/net/e1000/em_ethdev.c  | 63 ++++-------------------------------------
 drivers/net/e1000/igb_ethdev.c | 64 ++++--------------------------------------
 2 files changed, 10 insertions(+), 117 deletions(-)

diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index dcffb0797..8bedaf77d 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -20,7 +20,6 @@
 #include <rte_ethdev_pci.h>
 #include <rte_memory.h>
 #include <rte_eal.h>
-#include <rte_atomic.h>
 #include <rte_malloc.h>
 #include <rte_dev.h>
 
@@ -197,57 +196,6 @@ static const struct eth_dev_ops eth_em_ops = {
 	.txq_info_get         = em_txq_info_get,
 };
 
-/**
- * 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
-rte_em_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
-rte_em_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;
-}
 
 /**
  *  eth_em_dev_is_ich8 - Check for ICH8 device
@@ -802,7 +750,7 @@ eth_em_stop(struct rte_eth_dev *dev)
 
 	/* clear the recorded link status */
 	memset(&link, 0, sizeof(link));
-	rte_em_dev_atomic_write_link_status(dev, &link);
+	rte_eth_linkstatus_set(dev, &link);
 
 	if (!rte_intr_allow_others(intr_handle))
 		/* resume to the default handler */
@@ -1194,8 +1142,7 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 			break;
 		rte_delay_ms(EM_LINK_UPDATE_CHECK_INTERVAL);
 	}
-	memset(&link, 0, sizeof(link));
-	rte_em_dev_atomic_read_link_status(dev, &link);
+	rte_eth_linkstatus_get(dev, &link);
 	old = link;
 
 	/* Now we check if a transition has happened */
@@ -1215,7 +1162,7 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 		link.link_status = ETH_LINK_DOWN;
 		link.link_autoneg = ETH_LINK_FIXED;
 	}
-	rte_em_dev_atomic_write_link_status(dev, &link);
+	rte_eth_linkstatus_set(dev, &link);
 
 	/* not changed */
 	if (old.link_status == link.link_status)
@@ -1631,8 +1578,8 @@ eth_em_interrupt_action(struct rte_eth_dev *dev,
 	if (ret < 0)
 		return 0;
 
-	memset(&link, 0, sizeof(link));
-	rte_em_dev_atomic_read_link_status(dev, &link);
+	rte_eth_linkstatus_get(dev, &link);
+
 	if (link.link_status) {
 		PMD_INIT_LOG(INFO, " Port %d: Link Up - speed %u Mbps - %s",
 			     dev->data->port_id, link.link_speed,
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 077e09400..b02a0e6b4 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -20,7 +20,6 @@
 #include <rte_ethdev_pci.h>
 #include <rte_memory.h>
 #include <rte_eal.h>
-#include <rte_atomic.h>
 #include <rte_malloc.h>
 #include <rte_dev.h>
 
@@ -522,57 +521,6 @@ static const struct rte_igb_xstats_name_off rte_igbvf_stats_strings[] = {
 #define IGBVF_NB_XSTATS (sizeof(rte_igbvf_stats_strings) / \
 		sizeof(rte_igbvf_stats_strings[0]))
 
-/**
- * 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
-rte_igb_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
-rte_igb_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 inline void
 igb_intr_enable(struct rte_eth_dev *dev)
@@ -1559,7 +1507,7 @@ eth_igb_stop(struct rte_eth_dev *dev)
 
 	/* clear the recorded link status */
 	memset(&link, 0, sizeof(link));
-	rte_igb_dev_atomic_write_link_status(dev, &link);
+	rte_eth_linkstatus_set(dev, &link);
 
 	if (!rte_intr_allow_others(intr_handle))
 		/* resume to the default handler */
@@ -1635,7 +1583,7 @@ eth_igb_close(struct rte_eth_dev *dev)
 	}
 
 	memset(&link, 0, sizeof(link));
-	rte_igb_dev_atomic_write_link_status(dev, &link);
+	rte_eth_linkstatus_set(dev, &link);
 }
 
 static int
@@ -2422,8 +2370,7 @@ eth_igb_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 			break;
 		rte_delay_ms(IGB_LINK_UPDATE_CHECK_INTERVAL);
 	}
-	memset(&link, 0, sizeof(link));
-	rte_igb_dev_atomic_read_link_status(dev, &link);
+	rte_eth_linkstatus_get(dev, &link);
 	old = link;
 
 	/* Now we check if a transition has happened */
@@ -2443,7 +2390,7 @@ eth_igb_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 		link.link_status = ETH_LINK_DOWN;
 		link.link_autoneg = ETH_LINK_FIXED;
 	}
-	rte_igb_dev_atomic_write_link_status(dev, &link);
+	rte_eth_linkstatus_set(dev, &link);
 
 	/* not changed */
 	if (old.link_status == link.link_status)
@@ -2887,8 +2834,7 @@ eth_igb_interrupt_action(struct rte_eth_dev *dev,
 		if (ret < 0)
 			return 0;
 
-		memset(&link, 0, sizeof(link));
-		rte_igb_dev_atomic_read_link_status(dev, &link);
+		rte_eth_linkstatus_get(dev, &link);
 		if (link.link_status) {
 			PMD_INIT_LOG(INFO,
 				     " Port %d: Link Up - speed %u Mbps - %s",
-- 
2.14.3

  parent reply	other threads:[~2018-01-21 19:00 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-16 18:37 [PATCH v5 00/15] common ethdev linkstatus functions Stephen Hemminger
2018-01-16 18:37 ` [PATCH v5 01/15] eal: introduce atomic exchange operation Stephen Hemminger
2018-01-16 18:37 ` [PATCH v5 02/15] ethdev: add linkstatus get/set helper functions Stephen Hemminger
2018-01-17  7:49   ` Andrew Rybchenko
2018-01-16 18:37 ` [PATCH v5 03/15] net/virtio: use eth_linkstatus_set Stephen Hemminger
2018-01-16 18:37 ` [PATCH v5 04/15] net/vmxnet3: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:37 ` [PATCH v5 05/15] net/dpaa2: " Stephen Hemminger
2018-01-16 18:37 ` [PATCH v5 06/15] net/nfp: use rte_eth_linkstatus functions Stephen Hemminger
2018-01-16 18:37 ` [PATCH v5 07/15] net/e1000: use rte_eth_linkstatus helpers Stephen Hemminger
2018-01-16 18:37 ` [PATCH v5 08/15] net/ixgbe: use rte_eth_linkstatus functions Stephen Hemminger
2018-01-16 18:37 ` [PATCH v5 09/15] net/sfc: use new " Stephen Hemminger
2018-01-16 18:37 ` [PATCH v5 10/15] net/i40e: use " Stephen Hemminger
2018-01-16 18:37 ` [PATCH v5 11/15] net/liquidio: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:37 ` [PATCH v5 12/15] net/thunderx: " Stephen Hemminger
2018-01-16 18:37 ` [PATCH v5 13/15] net/szedata: use _rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:37 ` [PATCH v5 14/15] net/octeontx: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:37 ` [PATCH v5 15/15] net/enic: " Stephen Hemminger
2018-01-17  5:19 ` [PATCH v5 00/15] common ethdev linkstatus functions Shreyansh Jain
2018-01-17  7:56 ` Andrew Rybchenko
2018-01-17 14:32   ` Ferruh Yigit
2018-01-17 16:05     ` Stephen Hemminger
2018-01-17 16:18       ` Ferruh Yigit
2018-01-19 16:35         ` Ferruh Yigit
2018-01-21 18:35           ` Ferruh Yigit
2018-01-21 18:59 ` [PATCH v6 01/14] eal: introduce atomic exchange operation Ferruh Yigit
2018-01-21 18:59   ` [PATCH v6 02/14] ethdev: add linkstatus get/set helper functions Ferruh Yigit
2018-01-21 18:59   ` [PATCH v6 03/14] net/virtio: use ethdev linkstatus " Ferruh Yigit
2018-01-21 18:59   ` [PATCH v6 04/14] net/vmxnet3: " Ferruh Yigit
2018-01-21 18:59   ` [PATCH v6 05/14] net/dpaa2: " Ferruh Yigit
2018-01-22 12:28     ` Shreyansh Jain
2018-01-21 18:59   ` [PATCH v6 06/14] net/nfp: " Ferruh Yigit
2018-01-21 18:59   ` Ferruh Yigit [this message]
2018-01-21 18:59   ` [PATCH v6 08/14] net/ixgbe: " Ferruh Yigit
2018-01-21 18:59   ` [PATCH v6 09/14] net/i40e: " Ferruh Yigit
2018-01-21 18:59   ` [PATCH v6 10/14] net/liquidio: " Ferruh Yigit
2018-01-21 18:59   ` [PATCH v6 11/14] net/thunderx: " Ferruh Yigit
2018-01-21 18:59   ` [PATCH v6 12/14] net/szedata2: " Ferruh Yigit
2018-01-21 18:59   ` [PATCH v6 13/14] net/octeontx: " Ferruh Yigit
2018-01-21 18:59   ` [PATCH v6 14/14] net/enic: " Ferruh Yigit
2018-01-21 19:25   ` [PATCH v6 01/14] eal: introduce atomic exchange operation Ferruh Yigit
2018-01-21 23:50     ` Thomas Monjalon
2018-01-22 16:56       ` Stephen Hemminger
2018-01-22 21:03         ` Thomas Monjalon
2018-01-22 21:48           ` Stephen Hemminger
2018-01-22 22:09             ` Thomas Monjalon

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=20180121185956.32970-7-ferruh.yigit@intel.com \
    --to=ferruh.yigit@intel.com \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=konstantin.ananyev@intel.com \
    --cc=stephen@networkplumber.org \
    --cc=wenzhuo.lu@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 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.