net/e1000: fix max Rx packet size

[dpdk.git] / drivers / net / szedata2 / rte_eth_szedata2.c

diff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c
index 821bb34..6eaeadf 100644 (file)
--- a/drivers/net/szedata2/rte_eth_szedata2.c
+++ b/drivers/net/szedata2/rte_eth_szedata2.c
@@ -15,8 +15,8 @@
 #include <libsze2.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_kvargs.h>
@@ -102,9 +102,6 @@ struct szedata2_tx_queue {
        volatile uint64_t err_pkts;
 };
 
-int szedata2_logtype_init;
-int szedata2_logtype_driver;
-
 static struct rte_ether_addr eth_addr = {
        .addr_bytes = { 0x00, 0x11, 0x17, 0x00, 0x00, 0x00 }
 };
@@ -1016,18 +1013,29 @@ err_rx:
        return ret;
 }
 
-static void
+static int
 eth_dev_stop(struct rte_eth_dev *dev)
 {
        uint16_t i;
        uint16_t nb_rx = dev->data->nb_rx_queues;
        uint16_t nb_tx = dev->data->nb_tx_queues;
+       int ret;
 
-       for (i = 0; i < nb_tx; i++)
-               eth_tx_queue_stop(dev, i);
+       dev->data->dev_started = 0;
 
-       for (i = 0; i < nb_rx; i++)
-               eth_rx_queue_stop(dev, i);
+       for (i = 0; i < nb_tx; i++) {
+               ret = eth_tx_queue_stop(dev, i);
+               if (ret != 0)
+                       return ret;
+       }
+
+       for (i = 0; i < nb_rx; i++) {
+               ret = eth_rx_queue_stop(dev, i);
+               if (ret != 0)
+                       return ret;
+       }
+
+       return 0;
 }
 
 static int
@@ -1158,15 +1166,19 @@ eth_tx_queue_release(void *q)
        }
 }
 
-static void
+static int
 eth_dev_close(struct rte_eth_dev *dev)
 {
        struct pmd_internals *internals = dev->data->dev_private;
        uint16_t i;
        uint16_t nb_rx = dev->data->nb_rx_queues;
        uint16_t nb_tx = dev->data->nb_tx_queues;
+       int ret;
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
 
-       eth_dev_stop(dev);
+       ret = eth_dev_stop(dev);
 
        free(internals->sze_dev_path);
 
@@ -1181,8 +1193,7 @@ eth_dev_close(struct rte_eth_dev *dev)
        }
        dev->data->nb_tx_queues = 0;
 
-       rte_free(dev->data->mac_addrs);
-       dev->data->mac_addrs = NULL;
+       return ret;
 }
 
 static int
@@ -1489,9 +1500,6 @@ rte_szedata2_eth_dev_init(struct rte_eth_dev *dev, struct port_info *pi)
        PMD_INIT_LOG(INFO, "Initializing eth_dev %s (driver %s)", data->name,
                        RTE_STR(RTE_SZEDATA2_DRIVER_NAME));
 
-       /* Let rte_eth_dev_close() release the port resources */
-       dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
-
        /* Fill internal private structure. */
        internals->dev = dev;
        /* Get index of szedata2 device file and create path to device file */
@@ -1540,6 +1548,8 @@ rte_szedata2_eth_dev_init(struct rte_eth_dev *dev, struct port_info *pi)
 
        rte_ether_addr_copy(&eth_addr, data->mac_addrs);
 
+       dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
+
        PMD_INIT_LOG(INFO, "%s device %s successfully initialized",
                        RTE_STR(RTE_SZEDATA2_DRIVER_NAME), data->name);
 
@@ -1805,7 +1815,7 @@ szedata2_eth_dev_release_interval(struct rte_eth_dev **eth_devs,
 
        for (i = from; i < to; i++) {
                rte_szedata2_eth_dev_uninit(eth_devs[i]);
-               rte_eth_dev_pci_release(eth_devs[i]);
+               rte_eth_dev_release_port(eth_devs[i]);
        }
 }
 
@@ -1856,7 +1866,7 @@ static int szedata2_eth_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
                if (ret != 0) {
                        PMD_INIT_LOG(ERR, "Failed to init eth_dev for port %u",
                                        i);
-                       rte_eth_dev_pci_release(eth_devs[i]);
+                       rte_eth_dev_release_port(eth_devs[i]);
                        szedata2_eth_dev_release_interval(eth_devs, 0, i);
                        rte_free(list_entry);
                        return ret;
@@ -1914,10 +1924,8 @@ static int szedata2_eth_pci_remove(struct rte_pci_device *pci_dev)
                                pci_dev->device.name, i);
                PMD_DRV_LOG(DEBUG, "Removing eth_dev %s", name);
                eth_dev = rte_eth_dev_allocated(name);
-               if (!eth_dev) {
-                       PMD_DRV_LOG(ERR, "eth_dev %s not found", name);
-                       retval = retval ? retval : -ENODEV;
-               }
+               if (eth_dev == NULL)
+                       continue; /* port already released */
 
                ret = rte_szedata2_eth_dev_uninit(eth_dev);
                if (ret != 0) {
@@ -1925,7 +1933,7 @@ static int szedata2_eth_pci_remove(struct rte_pci_device *pci_dev)
                        retval = retval ? retval : ret;
                }
 
-               rte_eth_dev_pci_release(eth_dev);
+               rte_eth_dev_release_port(eth_dev);
        }
 
        return retval;
@@ -1941,13 +1949,5 @@ RTE_PMD_REGISTER_PCI(RTE_SZEDATA2_DRIVER_NAME, szedata2_eth_driver);
 RTE_PMD_REGISTER_PCI_TABLE(RTE_SZEDATA2_DRIVER_NAME, rte_szedata2_pci_id_table);
 RTE_PMD_REGISTER_KMOD_DEP(RTE_SZEDATA2_DRIVER_NAME,
        "* combo6core & combov3 & szedata2 & ( szedata2_cv3 | szedata2_cv3_fdt )");
-
-RTE_INIT(szedata2_init_log)
-{
-       szedata2_logtype_init = rte_log_register("pmd.net.szedata2.init");
-       if (szedata2_logtype_init >= 0)
-               rte_log_set_level(szedata2_logtype_init, RTE_LOG_NOTICE);
-       szedata2_logtype_driver = rte_log_register("pmd.net.szedata2.driver");
-       if (szedata2_logtype_driver >= 0)
-               rte_log_set_level(szedata2_logtype_driver, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(szedata2_logtype_init, pmd.net.szedata2.init, NOTICE);
+RTE_LOG_REGISTER(szedata2_logtype_driver, pmd.net.szedata2.driver, NOTICE);