crypto/cnxk: fix condition check

[dpdk.git] / drivers / net / mvneta / mvneta_ethdev.c

diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c
index db142be..eef016a 100644 (file)
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -5,7 +5,7 @@
  */
 
 #include <rte_string_fns.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_kvargs.h>
 #include <rte_bus_vdev.h>
 
@@ -114,7 +114,7 @@ mvneta_dev_configure(struct rte_eth_dev *dev)
        struct mvneta_priv *priv = dev->data->dev_private;
        struct neta_ppio_params *ppio_params;
 
-       if (dev->data->dev_conf.rxmode.mq_mode != ETH_MQ_RX_NONE) {
+       if (dev->data->dev_conf.rxmode.mq_mode != RTE_ETH_MQ_RX_NONE) {
                MVNETA_LOG(INFO, "Unsupported RSS and rx multi queue mode %d",
                        dev->data->dev_conf.rxmode.mq_mode);
                if (dev->data->nb_rx_queues > 1)
@@ -126,11 +126,7 @@ mvneta_dev_configure(struct rte_eth_dev *dev)
                return -EINVAL;
        }
 
-       if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME)
-               dev->data->mtu = dev->data->dev_conf.rxmode.max_rx_pkt_len -
-                                MRVL_NETA_ETH_HDRS_LEN;
-
-       if (dev->data->dev_conf.txmode.offloads & DEV_TX_OFFLOAD_MULTI_SEGS)
+       if (dev->data->dev_conf.txmode.offloads & RTE_ETH_TX_OFFLOAD_MULTI_SEGS)
                priv->multiseg = 1;
 
        ppio_params = &priv->ppio_params;
@@ -155,10 +151,10 @@ static int
 mvneta_dev_infos_get(struct rte_eth_dev *dev __rte_unused,
                   struct rte_eth_dev_info *info)
 {
-       info->speed_capa = ETH_LINK_SPEED_10M |
-                          ETH_LINK_SPEED_100M |
-                          ETH_LINK_SPEED_1G |
-                          ETH_LINK_SPEED_2_5G;
+       info->speed_capa = RTE_ETH_LINK_SPEED_10M |
+                          RTE_ETH_LINK_SPEED_100M |
+                          RTE_ETH_LINK_SPEED_1G |
+                          RTE_ETH_LINK_SPEED_2_5G;
 
        info->max_rx_queues = MRVL_NETA_RXQ_MAX;
        info->max_tx_queues = MRVL_NETA_TXQ_MAX;
@@ -251,7 +247,7 @@ mvneta_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
            (mru + MRVL_NETA_PKT_OFFS > mbuf_data_size)) {
                mru = mbuf_data_size - MRVL_NETA_PKT_OFFS;
                mtu = MRVL_NETA_MRU_TO_MTU(mru);
-               MVNETA_LOG(WARNING, "MTU too big, max MTU possible limitted by"
+               MVNETA_LOG(WARNING, "MTU too big, max MTU possible limited by"
                        " current mbuf size: %u. Set MTU to %u, MRU to %u",
                        mbuf_data_size, mtu, mru);
        }
@@ -261,9 +257,6 @@ mvneta_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
                return -EINVAL;
        }
 
-       dev->data->mtu = mtu;
-       dev->data->dev_conf.rxmode.max_rx_pkt_len = mru - MV_MH_SIZE;
-
        if (!priv->ppio)
                /* It is OK. New MTU will be set later on mvneta_dev_start */
                return 0;
@@ -408,19 +401,23 @@ out:
  * @param dev
  *   Pointer to Ethernet device structure.
  */
