net/dpaa2: use link status helper functions

Use new rte_eth_linkstatus_get/set helper functions to handle link
status update.

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

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index fd5897e..2fb7b2d 100644 (file)
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -57,58 +57,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)
 {
@@ -852,7 +800,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_linkstatus_set(dev, &link);
 }
 
 static void
@@ -884,7 +832,7 @@ dpaa2_dev_close(struct rte_eth_dev *dev)
        }
 
        memset(&link, 0, sizeof(link));
-       dpaa2_dev_atomic_write_link_status(dev, &link);
+       rte_eth_linkstatus_set(dev, &link);
 }
 
 static void
@@ -1335,15 +1283,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) {
@@ -1351,11 +1297,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;
@@ -1365,13 +1306,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);
-
-       if (link.link_status)
-               PMD_DRV_LOG(INFO, "Port %d Link is Up\n", dev->data->port_id);
+       ret = rte_eth_linkstatus_set(dev, &link);
+       if (ret == -1)
+               RTE_LOG(DEBUG, PMD, "No change in status\n");
        else
-               PMD_DRV_LOG(INFO, "Port %d Link is Down", dev->data->port_id);
-       return 0;
+               PMD_DRV_LOG(INFO, "Port %d Link is %s\n", dev->data->port_id,
+                           link.link_status ? "Up" : "Down");
+
+       return ret;
 }
 
 /**