mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
gve: Fix gve interrupt names
IRQs are currently requested before the netdevice is registered and a proper name is assigned to the device. Changing interrupt name to avoid using the format string in the name. Interrupt name before change: eth%d-ntfy-block.<blk_id> Interrupt name after change: gve-ntfy-blk<blk_id>@pci:<pci_name> Signed-off-by: Praveen Kaligineedi <pkaligineedi@google.com> Reviewed-by: Jeroen de Borst <jeroendb@google.com> Acked-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
d78f8d839d
commit
8437114593
1 changed files with 4 additions and 5 deletions
|
@ -327,7 +327,6 @@ static int gve_napi_poll_dqo(struct napi_struct *napi, int budget)
|
|||
static int gve_alloc_notify_blocks(struct gve_priv *priv)
|
||||
{
|
||||
int num_vecs_requested = priv->num_ntfy_blks + 1;
|
||||
char *name = priv->dev->name;
|
||||
unsigned int active_cpus;
|
||||
int vecs_enabled;
|
||||
int i, j;
|
||||
|
@ -371,8 +370,8 @@ static int gve_alloc_notify_blocks(struct gve_priv *priv)
|
|||
active_cpus = min_t(int, priv->num_ntfy_blks / 2, num_online_cpus());
|
||||
|
||||
/* Setup Management Vector - the last vector */
|
||||
snprintf(priv->mgmt_msix_name, sizeof(priv->mgmt_msix_name), "%s-mgmnt",
|
||||
name);
|
||||
snprintf(priv->mgmt_msix_name, sizeof(priv->mgmt_msix_name), "gve-mgmnt@pci:%s",
|
||||
pci_name(priv->pdev));
|
||||
err = request_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector,
|
||||
gve_mgmnt_intr, 0, priv->mgmt_msix_name, priv);
|
||||
if (err) {
|
||||
|
@ -401,8 +400,8 @@ static int gve_alloc_notify_blocks(struct gve_priv *priv)
|
|||
struct gve_notify_block *block = &priv->ntfy_blocks[i];
|
||||
int msix_idx = i;
|
||||
|
||||
snprintf(block->name, sizeof(block->name), "%s-ntfy-block.%d",
|
||||
name, i);
|
||||
snprintf(block->name, sizeof(block->name), "gve-ntfy-blk%d@pci:%s",
|
||||
i, pci_name(priv->pdev));
|
||||
block->priv = priv;
|
||||
err = request_irq(priv->msix_vectors[msix_idx].vector,
|
||||
gve_is_gqi(priv) ? gve_intr : gve_intr_dqo,
|
||||
|
|
Loading…
Add table
Reference in a new issue