-static void
+static int
 mvneta_dev_stop(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
 
+       dev->data->dev_started = 0;
+
        if (!priv->ppio)
-               return;
+               return 0;
 
        mvneta_dev_set_link_down(dev);
        mvneta_flush_queues(dev);
        neta_ppio_deinit(priv->ppio);
 
        priv->ppio = NULL;
+
+       return 0;
 }
 
 /**
@@ -433,18 +430,21 @@ static int
 mvneta_dev_close(struct rte_eth_dev *dev)
 {
        struct mvneta_priv *priv = dev->data->dev_private;
-       int i;
+       int i, ret = 0;
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
 
        if (priv->ppio)
-               mvneta_dev_stop(dev);
+               ret = mvneta_dev_stop(dev);
 
        for (i = 0; i < dev->data->nb_rx_queues; i++) {
-               mvneta_rx_queue_release(dev->data->rx_queues[i]);
+               mvneta_rx_queue_release(dev, i);
                dev->data->rx_queues[i] = NULL;
        }
 
        for (i = 0; i < dev->data->nb_tx_queues; i++) {
-               mvneta_tx_queue_release(dev->data->tx_queues[i]);
+               mvneta_tx_queue_release(dev, i);
                dev->data->tx_queues[i] = NULL;
        }
 
@@ -456,7 +456,7 @@ mvneta_dev_close(struct rte_eth_dev *dev)
                rte_mvep_deinit(MVEP_MOD_T_NETA);
        }
 
-       return 0;
+       return ret;
 }
 
 /**
@@ -503,28 +503,28 @@ mvneta_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
 
        switch (ethtool_cmd_speed(&edata)) {
        case SPEED_10:
-               dev->data->dev_link.link_speed = ETH_SPEED_NUM_10M;
+               dev->data->dev_link.link_speed = RTE_ETH_SPEED_NUM_10M;
                break;
        case SPEED_100:
-               dev->data->dev_link.link_speed = ETH_SPEED_NUM_100M;
+               dev->data->dev_link.link_speed = RTE_ETH_SPEED_NUM_100M;
                break;
        case SPEED_1000:
-               dev->data->dev_link.link_speed = ETH_SPEED_NUM_1G;
+               dev->data->dev_link.link_speed = RTE_ETH_SPEED_NUM_1G;
                break;
        case SPEED_2500:
-               dev->data->dev_link.link_speed = ETH_SPEED_NUM_2_5G;
+               dev->data->dev_link.link_speed = RTE_ETH_SPEED_NUM_2_5G;
                break;
        default:
-               dev->data->dev_link.link_speed = ETH_SPEED_NUM_NONE;
+               dev->data->dev_link.link_speed = RTE_ETH_SPEED_NUM_NONE;
        }
 
-       dev->data->dev_link.link_duplex = edata.duplex ? ETH_LINK_FULL_DUPLEX :
-                                                        ETH_LINK_HALF_DUPLEX;
-       dev->data->dev_link.link_autoneg = edata.autoneg ? ETH_LINK_AUTONEG :
-                                                          ETH_LINK_FIXED;
+       dev->data->dev_link.link_duplex = edata.duplex ? RTE_ETH_LINK_FULL_DUPLEX :
+                                                        RTE_ETH_LINK_HALF_DUPLEX;
+       dev->data->dev_link.link_autoneg = edata.autoneg ? RTE_ETH_LINK_AUTONEG :
+                                                          RTE_ETH_LINK_FIXED;
 
        neta_ppio_get_link_state(priv->ppio, &link_up);
-       dev->data->dev_link.link_status = link_up ? ETH_LINK_UP : ETH_LINK_DOWN;
+       dev->data->dev_link.link_status = link_up ? RTE_ETH_LINK_UP : RTE_ETH_LINK_DOWN;
 
        return 0;
 }
@@ -961,14 +961,15 @@ static int
 rte_pmd_mvneta_remove(struct rte_vdev_device *vdev)
 {
        uint16_t port_id;
+       int ret = 0;
 
        RTE_ETH_FOREACH_DEV(port_id) {
                if (rte_eth_devices[port_id].device != &vdev->device)
                        continue;
-               rte_eth_dev_close(port_id);
+               ret |= rte_eth_dev_close(port_id);
        }
 
-       return 0;
+       return ret == 0 ? 0 : -EIO;
 }
 
 static struct rte_vdev_driver pmd_mvneta_drv = {
@@ -978,4 +979,4 @@ static struct rte_vdev_driver pmd_mvneta_drv = {
 
 RTE_PMD_REGISTER_VDEV(net_mvneta, pmd_mvneta_drv);
 RTE_PMD_REGISTER_PARAM_STRING(net_mvneta, "iface=<ifc>");
-RTE_LOG_REGISTER(mvneta_logtype, pmd.net.mvneta, NOTICE);
+RTE_LOG_REGISTER_DEFAULT(mvneta_logtype, NOTICE);