Skip to content

Commit

Permalink
net: mana: Fix IRQ name - add PCI and queue number
Browse files Browse the repository at this point in the history
[ Upstream 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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
haiyangz authored and Sasha Levin committed Feb 1, 2023
1 parent f953768 commit 835a315
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
3 changes: 3 additions & 0 deletions drivers/net/ethernet/microsoft/mana/gdma.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 8 additions & 1 deletion drivers/net/ethernet/microsoft/mana/gdma_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1195,13 +1195,20 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev)
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_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)
goto free_irq;
}
Expand Down

0 comments on commit 835a315

Please sign in to comment.