Commit cd69a09e authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Christoph Hellwig

bfa: Do not call pci_enable_msix() after it failed once

Function pci_enable_msix() should not be called in case
it threw a negative errno from a previous call.
Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Acked-by: default avatarAnil Gurumurthy <anil.gurumurthy@qlogic.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 1e5df2a5
...@@ -1235,33 +1235,31 @@ bfad_setup_intr(struct bfad_s *bfad) ...@@ -1235,33 +1235,31 @@ bfad_setup_intr(struct bfad_s *bfad)
(bfa_asic_id_cb(pdev->device) && !msix_disable_cb)) { (bfa_asic_id_cb(pdev->device) && !msix_disable_cb)) {
error = pci_enable_msix(bfad->pcidev, msix_entries, bfad->nvec); error = pci_enable_msix(bfad->pcidev, msix_entries, bfad->nvec);
if (error) { /* In CT1 & CT2, try to allocate just one vector */
/* In CT1 & CT2, try to allocate just one vector */ if (error > 0 && bfa_asic_id_ctc(pdev->device)) {
if (bfa_asic_id_ctc(pdev->device)) { printk(KERN_WARNING "bfa %s: trying one msix "
printk(KERN_WARNING "bfa %s: trying one msix " "vector failed to allocate %d[%d]\n",
"vector failed to allocate %d[%d]\n", bfad->pci_name, bfad->nvec, error);
bfad->pci_name, bfad->nvec, error); bfad->nvec = 1;
bfad->nvec = 1; error = pci_enable_msix(bfad->pcidev,
error = pci_enable_msix(bfad->pcidev,
msix_entries, bfad->nvec); msix_entries, bfad->nvec);
} }
/* /*
* Only error number of vector is available. * Only error number of vector is available.
* We don't have a mechanism to map multiple * We don't have a mechanism to map multiple
* interrupts into one vector, so even if we * interrupts into one vector, so even if we
* can try to request less vectors, we don't * can try to request less vectors, we don't
* know how to associate interrupt events to * know how to associate interrupt events to
* vectors. Linux doesn't duplicate vectors * vectors. Linux doesn't duplicate vectors
* in the MSIX table for this case. * in the MSIX table for this case.
*/ */
if (error) { if (error) {
printk(KERN_WARNING "bfad%d: " printk(KERN_WARNING "bfad%d: "
"pci_enable_msix failed (%d), " "pci_enable_msix failed (%d), "
"use line based.\n", "use line based.\n",
bfad->inst_no, error); bfad->inst_no, error);
goto line_based; goto line_based;
}
} }
/* Disable INTX in MSI-X mode */ /* Disable INTX in MSI-X mode */
......
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