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

Commit 0729cc0c authored by Alexander Gordeev's avatar Alexander Gordeev Committed by David S. Miller
Browse files

myri10ge: Use pci_enable_msix_range() 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() and pci_enable_msix_range()
interfaces.

Signed-off-by: default avatarAlexander Gordeev <agordeev@redhat.com>
Cc: Hyong-Youb Kim <hykim@myri.com>
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f3c9407b

drivers/net/ethernet/myricom/myri10ge/myri10ge.c

+20 −20
Original line number Diff line number Diff line
@@ -2329,16 +2329,14 @@ static int myri10ge_request_irq(struct myri10ge_priv *mgp) 
	status = 0;

	if (myri10ge_msi) {

		if (mgp->num_slices > 1) {

			status =

			    pci_enable_msix(pdev, mgp->msix_vectors,

					    mgp->num_slices);

			if (status == 0) {

				mgp->msix_enabled = 1;

			} else {

			status = pci_enable_msix_range(pdev, mgp->msix_vectors,

					mgp->num_slices, mgp->num_slices);

			if (status < 0) {

				dev_err(&pdev->dev,

					"Error %d setting up MSI-X\n", status);

				return status;

			}

			mgp->msix_enabled = 1;

		}

		if (mgp->msix_enabled == 0) {

			status = pci_enable_msi(pdev);
@@ -3895,32 +3893,34 @@ static void myri10ge_probe_slices(struct myri10ge_priv *mgp) 
	mgp->msix_vectors = kcalloc(mgp->num_slices, sizeof(*mgp->msix_vectors),

				    GFP_KERNEL);

	if (mgp->msix_vectors == NULL)

		goto disable_msix;

		goto no_msix;

	for (i = 0; i < mgp->num_slices; i++) {

		mgp->msix_vectors[i].entry = i;

	}



	while (mgp->num_slices > 1) {

		/* make sure it is a power of two */

		while (!is_power_of_2(mgp->num_slices))

			mgp->num_slices--;

		mgp->num_slices = rounddown_pow_of_two(mgp->num_slices);

		if (mgp->num_slices == 1)

			goto disable_msix;

		status = pci_enable_msix(pdev, mgp->msix_vectors,

			goto no_msix;

		status = pci_enable_msix_range(pdev,

					       mgp->msix_vectors,

					       mgp->num_slices,

					       mgp->num_slices);

		if (status == 0) {

		if (status < 0)

			goto no_msix;



		pci_disable_msix(pdev);



		if (status == mgp->num_slices) {

			if (old_allocated)

				kfree(old_fw);

			return;

		}

		if (status > 0)

		} else {

			mgp->num_slices = status;

		else

			goto disable_msix;

		}

	}



disable_msix:

no_msix:

	if (mgp->msix_vectors != NULL) {

		kfree(mgp->msix_vectors);

		mgp->msix_vectors = NULL;