X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Favp%2Favp_ethdev.c;h=6cb8bb4338deb11567a7103f34d3e23bccdfb12f;hb=7e5b479803c3e200dcab5d832bec7bd7f16081c6;hp=5b47f0924af7cd875ea2447c748aece3d352c9f8;hpb=9c99878aa1b16de26fcce82c112b401766dd910e;p=dpdk.git diff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c index 5b47f0924a..6cb8bb4338 100644 --- a/drivers/net/avp/avp_ethdev.c +++ b/drivers/net/avp/avp_ethdev.c @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -37,8 +37,8 @@ static int avp_dev_create(struct rte_pci_device *pci_dev, static int avp_dev_configure(struct rte_eth_dev *dev); static int avp_dev_start(struct rte_eth_dev *dev); -static void avp_dev_stop(struct rte_eth_dev *dev); -static void avp_dev_close(struct rte_eth_dev *dev); +static int avp_dev_stop(struct rte_eth_dev *dev); +static int avp_dev_close(struct rte_eth_dev *dev); static int avp_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info); static int avp_vlan_offload_set(struct rte_eth_dev *dev, int mask); @@ -75,8 +75,8 @@ static uint16_t avp_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); -static void avp_dev_rx_queue_release(void *rxq); -static void avp_dev_tx_queue_release(void *txq); +static void avp_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid); +static void avp_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid); static int avp_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats); @@ -267,7 +267,7 @@ avp_dev_process_request(struct avp_dev *avp, struct rte_avp_request *request) break; } - if ((count < 1) && (retry == 0)) { + if (retry == 0) { PMD_DRV_LOG(ERR, "Timeout while waiting for a response for %u\n", request->req_id); ret = -ETIME; @@ -957,8 +957,6 @@ eth_avp_dev_init(struct rte_eth_dev *eth_dev) eth_dev->dev_ops = &avp_eth_dev_ops; eth_dev->rx_pkt_burst = &avp_recv_pkts; eth_dev->tx_pkt_burst = &avp_xmit_pkts; - /* Let rte_eth_dev_close() release the port resources */ - eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE; if (rte_eal_process_type() != RTE_PROC_PRIMARY) { /* @@ -976,6 +974,7 @@ eth_avp_dev_init(struct rte_eth_dev *eth_dev) } rte_eth_copy_pci_info(eth_dev, pci_dev); + eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; /* Check current migration status */ if (avp_dev_migration_pending(eth_dev)) { @@ -1206,17 +1205,17 @@ _avp_mac_filter(struct avp_dev *avp, struct rte_mbuf *m) { struct rte_ether_hdr *eth = rte_pktmbuf_mtod(m, struct rte_ether_hdr *); - if (likely(_avp_cmp_ether_addr(&avp->ethaddr, ð->d_addr) == 0)) { + if (likely(_avp_cmp_ether_addr(&avp->ethaddr, ð->dst_addr) == 0)) { /* allow all packets destined to our address */ return 0; } - if (likely(rte_is_broadcast_ether_addr(ð->d_addr))) { + if (likely(rte_is_broadcast_ether_addr(ð->dst_addr))) { /* allow all broadcast packets */ return 0; } - if (likely(rte_is_multicast_ether_addr(ð->d_addr))) { + if (likely(rte_is_multicast_ether_addr(ð->dst_addr))) { /* allow all multicast packets */ return 0; } @@ -1927,18 +1926,11 @@ avp_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) } static void -avp_dev_rx_queue_release(void *rx_queue) +avp_dev_rx_queue_release(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id) { - struct avp_queue *rxq = (struct avp_queue *)rx_queue; - struct avp_dev *avp = rxq->avp; - struct rte_eth_dev_data *data = avp->dev_data; - unsigned int i; - - for (i = 0; i < avp->num_rx_queues; i++) { - if (data->rx_queues[i] == rxq) { - rte_free(data->rx_queues[i]); - data->rx_queues[i] = NULL; - } + if (eth_dev->data->rx_queues[rx_queue_id] != NULL) { + rte_free(eth_dev->data->rx_queues[rx_queue_id]); + eth_dev->data->rx_queues[rx_queue_id] = NULL; } } @@ -1958,18 +1950,11 @@ avp_dev_rx_queue_release_all(struct rte_eth_dev *eth_dev) } static void -avp_dev_tx_queue_release(void *tx_queue) +avp_dev_tx_queue_release(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id) { - struct avp_queue *txq = (struct avp_queue *)tx_queue; - struct avp_dev *avp = txq->avp; - struct rte_eth_dev_data *data = avp->dev_data; - unsigned int i; - - for (i = 0; i < avp->num_tx_queues; i++) { - if (data->tx_queues[i] == txq) { - rte_free(data->tx_queues[i]); - data->tx_queues[i] = NULL; - } + if (eth_dev->data->tx_queues[tx_queue_id] != NULL) { + rte_free(eth_dev->data->tx_queues[tx_queue_id]); + eth_dev->data->tx_queues[tx_queue_id] = NULL; } } @@ -2077,7 +2062,7 @@ unlock: return ret; } -static void +static int avp_dev_stop(struct rte_eth_dev *eth_dev) { struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); @@ -2086,6 +2071,7 @@ avp_dev_stop(struct rte_eth_dev *eth_dev) rte_spinlock_lock(&avp->lock); if (avp->flags & AVP_F_DETACHED) { PMD_DRV_LOG(ERR, "Operation not supported during VM live migration\n"); + ret = -ENOTSUP; goto unlock; } @@ -2101,14 +2087,18 @@ avp_dev_stop(struct rte_eth_dev *eth_dev) unlock: rte_spinlock_unlock(&avp->lock); + return ret; } -static void +static int avp_dev_close(struct rte_eth_dev *eth_dev) { struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); int ret; + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return 0; + rte_spinlock_lock(&avp->lock); if (avp->flags & AVP_F_DETACHED) { PMD_DRV_LOG(ERR, "Operation not supported during VM live migration\n"); @@ -2139,6 +2129,7 @@ avp_dev_close(struct rte_eth_dev *eth_dev) unlock: rte_spinlock_unlock(&avp->lock); + return 0; } static int @@ -2304,4 +2295,4 @@ avp_dev_stats_reset(struct rte_eth_dev *eth_dev) RTE_PMD_REGISTER_PCI(net_avp, rte_avp_pmd); RTE_PMD_REGISTER_PCI_TABLE(net_avp, pci_id_avp_map); -RTE_LOG_REGISTER(avp_logtype_driver, pmd.net.avp.driver, NOTICE); +RTE_LOG_REGISTER_SUFFIX(avp_logtype_driver, driver, NOTICE);