X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fszedata2%2Frte_eth_szedata2.c;h=6a084e3e1b1b1a4231680045929b2c8b143beb34;hb=a5a0a43bc62ed5c735ae482dbc4d8a7af4b95eab;hp=5f589dfa4c93de11c590a7957d246e7de2bd4ca5;hpb=68f578bf9bf87ed72447054e0b49928d82b55689;p=dpdk.git diff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c index 5f589dfa4c..6a084e3e1b 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 @@ -1013,25 +1013,36 @@ 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 eth_dev_configure(struct rte_eth_dev *dev) { struct rte_eth_dev_data *data = dev->data; - if (data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER) { + if (data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_SCATTER) { dev->rx_pkt_burst = eth_szedata2_rx_scattered; data->scattered_rx = 1; } else { @@ -1053,11 +1064,11 @@ eth_dev_info(struct rte_eth_dev *dev, dev_info->max_rx_queues = internals->max_rx_queues; dev_info->max_tx_queues = internals->max_tx_queues; dev_info->min_rx_bufsize = 0; - dev_info->rx_offload_capa = DEV_RX_OFFLOAD_SCATTER; + dev_info->rx_offload_capa = RTE_ETH_RX_OFFLOAD_SCATTER; dev_info->tx_offload_capa = 0; dev_info->rx_queue_offload_capa = 0; dev_info->tx_queue_offload_capa = 0; - dev_info->speed_capa = ETH_LINK_SPEED_100G; + dev_info->speed_capa = RTE_ETH_LINK_SPEED_100G; return 0; } @@ -1132,26 +1143,28 @@ 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; } } @@ -1162,26 +1175,23 @@ eth_dev_close(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; + + 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 0; + return ret; } static int @@ -1192,10 +1202,10 @@ eth_link_update(struct rte_eth_dev *dev, memset(&link, 0, sizeof(link)); - link.link_speed = ETH_SPEED_NUM_100G; - link.link_duplex = ETH_LINK_FULL_DUPLEX; - link.link_status = ETH_LINK_UP; - link.link_autoneg = ETH_LINK_FIXED; + link.link_speed = RTE_ETH_SPEED_NUM_100G; + link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX; + link.link_status = RTE_ETH_LINK_UP; + link.link_autoneg = RTE_ETH_LINK_FIXED; rte_eth_linkstatus_set(dev, &link); return 0; @@ -1232,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), @@ -1247,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; @@ -1269,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); @@ -1294,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), @@ -1309,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; @@ -1329,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); @@ -1536,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); @@ -1935,5 +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_LOG_REGISTER(szedata2_logtype_init, pmd.net.szedata2.init, NOTICE); -RTE_LOG_REGISTER(szedata2_logtype_driver, pmd.net.szedata2.driver, NOTICE); +RTE_LOG_REGISTER_SUFFIX(szedata2_logtype_init, init, NOTICE); +RTE_LOG_REGISTER_SUFFIX(szedata2_logtype_driver, driver, NOTICE);