3 files changed, 15 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 8a3a2037b005..a07b774e7864 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -1159,7 +1159,8 @@ static void mlx4_ib_alloc_eqs(struct mlx4_dev *dev, struct mlx4_ib_dev *ibdev)
                         sprintf(name, "mlx4-ib-%d-%d@%s",
                                 i, j, dev->pdev->bus->name);
                         /* Set IRQ for specific name (per ring) */
-                        if (mlx4_assign_eq(dev, name, &ibdev->eq_table[eq])) {
+                        if (mlx4_assign_eq(dev, name, NULL,
+                                           &ibdev->eq_table[eq])) {
                                 /* Use legacy (same as mlx4_en driver) */
                                 pr_warn("Can't allocate EQ %d; reverting to legacy\n", eq);
                                 ibdev->eq_table[eq] =
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_cq.c b/drivers/net/ethernet/mellanox/mlx4/en_cq.c
index 908a460d8db6..0ef615684021 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_cq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_cq.c
@@ -91,7 +91,8 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,
                                 sprintf(name, "%s-%d", priv->dev->name,
                                         cq->ring);
                                 /* Set IRQ for specific name (per ring) */
-                                if (mlx4_assign_eq(mdev->dev, name, &cq->vector)) {
+                                if (mlx4_assign_eq(mdev->dev, name, NULL,
+                                                   &cq->vector)) {
                                         cq->vector = (cq->ring + 1 + priv->port)
                                             % mdev->dev->caps.num_comp_vectors;
                                         mlx4_warn(mdev, "Failed Assigning an EQ to "
diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c
index bce98d9c0039..cd48337cbfc0 100644
--- a/drivers/net/ethernet/mellanox/mlx4/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx4/eq.c
@@ -39,6 +39,7 @@
 #include <linux/dma-mapping.h>
 
 #include <linux/mlx4/cmd.h>
+#include <linux/cpu_rmap.h>
 
 #include "mlx4.h"
 #include "fw.h"
@@ -1060,7 +1061,8 @@ int mlx4_test_interrupts(struct mlx4_dev *dev)
 }
 EXPORT_SYMBOL(mlx4_test_interrupts);
 
-int mlx4_assign_eq(struct mlx4_dev *dev, char* name, int * vector)
+int mlx4_assign_eq(struct mlx4_dev *dev, char *name, struct cpu_rmap *rmap,
+                   int *vector)
 {
 
         struct mlx4_priv *priv = mlx4_priv(dev);
@@ -1074,6 +1076,14 @@ int mlx4_assign_eq(struct mlx4_dev *dev, char* name, int * vector)
                         snprintf(priv->eq_table.irq_names +
                                         vec * MLX4_IRQNAME_SIZE,
                                         MLX4_IRQNAME_SIZE, "%s", name);
+#ifdef CONFIG_RFS_ACCEL
+                        if (rmap) {
+                                err = irq_cpu_rmap_add(rmap,
+                                                       priv->eq_table.eq[vec].irq);
+                                if (err)
+                                        mlx4_warn(dev, "Failed adding irq rmap\n");
+                        }
+#endif
                         err = request_irq(priv->eq_table.eq[vec].irq,
                                           mlx4_msi_x_interrupt, 0,
                                           &priv->eq_table.irq_names[vec<<5],