Commit 99f96b45 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Leon Romanovsky
Browse files

RDMA/irdma: Change name of interrupts 



Add more information in interrupt names.

Before this patch it was:
irdma
CEQ
CEQ
...

Now:
irdma-0000:18:00.0-AEQ
irdma-0000:18:00.0-CEQ-0
irdma-0000:18:00.0-CEQ-1
...

Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Suggested-by: default avatarPiotr Raczynski <piotr.raczynski@intel.com>
Reviewed-by: default avatarShiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: default avatarShiraz Saleem <shiraz.saleem@intel.com>
Link: https://lore.kernel.org/r/20230315145305.955-4-shiraz.saleem@intel.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 0219ad5d

drivers/infiniband/hw/irdma/hw.c

+10 −3
Original line number Diff line number Diff line
@@ -1089,14 +1089,19 @@ static int irdma_cfg_ceq_vector(struct irdma_pci_f *rf, struct irdma_ceq *iwceq, 
	int status;



	if (rf->msix_shared && !ceq_id) {

		snprintf(msix_vec->name, sizeof(msix_vec->name) - 1,

			 "irdma-%s-AEQCEQ-0", dev_name(&rf->pcidev->dev));

		tasklet_setup(&rf->dpc_tasklet, irdma_dpc);

		status = request_irq(msix_vec->irq, irdma_irq_handler, 0,

				     "AEQCEQ", rf);

				     msix_vec->name, rf);

	} else {

		snprintf(msix_vec->name, sizeof(msix_vec->name) - 1,

			 "irdma-%s-CEQ-%d",

			 dev_name(&rf->pcidev->dev), ceq_id);

		tasklet_setup(&iwceq->dpc_tasklet, irdma_ceq_dpc);



		status = request_irq(msix_vec->irq, irdma_ceq_handler, 0,

				     "CEQ", iwceq);

				     msix_vec->name, iwceq);

	}

	cpumask_clear(&msix_vec->mask);

	cpumask_set_cpu(msix_vec->cpu_affinity, &msix_vec->mask);
@@ -1125,9 +1130,11 @@ static int irdma_cfg_aeq_vector(struct irdma_pci_f *rf) 
	u32 ret = 0;



	if (!rf->msix_shared) {

		snprintf(msix_vec->name, sizeof(msix_vec->name) - 1,

			 "irdma-%s-AEQ", dev_name(&rf->pcidev->dev));

		tasklet_setup(&rf->dpc_tasklet, irdma_dpc);

		ret = request_irq(msix_vec->irq, irdma_irq_handler, 0,

				  "irdma", rf);

				  msix_vec->name, rf);

	}

	if (ret) {

		ibdev_dbg(&rf->iwdev->ibdev, "ERR: aeq irq config fail\n");

drivers/infiniband/hw/irdma/main.h

+3 −0
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ extern struct auxiliary_driver i40iw_auxiliary_drv; 
#define IRDMA_REFLUSH		BIT(2)

#define IRDMA_FLUSH_WAIT	BIT(3)



#define IRDMA_IRQ_NAME_STR_LEN (64)



enum init_completion_state {

	INVALID_STATE = 0,

	INITIAL_STATE,
@@ -212,6 +214,7 @@ struct irdma_msix_vector { 
	u32 cpu_affinity;

	u32 ceq_id;

	cpumask_t mask;

	char name[IRDMA_IRQ_NAME_STR_LEN];

};



struct irdma_mc_table_info {