mlx4_en: using new mlx4 interrupt scheme

Each RX ring will have its own interrupt vector, and TX rings will share one
(we mostly use polling for TX completions).
The vectors are assigned first time device is opened, and its name includes
the interface name and ring number.

Signed-off-by: Markuze Alex <markuze@mellanox.co.il>
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 11 insertions, 9 deletions

diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c
index 1ff6ca6466e..29aaa430399 100644
--- a/drivers/net/mlx4/en_main.c
+++ b/drivers/net/mlx4/en_main.c
@@ -241,16 +241,18 @@ static void *mlx4_en_add(struct mlx4_dev *dev)
         mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH)
                 mdev->port_cnt++;
 
-        /* If we did not receive an explicit number of Rx rings, default to
-         * the number of completion vectors populated by the mlx4_core */
         mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) {
-                mlx4_info(mdev, "Using %d tx rings for port:%d\n",
-                          mdev->profile.prof[i].tx_ring_num, i);
-                mdev->profile.prof[i].rx_ring_num = min_t(int,
-                        roundup_pow_of_two(dev->caps.num_comp_vectors),
-                        MAX_RX_RINGS);
-                mlx4_info(mdev, "Defaulting to %d rx rings for port:%d\n",
-                          mdev->profile.prof[i].rx_ring_num, i);
+                if (!dev->caps.comp_pool) {
+                        mdev->profile.prof[i].rx_ring_num =
+                                rounddown_pow_of_two(max_t(int, MIN_RX_RINGS,
+                                                           min_t(int,
+                                                                 dev->caps.num_comp_vectors,
+                                                                 MAX_RX_RINGS)));
+                } else {
+                        mdev->profile.prof[i].rx_ring_num = rounddown_pow_of_two(
+                                min_t(int, dev->caps.comp_pool/
+                                      dev->caps.num_ports - 1 , MAX_MSIX_P_PORT - 1));
+                }
         }
 
         /* Create our own workqueue for reset/multicast tasks