Commit cf49f41d authored by Yuval Avnery's avatar Yuval Avnery Committed by Saeed Mahameed
Browse files

net/mlx5: Rename mlx5_irq_info to mlx5_irq 



struct mlx5_irq_info is an active object and not just info.

Signed-off-by: default avatarYuval Avnery <yuvalav@mellanox.com>
Reviewed-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 256cf690

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

+38 −39
Original line number Diff line number Diff line
@@ -12,14 +12,14 @@ 


#define MLX5_MAX_IRQ_NAME (32)



struct mlx5_irq_info {

struct mlx5_irq {

	struct atomic_notifier_head nh;

	cpumask_var_t mask;

	char name[MLX5_MAX_IRQ_NAME];

};



struct mlx5_irq_table {

	struct mlx5_irq_info *irq_info;

	struct mlx5_irq *irq;

	int nvec;

#ifdef CONFIG_RFS_ACCEL

	struct cpu_rmap *rmap;
@@ -48,29 +48,29 @@ int mlx5_irq_get_num_comp(struct mlx5_irq_table *table) 
	return table->nvec - MLX5_EQ_VEC_COMP_BASE;

}



static struct mlx5_irq_info *mlx5_irq_get(struct mlx5_core_dev *dev, int vecidx)

static struct mlx5_irq *mlx5_irq_get(struct mlx5_core_dev *dev, int vecidx)

{

	struct mlx5_irq_table *irq_table = dev->priv.irq_table;



	return &irq_table->irq_info[vecidx];

	return &irq_table->irq[vecidx];

}



int mlx5_irq_attach_nb(struct mlx5_irq_table *irq_table, int vecidx,

		       struct notifier_block *nb)

{

	struct mlx5_irq_info *irq_info;

	struct mlx5_irq *irq;



	irq_info = &irq_table->irq_info[vecidx];

	return atomic_notifier_chain_register(&irq_info->nh, nb);

	irq = &irq_table->irq[vecidx];

	return atomic_notifier_chain_register(&irq->nh, nb);

}



int mlx5_irq_detach_nb(struct mlx5_irq_table *irq_table, int vecidx,

		       struct notifier_block *nb)

{

	struct mlx5_irq_info *irq_info;

	struct mlx5_irq *irq;



	irq_info = &irq_table->irq_info[vecidx];

	return atomic_notifier_chain_unregister(&irq_info->nh, nb);

	irq = &irq_table->irq[vecidx];

	return atomic_notifier_chain_unregister(&irq->nh, nb);

}



static irqreturn_t mlx5_irq_int_handler(int irq, void *nh)
@@ -108,15 +108,15 @@ static int request_irqs(struct mlx5_core_dev *dev, int nvec) 
	int i;



