Skip to content

Commit 91b2eeb

Browse files
committed
net: mana: Fix IRQ name - add PCI and queue number
jira LE-1907 Rebuild_History Non-Buildable kernel-rt-5.14.0-284.30.1.rt14.315.el9_2 commit-author Haiyang Zhang <haiyangz@microsoft.com> commit 20e3028 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: ca9c54d ("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> (cherry picked from commit 20e3028) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 073f197 commit 91b2eeb

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,9 +324,12 @@ struct gdma_queue_spec {
324324
};
325325
};
326326

327+
#define MANA_IRQ_NAME_SZ 32
328+
327329
struct gdma_irq_context {
328330
void (*handler)(void *arg);
329331
void *arg;
332+
char name[MANA_IRQ_NAME_SZ];
330333
};
331334

332335
struct gdma_context {

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1233,13 +1233,20 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev)
12331233
gic->handler = NULL;
12341234
gic->arg = NULL;
12351235

1236+
if (!i)
1237+
snprintf(gic->name, MANA_IRQ_NAME_SZ, "mana_hwc@pci:%s",
1238+
pci_name(pdev));
1239+
else
1240+
snprintf(gic->name, MANA_IRQ_NAME_SZ, "mana_q%d@pci:%s",
1241+
i - 1, pci_name(pdev));
1242+
12361243
irq = pci_irq_vector(pdev, i);
12371244
if (irq < 0) {
12381245
err = irq;
12391246
goto free_irq;
12401247
}
12411248

1242-
err = request_irq(irq, mana_gd_intr, 0, "mana_intr", gic);
1249+
err = request_irq(irq, mana_gd_intr, 0, gic->name, gic);
12431250
if (err)
12441251
goto free_irq;
12451252

0 commit comments

Comments
 (0)