From: Ferruh Yigit <ferruh.yigit@intel.com>
To: Bruce Richardson <bruce.richardson@intel.com>,
Konstantin Ananyev <konstantin.ananyev@intel.com>,
Alejandro Lucero <alejandro.lucero@netronome.com>
Cc: dev@dpdk.org, Ferruh Yigit <ferruh.yigit@intel.com>,
Stephen Hemminger <stephen@networkplumber.org>
Subject: [dpdk-dev] [PATCH v6 06/14] net/nfp: use ethdev linkstatus helper functions
Date: Sun, 21 Jan 2018 18:59:48 +0000 [thread overview]
Message-ID: <20180121185956.32970-6-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 helper function.
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/nfp/nfp_net.c | 70 +++++------------------------------------------
1 file changed, 7 insertions(+), 63 deletions(-)
diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index d14f2442b..5b886528b 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)
{
@@ -1017,8 +966,7 @@ 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);
+ rte_eth_linkstatus_get(dev, &old);
nn_link_status = nn_cfg_readl(hw, NFP_NET_CFG_STS);
@@ -1038,11 +986,10 @@ nfp_net_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete)
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");
+ rte_eth_linkstatus_set(dev, &link);
+
+ PMD_DRV_LOG(INFO, "NIC Link is %s\n",
+ link.link_status ? "Up" : "Down");
return 0;
}
@@ -1376,8 +1323,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 +1376,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.14.3
next prev 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 [dpdk-dev] [PATCH v5 00/15] common ethdev linkstatus functions Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 01/15] eal: introduce atomic exchange operation Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [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 ` [dpdk-dev] [PATCH v5 03/15] net/virtio: use eth_linkstatus_set Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 04/15] net/vmxnet3: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 05/15] net/dpaa2: " Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 06/15] net/nfp: use rte_eth_linkstatus functions Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 07/15] net/e1000: use rte_eth_linkstatus helpers Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 08/15] net/ixgbe: use rte_eth_linkstatus functions Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 09/15] net/sfc: use new " Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 10/15] net/i40e: use " Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 11/15] net/liquidio: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 12/15] net/thunderx: " Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 13/15] net/szedata: use _rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 14/15] net/octeontx: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 15/15] net/enic: " Stephen Hemminger
2018-01-17 5:19 ` [dpdk-dev] [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 ` [dpdk-dev] [PATCH v6 01/14] eal: introduce atomic exchange operation Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 02/14] ethdev: add linkstatus get/set helper functions Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 03/14] net/virtio: use ethdev linkstatus " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 04/14] net/vmxnet3: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 05/14] net/dpaa2: " Ferruh Yigit
2018-01-22 12:28 ` Shreyansh Jain
2018-01-21 18:59 ` Ferruh Yigit [this message]
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 07/14] net/e1000: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 08/14] net/ixgbe: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 09/14] net/i40e: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 10/14] net/liquidio: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 11/14] net/thunderx: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 12/14] net/szedata2: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 13/14] net/octeontx: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 14/14] net/enic: " Ferruh Yigit
2018-01-21 19:25 ` [dpdk-dev] [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-6-ferruh.yigit@intel.com \
--to=ferruh.yigit@intel.com \
--cc=alejandro.lucero@netronome.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=konstantin.ananyev@intel.com \
--cc=stephen@networkplumber.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 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).