moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit 20e3028c39a5bf882e91e717da96d14f1acec40e ]

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: ca9c54d2d6 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Haiyang Zhang
2023-01-19 12:59:10 -08:00
committed by Greg Kroah-Hartman
parent bff5243bd3
commit 858d7e9218
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/microsoft/mana/gdma.h
View File

@@ -324,9 +324,12 @@ struct gdma_queue_spec {
}; };
}; };
#define MANA_IRQ_NAME_SZ 32
struct gdma_irq_context { struct gdma_irq_context {
void (*handler)(void *arg); void (*handler)(void *arg);
void *arg; void *arg;
char name[MANA_IRQ_NAME_SZ];
}; };
struct gdma_context { struct gdma_context {

9
drivers/net/ethernet/microsoft/mana/gdma_main.c
View File

@@ -1195,13 +1195,20 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev)
gic->handler = NULL; gic->handler = NULL;
gic->arg = 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); irq = pci_irq_vector(pdev, i);
if (irq < 0) { if (irq < 0) {
err = irq; err = irq;
goto free_irq; goto free_irq;
} }
err = request_irq(irq, mana_gd_intr, 0, "mana_intr", gic); err = request_irq(irq, mana_gd_intr, 0, gic->name, gic);
if (err) if (err)
goto free_irq; goto free_irq;
} }