Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b427d00f authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Christoph Hellwig
Browse files

bfa: Use pci_enable_msix_exact() instead of pci_enable_msix() 



As result of deprecation of MSI-X/MSI enablement functions
pci_enable_msix() and pci_enable_msi_block() all drivers
using these two interfaces need to be updated to use the
new pci_enable_msi_range()  or pci_enable_msi_exact()
and pci_enable_msix_range() or pci_enable_msix_exact()
interfaces.

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 8cb7f63d

drivers/scsi/bfa/bfad.c

+6 −14
Original line number Diff line number Diff line
@@ -1234,29 +1234,21 @@ bfad_setup_intr(struct bfad_s *bfad) 
	if ((bfa_asic_id_ctc(pdev->device) && !msix_disable_ct) ||

	   (bfa_asic_id_cb(pdev->device) && !msix_disable_cb)) {



		error = pci_enable_msix(bfad->pcidev, msix_entries, bfad->nvec);

		error = pci_enable_msix_exact(bfad->pcidev,

					      msix_entries, bfad->nvec);

		/* In CT1 & CT2, try to allocate just one vector */

		if (error > 0 && bfa_asic_id_ctc(pdev->device)) {

		if (error == -ENOSPC && bfa_asic_id_ctc(pdev->device)) {

			printk(KERN_WARNING "bfa %s: trying one msix "

			       "vector failed to allocate %d[%d]\n",

			       bfad->pci_name, bfad->nvec, error);

			bfad->nvec = 1;

			error = pci_enable_msix(bfad->pcidev,

						msix_entries, bfad->nvec);

			error = pci_enable_msix_exact(bfad->pcidev,

						      msix_entries, 1);

		}



		/*

		 * Only error number of vector is available.

		 * We don't have a mechanism to map multiple

		 * interrupts into one vector, so even if we

		 * can try to request less vectors, we don't

		 * know how to associate interrupt events to

		 *  vectors. Linux doesn't duplicate vectors

		 * in the MSIX table for this case.

		 */

		if (error) {

			printk(KERN_WARNING "bfad%d: "

			       "pci_enable_msix failed (%d), "

			       "pci_enable_msix_exact failed (%d), "

			       "use line based.\n",

				bfad->inst_no, error);

			goto line_based;