From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [dpdk-dev] [PATCH v4 05/15] net/dpaa2: use rte_eth_linkstatus_set
Date: Tue, 16 Jan 2018 10:25:48 -0800 [thread overview]
Message-ID: <20180116182558.6254-6-stephen@networkplumber.org> (raw)
In-Reply-To: <20180116182558.6254-1-stephen@networkplumber.org>
Use new helper function to update the link status.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/dpaa2/dpaa2_ethdev.c | 75 ++++------------------------------------
1 file changed, 7 insertions(+), 68 deletions(-)
diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 2f99d95d2216..c2aed380e408 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
@@ -1284,15 +1232,13 @@ dpaa2_dev_link_update(struct rte_eth_dev *dev,
int ret;
struct dpaa2_dev_priv *priv = dev->data->dev_private;
struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
- struct rte_eth_link link, old;
+ struct rte_eth_link link;
struct dpni_link_state state = {0};
if (dpni == NULL) {
RTE_LOG(ERR, PMD, "dpni is NULL\n");
return 0;
}
- memset(&old, 0, sizeof(old));
- dpaa2_dev_atomic_read_link_status(dev, &old);
ret = dpni_get_link_state(dpni, CMD_PRI_LOW, priv->token, &state);
if (ret < 0) {
@@ -1300,11 +1246,6 @@ dpaa2_dev_link_update(struct rte_eth_dev *dev,
return -1;
}
- if ((old.link_status == state.up) && (old.link_speed == state.rate)) {
- RTE_LOG(DEBUG, PMD, "No change in status\n");
- return -1;
- }
-
memset(&link, 0, sizeof(struct rte_eth_link));
link.link_status = state.up;
link.link_speed = state.rate;
@@ -1314,12 +1255,10 @@ 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);
-
- 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);
+ if (rte_eth_linkstatus_set(dev, &link)) {
+ PMD_DRV_LOG(INFO, "Port %d Link is %s\n", dev->data->port_id,
+ link.link_status ? "Up" : "Down");
+ }
return 0;
}
--
2.15.1
next prev parent reply other threads:[~2018-01-16 18:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-16 18:25 [dpdk-dev] [PATCH v4 00/15] common ethdev linkstatus functions Stephen Hemminger
2018-01-16 18:25 ` [dpdk-dev] [PATCH v4 01/15] eal: introduce atomic exchange operation Stephen Hemminger
2018-01-16 18:25 ` [dpdk-dev] [PATCH v4 02/15] ethdev: add linkstatus get/set helper functions Stephen Hemminger
2018-01-16 18:25 ` [dpdk-dev] [PATCH v4 03/15] net/virtio: use eth_linkstatus_set Stephen Hemminger
2018-01-16 18:25 ` [dpdk-dev] [PATCH v4 04/15] net/vmxnet3: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:25 ` Stephen Hemminger [this message]
2018-01-16 18:25 ` [dpdk-dev] [PATCH v4 06/15] net/nfp: use rte_eth_linkstatus functions Stephen Hemminger
2018-01-16 18:25 ` [dpdk-dev] [PATCH v4 07/15] net/e1000: use rte_eth_linkstatus helpers Stephen Hemminger
2018-01-16 18:25 ` [dpdk-dev] [PATCH v4 08/15] net/ixgbe: use rte_eth_linkstatus functions Stephen Hemminger
2018-01-16 18:25 ` [dpdk-dev] [PATCH v4 09/15] net/sfc: use new " Stephen Hemminger
2018-01-16 18:25 ` [dpdk-dev] [PATCH v4 10/15] net/i40e: use " Stephen Hemminger
2018-01-16 18:25 ` [dpdk-dev] [PATCH v4 11/15] net/liquidio: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:25 ` [dpdk-dev] [PATCH v4 12/15] net/thunderx: " Stephen Hemminger
2018-01-16 18:25 ` [dpdk-dev] [PATCH v4 13/15] net/szedata: use _rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:25 ` [dpdk-dev] [PATCH v4 14/15] net/octeontx: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:25 ` [dpdk-dev] [PATCH v4 15/15] net/enic: " Stephen Hemminger
-- strict thread matches above, loose matches on Subject: below --
2018-01-08 17:44 [dpdk-dev] [PATCH v3 00/15] common ethdev linkstatus functions Stephen Hemminger
2018-01-11 17:06 ` [dpdk-dev] [PATCH v4 01/15] eal: introduce atomic exchange operation Ferruh Yigit
2018-01-11 17:06 ` [dpdk-dev] [PATCH v4 05/15] net/dpaa2: use rte_eth_linkstatus_set Ferruh Yigit
2018-01-16 9:44 ` Shreyansh Jain
2018-01-16 9:57 ` Shreyansh Jain
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=20180116182558.6254-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 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).