Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ada9f5d0 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Roland Dreier
Browse files

IB/mlx5: Fix eq names to display nicely in /proc/interrupts 



It's helpful for a driver to put the pci slot name in its interrupt
names, so /proc/interrupts will show the pci slot of the device.

Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarEli Cohen <eli@mellanox.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 9c865131

drivers/infiniband/hw/mlx5/main.c

+3 −3
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ int mlx5_vector2eqn(struct mlx5_ib_dev *dev, int vector, int *eqn, int *irqn) 
static int alloc_comp_eqs(struct mlx5_ib_dev *dev)

{

	struct mlx5_eq_table *table = &dev->mdev.priv.eq_table;

	char name[MLX5_MAX_EQ_NAME];

	struct mlx5_eq *eq, *n;

	int ncomp_vec;

	int nent;
@@ -180,11 +181,10 @@ static int alloc_comp_eqs(struct mlx5_ib_dev *dev) 
			goto clean;

		}



		snprintf(eq->name, MLX5_MAX_EQ_NAME, "mlx5_comp%d", i);

		snprintf(name, MLX5_MAX_EQ_NAME, "mlx5_comp%d", i);

		err = mlx5_create_map_eq(&dev->mdev, eq,

					 i + MLX5_EQ_VEC_COMP_BASE, nent, 0,

					 eq->name,

					 &dev->mdev.priv.uuari.uars[0]);

					 name, &dev->mdev.priv.uuari.uars[0]);

		if (err) {

			kfree(eq);

			goto clean;

drivers/net/ethernet/mellanox/mlx5/core/eq.c

+3 −1
Original line number Diff line number Diff line
@@ -366,9 +366,11 @@ int mlx5_create_map_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq, u8 vecidx, 
		goto err_in;

	}



	snprintf(eq->name, MLX5_MAX_EQ_NAME, "%s@pci:%s",

		 name, pci_name(dev->pdev));

	eq->eqn = out.eq_number;

	err = request_irq(table->msix_arr[vecidx].vector, mlx5_msix_handler, 0,

			  name, eq);

			  eq->name, eq);

	if (err)

		goto err_eq;

include/linux/mlx5/driver.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ enum { 
};



enum {

	MLX5_MAX_EQ_NAME	= 20

	MLX5_MAX_EQ_NAME	= 32

};



enum {