net/dpaa2: avoid multiple IOVA conversions

[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 c1ea6fc..30c888c 100644 (file)
--- a/drivers/net/szedata2/rte_eth_szedata2.c
+++ b/drivers/net/szedata2/rte_eth_szedata2.c
@@ -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 }
 };
@@ -1044,7 +1041,7 @@ eth_dev_configure(struct rte_eth_dev *dev)
        return 0;
 }
 
-static void
+static int
 eth_dev_info(struct rte_eth_dev *dev,
                struct rte_eth_dev_info *dev_info)
 {
@@ -1061,6 +1058,8 @@ eth_dev_info(struct rte_eth_dev *dev,
        dev_info->rx_queue_offload_capa = 0;
        dev_info->tx_queue_offload_capa = 0;
        dev_info->speed_capa = ETH_LINK_SPEED_100G;
+
+       return 0;
 }
 
 static int
@@ -1109,7 +1108,7 @@ eth_stats_get(struct rte_eth_dev *dev,
        return 0;
 }
 
-static void
+static int
 eth_stats_reset(struct rte_eth_dev *dev)
 {
        uint16_t i;
@@ -1128,6 +1127,8 @@ eth_stats_reset(struct rte_eth_dev *dev)
                txq->tx_bytes = 0;
                txq->err_pkts = 0;
        }
+
+       return 0;
 }
 
 static void
@@ -1157,12 +1158,15 @@ eth_tx_queue_release(void *q)
 static void
 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;
 
        eth_dev_stop(dev);
 
+       free(internals->sze_dev_path);
+
        for (i = 0; i < nb_rx; i++) {
                eth_rx_queue_release(dev->data->rx_queues[i]);
                dev->data->rx_queues[i] = NULL;
@@ -1173,6 +1177,9 @@ eth_dev_close(struct rte_eth_dev *dev)
                dev->data->tx_queues[i] = NULL;
        }
        dev->data->nb_tx_queues = 0;
+
+       rte_free(dev->data->mac_addrs);
+       dev->data->mac_addrs = NULL;
 }
 
 static int
@@ -1336,30 +1343,34 @@ eth_mac_addr_set(struct rte_eth_dev *dev __rte_unused,
        return 0;
 }
 
-static void
+static int
 eth_promiscuous_enable(struct rte_eth_dev *dev __rte_unused)
 {
        PMD_DRV_LOG(WARNING, "Enabling promiscuous mode is not supported. "
                        "The card is always in promiscuous mode.");
+       return 0;
 }
 
-static void
+static int
 eth_promiscuous_disable(struct rte_eth_dev *dev __rte_unused)
 {
        PMD_DRV_LOG(WARNING, "Disabling promiscuous mode is not supported. "
                        "The card is always in promiscuous mode.");
+       return -ENOTSUP;
 }
 
-static void
+static int
 eth_allmulticast_enable(struct rte_eth_dev *dev __rte_unused)
 {
        PMD_DRV_LOG(WARNING, "Enabling allmulticast mode is not supported.");
+       return -ENOTSUP;
 }
 
-static void
+static int
 eth_allmulticast_disable(struct rte_eth_dev *dev __rte_unused)
 {
        PMD_DRV_LOG(WARNING, "Disabling allmulticast mode is not supported.");
+       return -ENOTSUP;
 }
 
 static const struct eth_dev_ops ops = {
@@ -1475,6 +1486,9 @@ 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 */
@@ -1537,12 +1551,9 @@ rte_szedata2_eth_dev_init(struct rte_eth_dev *dev, struct port_info *pi)
 static int
 rte_szedata2_eth_dev_uninit(struct rte_eth_dev *dev)
 {
-       struct pmd_internals *internals = (struct pmd_internals *)
-               dev->data->dev_private;
-
        PMD_INIT_FUNC_TRACE();
 
-       free(internals->sze_dev_path);
+       eth_dev_close(dev);
 
        PMD_DRV_LOG(INFO, "%s device %s successfully uninitialized",
                        RTE_STR(RTE_SZEDATA2_DRIVER_NAME), dev->data->name);
@@ -1567,6 +1578,14 @@ static const struct rte_pci_id rte_szedata2_pci_id_table[] = {
                RTE_PCI_DEVICE(PCI_VENDOR_ID_NETCOPE,
                                PCI_DEVICE_ID_NETCOPE_NFB200G2QL)
        },
+       {
+               RTE_PCI_DEVICE(PCI_VENDOR_ID_SILICOM,
+                               PCI_DEVICE_ID_FB2CGG3)
+       },
+       {
+               RTE_PCI_DEVICE(PCI_VENDOR_ID_SILICOM,
+                               PCI_DEVICE_ID_FB2CGG3D)
+       },
        {
                .vendor_id = 0,
        }
@@ -1919,13 +1938,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);