Commit a09bd81b authored by Igor Russkikh's avatar Igor Russkikh Committed by David S. Miller

net: aquantia: Limit number of vectors to actually allocated irqs

Driver should use pci_alloc_irq_vectors return value to correct number
of allocated vectors and napi instances. Otherwise it'll panic later
in pci_irq_vector.

Driver also should allow more than one MSI vectors to be allocated.

Error return path from pci_alloc_irq_vectors is also fixed to revert
resources in a correct sequence when error happens.
Reported-by: default avatarLong, Nicholas <nicholas.a.long@baesystems.com>
Fixes: 23ee07ad ("net: aquantia: Cleanup pci functions module")
Signed-off-by: default avatarIgor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8c61ab7f
...@@ -95,6 +95,7 @@ void aq_nic_cfg_start(struct aq_nic_s *self) ...@@ -95,6 +95,7 @@ void aq_nic_cfg_start(struct aq_nic_s *self)
/*rss rings */ /*rss rings */
cfg->vecs = min(cfg->aq_hw_caps->vecs, AQ_CFG_VECS_DEF); cfg->vecs = min(cfg->aq_hw_caps->vecs, AQ_CFG_VECS_DEF);
cfg->vecs = min(cfg->vecs, num_online_cpus()); cfg->vecs = min(cfg->vecs, num_online_cpus());
cfg->vecs = min(cfg->vecs, self->irqvecs);
/* cfg->vecs should be power of 2 for RSS */ /* cfg->vecs should be power of 2 for RSS */
if (cfg->vecs >= 8U) if (cfg->vecs >= 8U)
cfg->vecs = 8U; cfg->vecs = 8U;
......
...@@ -80,6 +80,7 @@ struct aq_nic_s { ...@@ -80,6 +80,7 @@ struct aq_nic_s {
struct pci_dev *pdev; struct pci_dev *pdev;
unsigned int msix_entry_mask; unsigned int msix_entry_mask;
u32 irqvecs;
}; };
static inline struct device *aq_nic_get_dev(struct aq_nic_s *self) static inline struct device *aq_nic_get_dev(struct aq_nic_s *self)
......
...@@ -267,16 +267,16 @@ static int aq_pci_probe(struct pci_dev *pdev, ...@@ -267,16 +267,16 @@ static int aq_pci_probe(struct pci_dev *pdev,
numvecs = min(numvecs, num_online_cpus()); numvecs = min(numvecs, num_online_cpus());
/*enable interrupts */ /*enable interrupts */
#if !AQ_CFG_FORCE_LEGACY_INT #if !AQ_CFG_FORCE_LEGACY_INT
err = pci_alloc_irq_vectors(self->pdev, numvecs, numvecs, numvecs = pci_alloc_irq_vectors(self->pdev, 1, numvecs,
PCI_IRQ_MSIX); PCI_IRQ_MSIX | PCI_IRQ_MSI |
PCI_IRQ_LEGACY);
if (err < 0) {
err = pci_alloc_irq_vectors(self->pdev, 1, 1, if (numvecs < 0) {
PCI_IRQ_MSI | PCI_IRQ_LEGACY); err = numvecs;
if (err < 0) goto err_hwinit;
goto err_hwinit;
} }
#endif #endif
self->irqvecs = numvecs;
/* net device init */ /* net device init */
aq_nic_cfg_start(self); aq_nic_cfg_start(self);
...@@ -298,9 +298,9 @@ static int aq_pci_probe(struct pci_dev *pdev, ...@@ -298,9 +298,9 @@ static int aq_pci_probe(struct pci_dev *pdev,
kfree(self->aq_hw); kfree(self->aq_hw);
err_ioremap: err_ioremap:
free_netdev(ndev); free_netdev(ndev);
err_pci_func:
pci_release_regions(pdev);
err_ndev: err_ndev:
pci_release_regions(pdev);
err_pci_func:
pci_disable_device(pdev); pci_disable_device(pdev);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment