net/mlx5: remove redundant started flag

[dpdk.git] / drivers / net / mlx5 / mlx5_trigger.c

diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index 68e00a0..212b4df 100644 (file)
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -31,15 +31,10 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* DPDK headers don't like -pedantic. */
-#ifdef PEDANTIC
-#pragma GCC diagnostic ignored "-pedantic"
-#endif
 #include <rte_ether.h>
 #include <rte_ethdev.h>
-#ifdef PEDANTIC
-#pragma GCC diagnostic error "-pedantic"
-#endif
+#include <rte_interrupts.h>
+#include <rte_alarm.h>
 
 #include "mlx5.h"
 #include "mlx5_rxtx.h"
@@ -62,31 +57,46 @@ mlx5_dev_start(struct rte_eth_dev *dev)
        struct priv *priv = dev->data->dev_private;
        int err;
 
+       if (mlx5_is_secondary())
+               return -E_RTE_SECONDARY;
+
        priv_lock(priv);
-       if (priv->started) {
-               priv_unlock(priv);
-               return 0;
-       }
+       /* Update Rx/Tx callback. */
+       priv_dev_select_tx_function(priv, dev);
+       priv_dev_select_rx_function(priv, dev);
        DEBUG("%p: allocating and configuring hash RX queues", (void *)dev);
        err = priv_create_hash_rxqs(priv);
        if (!err)
-               err = priv_promiscuous_enable(priv);
-       if (!err)
-               err = priv_mac_addrs_enable(priv);
-       if (!err)
-               err = priv_allmulticast_enable(priv);
-       if (!err)
-               priv->started = 1;
+               err = priv_rehash_flows(priv);
        else {
                ERROR("%p: an error occurred while configuring hash RX queues:"
                      " %s",
                      (void *)priv, strerror(err));
-               /* Rollback. */
-               priv_allmulticast_disable(priv);
-               priv_promiscuous_disable(priv);
-               priv_mac_addrs_disable(priv);
-               priv_destroy_hash_rxqs(priv);
+               goto error;
+       }
+       err = priv_flow_start(priv);
+       if (err) {
+               ERROR("%p: an error occurred while configuring flows:"
+                     " %s",
+                     (void *)priv, strerror(err));
+               goto error;
        }
+       err = priv_rx_intr_vec_enable(priv);
+       if (err) {
+               ERROR("%p: RX interrupt vector creation failed",
+                     (void *)priv);
+               goto error;
+       }
+       priv_dev_interrupt_handler_install(priv, dev);
+       priv_xstats_init(priv);
+       priv_unlock(priv);
+       return 0;
+error:
+       /* Rollback. */
+       priv_special_flow_disable_all(priv);
+       priv_mac_addrs_disable(priv);
+       priv_destroy_hash_rxqs(priv);
+       priv_flow_stop(priv);
        priv_unlock(priv);
        return -err;
 }
@@ -104,16 +114,16 @@ mlx5_dev_stop(struct rte_eth_dev *dev)
 {
        struct priv *priv = dev->data->dev_private;
 
-       priv_lock(priv);
-       if (!priv->started) {
-               priv_unlock(priv);
+       if (mlx5_is_secondary())
                return;
-       }
+
+       priv_lock(priv);
        DEBUG("%p: cleaning up and destroying hash RX queues", (void *)dev);
-       priv_allmulticast_disable(priv);
-       priv_promiscuous_disable(priv);
+       priv_special_flow_disable_all(priv);
        priv_mac_addrs_disable(priv);
        priv_destroy_hash_rxqs(priv);
-       priv->started = 0;
+       priv_flow_stop(priv);
+       priv_rx_intr_vec_disable(priv);
+       priv_dev_interrupt_handler_uninstall(priv, dev);
        priv_unlock(priv);
 }