net/mlx4_core: Respond to operation request by firmware

This commit adds new firmware command and new firmware event.  The firmware
raises the MLX4_EVENT_TYPE_OP_REQUIRED event in order to signal the driver it
needs to perform an administrative operation throughout the MLX4_CMD_GET_OP_REQ
command. At the moment the supported operation is adding/removing multicast
entries which are used by the firmware for handling NCSI traffic in B0
steering mode.

Also, had to swap the order of mlx4_init_mcg_table() and
mlx4_init_eq_table() to make sure that driver will get events only after
resources are initialized to handle it.

Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.com>
Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.com>
Signed-off-by: Eugenia Emantayev <eugenia@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 19 insertions, 16 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index e85af922dcdc..f1d818f9bb01 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -1692,11 +1692,19 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
                 goto err_xrcd_table_free;
         }
 
+        if (!mlx4_is_slave(dev)) {
+                err = mlx4_init_mcg_table(dev);
+                if (err) {
+                        mlx4_err(dev, "Failed to initialize multicast group table, aborting.\n");
+                        goto err_mr_table_free;
+                }
+        }
+
         err = mlx4_init_eq_table(dev);
         if (err) {
                 mlx4_err(dev, "Failed to initialize "
                          "event queue table, aborting.\n");
-                goto err_mr_table_free;
+                goto err_mcg_table_free;
         }
 
         err = mlx4_cmd_use_events(dev);
@@ -1746,19 +1754,10 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
                 goto err_srq_table_free;
         }
 
-        if (!mlx4_is_slave(dev)) {
-                err = mlx4_init_mcg_table(dev);
-                if (err) {
-                        mlx4_err(dev, "Failed to initialize "
-                                 "multicast group table, aborting.\n");
-                        goto err_qp_table_free;
-                }
-        }
-
         err = mlx4_init_counters_table(dev);
         if (err && err != -ENOENT) {
                 mlx4_err(dev, "Failed to initialize counters table, aborting.\n");
-                goto err_mcg_table_free;
+                goto err_qp_table_free;
         }
 
         if (!mlx4_is_slave(dev)) {
@@ -1803,9 +1802,6 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
 err_counters_table_free:
         mlx4_cleanup_counters_table(dev);
 
-err_mcg_table_free:
-        mlx4_cleanup_mcg_table(dev);
-
 err_qp_table_free:
         mlx4_cleanup_qp_table(dev);
 
@@ -1821,6 +1817,10 @@ err_cmd_poll:
 err_eq_table_free:
         mlx4_cleanup_eq_table(dev);
 
+err_mcg_table_free:
+        if (!mlx4_is_slave(dev))
+                mlx4_cleanup_mcg_table(dev);
+
 err_mr_table_free:
         mlx4_cleanup_mr_table(dev);
 
@@ -2197,6 +2197,9 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data)
                         }
                 }
 
+                atomic_set(&priv->opreq_count, 0);
+                INIT_WORK(&priv->opreq_task, mlx4_opreq_action);
+
                 /*
                  * Now reset the HCA before we touch the PCI capabilities or
                  * attempt a firmware command, since a boot ROM may have left
@@ -2315,12 +2318,12 @@ err_port:
                 mlx4_cleanup_port_info(&priv->port[port]);
 
         mlx4_cleanup_counters_table(dev);
-        mlx4_cleanup_mcg_table(dev);
         mlx4_cleanup_qp_table(dev);
         mlx4_cleanup_srq_table(dev);
         mlx4_cleanup_cq_table(dev);
         mlx4_cmd_use_polling(dev);
         mlx4_cleanup_eq_table(dev);
+        mlx4_cleanup_mcg_table(dev);
         mlx4_cleanup_mr_table(dev);
         mlx4_cleanup_xrcd_table(dev);
         mlx4_cleanup_pd_table(dev);
@@ -2403,12 +2406,12 @@ static void mlx4_remove_one(struct pci_dev *pdev)
                                                    RES_TR_FREE_SLAVES_ONLY);
 
                 mlx4_cleanup_counters_table(dev);
-                mlx4_cleanup_mcg_table(dev);
                 mlx4_cleanup_qp_table(dev);
                 mlx4_cleanup_srq_table(dev);
                 mlx4_cleanup_cq_table(dev);
                 mlx4_cmd_use_polling(dev);
                 mlx4_cleanup_eq_table(dev);
+                mlx4_cleanup_mcg_table(dev);
                 mlx4_cleanup_mr_table(dev);
                 mlx4_cleanup_xrcd_table(dev);
                 mlx4_cleanup_pd_table(dev);