From: Haiyang Zhang <haiyangz@microsoft.com>

Date: Thu, 19 Jan 2023 12:59:10 -0800

Subject: net: mana: Fix IRQ name - add PCI and queue number

Patch-mainline: v6.2-rc6

Git-commit: 20e3028c39a5bf882e91e717da96d14f1acec40e

References: bsc#1207875

The PCI and queue number info is missing in IRQ names.

Add PCI and queue number to IRQ names, to allow CPU affinity

tuning scripts to work.

Cc: stable@vger.kernel.org

Fixes: ca9c54d2d6a5 ("net: mana: Add a driver for Microsoft Azure Network Adapter (MANA)")

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>

Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>

Link: https://lore.kernel.org/r/1674161950-19708-1-git-send-email-haiyangz@microsoft.com

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/microsoft/mana/gdma.h      |    3 +++

 drivers/net/ethernet/microsoft/mana/gdma_main.c |    9 ++++++++-

 2 files changed, 11 insertions(+), 1 deletion(-)

--- a/drivers/net/ethernet/microsoft/mana/gdma.h

+++ b/drivers/net/ethernet/microsoft/mana/gdma.h

@@ -324,9 +324,12 @@ struct gdma_queue_spec {

 	};

 };

+#define MANA_IRQ_NAME_SZ 32

+

 struct gdma_irq_context {

 	void (*handler)(void *arg);

 	void *arg;

+	char name[MANA_IRQ_NAME_SZ];

 };

 struct gdma_context {

--- a/drivers/net/ethernet/microsoft/mana/gdma_main.c

+++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c

@@ -1238,13 +1238,20 @@ static int mana_gd_setup_irqs(struct pci

 		gic->handler = NULL;

 		gic->arg = NULL;

+		if (!i)

+			snprintf(gic->name, MANA_IRQ_NAME_SZ, "mana_hwc@pci:%s",

+				 pci_name(pdev));

+		else

+			snprintf(gic->name, MANA_IRQ_NAME_SZ, "mana_q%d@pci:%s",

+				 i - 1, pci_name(pdev));

+

 		irq = pci_irq_vector(pdev, i);

 		if (irq < 0) {

 			err = irq;

 			goto free_mask;

 		}

-		err = request_irq(irq, mana_gd_intr, 0, "mana_intr", gic);

+		err = request_irq(irq, mana_gd_intr, 0, gic->name, gic);

 		if (err)

 			goto free_mask;

 		irq_set_affinity_and_hint(irq, req_mask);