	for (i = 0; i < nvec; i++) {

		struct mlx5_irq_info *irq_info = mlx5_irq_get(dev, i);

		struct mlx5_irq *irq = mlx5_irq_get(dev, i);

		int irqn = pci_irq_vector(dev->pdev, i);



		irq_set_name(name, i);

		ATOMIC_INIT_NOTIFIER_HEAD(&irq_info->nh);

		snprintf(irq_info->name, MLX5_MAX_IRQ_NAME,

		ATOMIC_INIT_NOTIFIER_HEAD(&irq->nh);

		snprintf(irq->name, MLX5_MAX_IRQ_NAME,

			 "%s@pci:%s", name, pci_name(dev->pdev));

		err = request_irq(irqn, mlx5_irq_int_handler, 0, irq_info->name,

				  &irq_info->nh);

		err = request_irq(irqn, mlx5_irq_int_handler, 0, irq->name,

				  &irq->nh);

		if (err) {

			mlx5_core_err(dev, "Failed to request irq\n");

			goto err_request_irq;
@@ -126,10 +126,10 @@ static int request_irqs(struct mlx5_core_dev *dev, int nvec) 


err_request_irq:

	for (; i >= 0; i--) {

		struct mlx5_irq_info *irq_info = mlx5_irq_get(dev, i);

		struct mlx5_irq *irq = mlx5_irq_get(dev, i);

		int irqn = pci_irq_vector(dev->pdev, i);



		free_irq(irqn, &irq_info->nh);

		free_irq(irqn, &irq->nh);

	}

	return  err;

}
@@ -183,23 +183,22 @@ err_out: 
static int set_comp_irq_affinity_hint(struct mlx5_core_dev *mdev, int i)

{

	int vecidx = MLX5_EQ_VEC_COMP_BASE + i;

	struct mlx5_irq_info *irq_info;

	int irq;

	struct mlx5_irq *irq;

	int irqn;



	irq_info = mlx5_irq_get(mdev, vecidx);

	irq = pci_irq_vector(mdev->pdev, vecidx);

	if (!zalloc_cpumask_var(&irq_info->mask, GFP_KERNEL)) {

	irq = mlx5_irq_get(mdev, vecidx);

	irqn = pci_irq_vector(mdev->pdev, vecidx);

	if (!zalloc_cpumask_var(&irq->mask, GFP_KERNEL)) {

		mlx5_core_warn(mdev, "zalloc_cpumask_var failed");

		return -ENOMEM;

	}



	cpumask_set_cpu(cpumask_local_spread(i, mdev->priv.numa_node),

			irq_info->mask);



			irq->mask);

	if (IS_ENABLED(CONFIG_SMP) &&

	    irq_set_affinity_hint(irq, irq_info->mask))

	    irq_set_affinity_hint(irqn, irq->mask))

		mlx5_core_warn(mdev, "irq_set_affinity_hint failed, irq 0x%.4x",

			       irq);

			       irqn);



	return 0;

}
@@ -207,13 +206,13 @@ static int set_comp_irq_affinity_hint(struct mlx5_core_dev *mdev, int i) 
static void clear_comp_irq_affinity_hint(struct mlx5_core_dev *mdev, int i)

{

	int vecidx = MLX5_EQ_VEC_COMP_BASE + i;

	struct mlx5_irq_info *irq_info;

	int irq;

	struct mlx5_irq *irq;

	int irqn;



	irq_info = mlx5_irq_get(mdev, vecidx);

	irq = pci_irq_vector(mdev->pdev, vecidx);

	irq_set_affinity_hint(irq, NULL);

	free_cpumask_var(irq_info->mask);

	irq = mlx5_irq_get(mdev, vecidx);

	irqn = pci_irq_vector(mdev->pdev, vecidx);

	irq_set_affinity_hint(irqn, NULL);

	free_cpumask_var(irq->mask);

}



static int set_comp_irq_affinity_hints(struct mlx5_core_dev *mdev)
@@ -249,7 +248,7 @@ static void clear_comp_irqs_affinity_hints(struct mlx5_core_dev *mdev) 
struct cpumask *

mlx5_irq_get_affinity_mask(struct mlx5_irq_table *irq_table, int vecidx)

{

	return irq_table->irq_info[vecidx].mask;

	return irq_table->irq[vecidx].mask;

}



#ifdef CONFIG_RFS_ACCEL
@@ -285,15 +284,15 @@ int mlx5_irq_table_create(struct mlx5_core_dev *dev) 
	if (nvec <= MLX5_EQ_VEC_COMP_BASE)

		return -ENOMEM;



	table->irq_info = kcalloc(nvec, sizeof(*table->irq_info), GFP_KERNEL);

	if (!table->irq_info)

	table->irq = kcalloc(nvec, sizeof(*table->irq), GFP_KERNEL);

	if (!table->irq)

		return -ENOMEM;



	nvec = pci_alloc_irq_vectors(dev->pdev, MLX5_EQ_VEC_COMP_BASE + 1,

				     nvec, PCI_IRQ_MSIX);

	if (nvec < 0) {

		err = nvec;

		goto err_free_irq_info;

		goto err_free_irq;

	}



	table->nvec = nvec;
@@ -320,8 +319,8 @@ err_request_irqs: 
	irq_clear_rmap(dev);

err_set_rmap:

	pci_free_irq_vectors(dev->pdev);

err_free_irq_info:

	kfree(table->irq_info);

err_free_irq:

	kfree(table->irq);

	return err;

}
@@ -340,6 +339,6 @@ void mlx5_irq_table_destroy(struct mlx5_core_dev *dev) 
		free_irq(pci_irq_vector(dev->pdev, i),

			 &mlx5_irq_get(dev, i)->nh);

	pci_free_irq_vectors(dev->pdev);

	kfree(table->irq_info);

	kfree(table->irq);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE