net/txgbe: add Rx and Tx init

[dpdk.git] / drivers / net / pfe / pfe_ethdev.c

diff --git a/drivers/net/pfe/pfe_ethdev.c b/drivers/net/pfe/pfe_ethdev.c
index 97356d2..3b07969 100644 (file)
--- a/drivers/net/pfe/pfe_ethdev.c
+++ b/drivers/net/pfe/pfe_ethdev.c
@@ -373,41 +373,43 @@ pfe_eth_close_cdev(struct pfe_eth_priv_s *priv)
        }
 }
 
-static void
+static int
 pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/)
 {
        struct pfe_eth_priv_s *priv = dev->data->dev_private;
 
+       dev->data->dev_started = 0;
+
        gemac_disable(priv->EMAC_baseaddr);
        gpi_disable(priv->GPI_baseaddr);
 
        dev->rx_pkt_burst = &pfe_dummy_recv_pkts;
        dev->tx_pkt_burst = &pfe_dummy_xmit_pkts;
-}
-
-static void
-pfe_eth_exit(struct rte_eth_dev *dev, struct pfe *pfe)
-{
-       PMD_INIT_FUNC_TRACE();
-
-       pfe_eth_stop(dev);
-       /* Close the device file for link status */
-       pfe_eth_close_cdev(dev->data->dev_private);
 
-       rte_eth_dev_release_port(dev);
-       pfe->nb_devs--;
+       return 0;
 }
 
-static void
+static int
 pfe_eth_close(struct rte_eth_dev *dev)
 {
+       int ret;
+       PMD_INIT_FUNC_TRACE();
+
        if (!dev)
-               return;
+               return -1;
 
        if (!g_pfe)
-               return;
+               return -1;
 
-       pfe_eth_exit(dev, g_pfe);
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
+       ret = pfe_eth_stop(dev);
+       /* Close the device file for link status */
+       pfe_eth_close_cdev(dev->data->dev_private);
+
+       munmap(g_pfe->cbus_baseaddr, g_pfe->cbus_size);
+       g_pfe->nb_devs--;
 
        if (g_pfe->nb_devs == 0) {
                pfe_hif_exit(g_pfe);
@@ -415,6 +417,8 @@ pfe_eth_close(struct rte_eth_dev *dev)
                rte_free(g_pfe);
                g_pfe = NULL;
        }
+
+       return ret;
 }
 
 static int
@@ -668,8 +672,7 @@ pfe_allmulticast_enable(struct rte_eth_dev *dev)
 static int
 pfe_link_down(struct rte_eth_dev *dev)
 {
-       pfe_eth_stop(dev);
-       return 0;
+       return pfe_eth_stop(dev);
 }
 
 static int
@@ -844,12 +847,16 @@ pfe_eth_init(struct rte_vdev_device *vdev, struct pfe *pfe, int id)
 
        eth_dev->data->mtu = 1500;
        eth_dev->dev_ops = &ops;
-       pfe_eth_stop(eth_dev);
+       err = pfe_eth_stop(eth_dev);
+       if (err != 0)
+               goto err0;
        pfe_gemac_init(priv);
 
        eth_dev->data->nb_rx_queues = 1;
        eth_dev->data->nb_tx_queues = 1;
 
+       eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
+
        /* For link status, open the PFE CDEV; Error from this function
         * is silently ignored; In case of error, the link status will not
         * be available.
@@ -1142,6 +1149,7 @@ pmd_pfe_remove(struct rte_vdev_device *vdev)
 {
        const char *name;
        struct rte_eth_dev *eth_dev = NULL;
+       int ret = 0;
 
        name = rte_vdev_device_name(vdev);
        if (name == NULL)
@@ -1153,19 +1161,12 @@ pmd_pfe_remove(struct rte_vdev_device *vdev)
                return 0;
 
        eth_dev = rte_eth_dev_allocated(name);
-       if (eth_dev == NULL)
-               return -ENODEV;
-
-       pfe_eth_exit(eth_dev, g_pfe);
-       munmap(g_pfe->cbus_baseaddr, g_pfe->cbus_size);
-
-       if (g_pfe->nb_devs == 0) {
-               pfe_hif_exit(g_pfe);
-               pfe_hif_lib_exit(g_pfe);
-               rte_free(g_pfe);
-               g_pfe = NULL;
+       if (eth_dev) {
+               pfe_eth_close(eth_dev);
+               ret = rte_eth_dev_release_port(eth_dev);
        }
-       return 0;
+
+       return ret;
 }
 
 static