X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fszedata2%2Frte_eth_szedata2.c;h=3c6a285e3c5edee605040d3e703a2f401c34cde7;hb=292be511d2909c14db3c9ceaffa317f2beee67a0;hp=0f1ff04c9c95d0bf44633981724a5b7973213c3c;hpb=9970a9ad07db7745ca6bc441819b287940ae86ea;p=dpdk.git diff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c index 0f1ff04c9c..3c6a285e3c 100644 --- a/drivers/net/szedata2/rte_eth_szedata2.c +++ b/drivers/net/szedata2/rte_eth_szedata2.c @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -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 @@ -1135,54 +1143,55 @@ eth_stats_reset(struct rte_eth_dev *dev) } static void -eth_rx_queue_release(void *q) +eth_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid) { - struct szedata2_rx_queue *rxq = (struct szedata2_rx_queue *)q; + struct szedata2_rx_queue *rxq = dev->data->rx_queues[qid]; if (rxq != NULL) { if (rxq->sze != NULL) szedata_close(rxq->sze); rte_free(rxq); + dev->data->rx_queues[qid] = NULL; } } static void -eth_tx_queue_release(void *q) +eth_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid) { - struct szedata2_tx_queue *txq = (struct szedata2_tx_queue *)q; + struct szedata2_tx_queue *txq = dev->data->tx_queues[qid]; if (txq != NULL) { if (txq->sze != NULL) szedata_close(txq->sze); rte_free(txq); + dev->data->tx_queues[qid] = NULL; } } -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); - for (i = 0; i < nb_rx; i++) { - eth_rx_queue_release(dev->data->rx_queues[i]); - dev->data->rx_queues[i] = NULL; - } + for (i = 0; i < nb_rx; i++) + eth_rx_queue_release(dev, i); dev->data->nb_rx_queues = 0; - for (i = 0; i < nb_tx; i++) { - eth_tx_queue_release(dev->data->tx_queues[i]); - dev->data->tx_queues[i] = NULL; - } + for (i = 0; i < nb_tx; i++) + eth_tx_queue_release(dev, i); dev->data->nb_tx_queues = 0; - rte_free(dev->data->mac_addrs); - dev->data->mac_addrs = NULL; + return ret; } static int @@ -1233,10 +1242,8 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, PMD_INIT_FUNC_TRACE(); - if (dev->data->rx_queues[rx_queue_id] != NULL) { - eth_rx_queue_release(dev->data->rx_queues[rx_queue_id]); - dev->data->rx_queues[rx_queue_id] = NULL; - } + if (dev->data->rx_queues[rx_queue_id] != NULL) + eth_rx_queue_release(dev, rx_queue_id); rxq = rte_zmalloc_socket("szedata2 rx queue", sizeof(struct szedata2_rx_queue), @@ -1248,18 +1255,20 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, } rxq->priv = internals; + dev->data->rx_queues[rx_queue_id] = rxq; + rxq->sze = szedata_open(internals->sze_dev_path); if (rxq->sze == NULL) { PMD_INIT_LOG(ERR, "szedata_open() failed for rx queue id " "%" PRIu16 "!", rx_queue_id); - eth_rx_queue_release(rxq); + eth_rx_queue_release(dev, rx_queue_id); return -EINVAL; } ret = szedata_subscribe3(rxq->sze, &rx, &tx); if (ret != 0 || rx == 0) { PMD_INIT_LOG(ERR, "szedata_subscribe3() failed for rx queue id " "%" PRIu16 "!", rx_queue_id); - eth_rx_queue_release(rxq); + eth_rx_queue_release(dev, rx_queue_id); return -EINVAL; } rxq->rx_channel = rx_channel; @@ -1270,8 +1279,6 @@ eth_rx_queue_setup(struct rte_eth_dev *dev, rxq->rx_bytes = 0; rxq->err_pkts = 0; - dev->data->rx_queues[rx_queue_id] = rxq; - PMD_INIT_LOG(DEBUG, "Configured rx queue id %" PRIu16 " on socket " "%u (channel id %u).", rxq->qid, socket_id, rxq->rx_channel); @@ -1295,10 +1302,8 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, PMD_INIT_FUNC_TRACE(); - if (dev->data->tx_queues[tx_queue_id] != NULL) { - eth_tx_queue_release(dev->data->tx_queues[tx_queue_id]); - dev->data->tx_queues[tx_queue_id] = NULL; - } + if (dev->data->tx_queues[tx_queue_id] != NULL) + eth_tx_queue_release(dev, tx_queue_id); txq = rte_zmalloc_socket("szedata2 tx queue", sizeof(struct szedata2_tx_queue), @@ -1310,18 +1315,20 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, } txq->priv = internals; + dev->data->tx_queues[tx_queue_id] = txq; + txq->sze = szedata_open(internals->sze_dev_path); if (txq->sze == NULL) { PMD_INIT_LOG(ERR, "szedata_open() failed for tx queue id " "%" PRIu16 "!", tx_queue_id); - eth_tx_queue_release(txq); + eth_tx_queue_release(dev, tx_queue_id); return -EINVAL; } ret = szedata_subscribe3(txq->sze, &rx, &tx); if (ret != 0 || tx == 0) { PMD_INIT_LOG(ERR, "szedata_subscribe3() failed for tx queue id " "%" PRIu16 "!", tx_queue_id); - eth_tx_queue_release(txq); + eth_tx_queue_release(dev, tx_queue_id); return -EINVAL; } txq->tx_channel = tx_channel; @@ -1330,8 +1337,6 @@ eth_tx_queue_setup(struct rte_eth_dev *dev, txq->tx_bytes = 0; txq->err_pkts = 0; - dev->data->tx_queues[tx_queue_id] = txq; - PMD_INIT_LOG(DEBUG, "Configured tx queue id %" PRIu16 " on socket " "%u (channel id %u).", txq->qid, socket_id, txq->tx_channel); @@ -1362,16 +1367,18 @@ eth_promiscuous_disable(struct rte_eth_dev *dev __rte_unused) 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 = { @@ -1487,9 +1494,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 */ @@ -1538,6 +1542,8 @@ rte_szedata2_eth_dev_init(struct rte_eth_dev *dev, struct port_info *pi) rte_ether_addr_copy(ð_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); @@ -1803,7 +1809,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]); } } @@ -1854,7 +1860,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; @@ -1912,10 +1918,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) { @@ -1923,7 +1927,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; @@ -1939,13 +1943,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_SUFFIX(szedata2_logtype_init, init, NOTICE); +RTE_LOG_REGISTER_SUFFIX(szedata2_logtype_driver, driver, NOTICE);