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

Commit 5c1e3588 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by David S. Miller
Browse files

ixgbevf: 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: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Bruce Allan <bruce.w.allan@intel.com>
Cc: e1000-devel@lists.sourceforge.net
Cc: netdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b45e620c

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+11 −21
Original line number Original line Diff line number Diff line
@@ -1817,7 +1817,6 @@ void ixgbevf_reset(struct ixgbevf_adapter *adapter) 
static int ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter,

static int ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter,

					int vectors)

					int vectors)

{

{

	int err = 0;

	int vector_threshold;

	int vector_threshold;





	/* We'll want at least 2 (vector_threshold):

	/* We'll want at least 2 (vector_threshold):
@@ -1831,33 +1830,24 @@ static int ixgbevf_acquire_msix_vectors(struct ixgbevf_adapter *adapter, 
	 * Right now, we simply care about how many we'll get; we'll

	 * Right now, we simply care about how many we'll get; we'll

	 * set them up later while requesting irq's.

	 * set them up later while requesting irq's.

	 */

	 */

	while (vectors >= vector_threshold) {

	vectors = pci_enable_msix_range(adapter->pdev, adapter->msix_entries,

		err = pci_enable_msix(adapter->pdev, adapter->msix_entries,

					vector_threshold, vectors);

				      vectors);

		if (!err || err < 0) /* Success or a nasty failure. */

			break;

		else /* err == number of vectors we should try again with */

			vectors = err;

	}





	if (vectors < vector_threshold)

	if (vectors < 0) {

		err = -ENOMEM;



	if (err) {

		dev_err(&adapter->pdev->dev,

		dev_err(&adapter->pdev->dev,

			"Unable to allocate MSI-X interrupts\n");

			"Unable to allocate MSI-X interrupts\n");

		kfree(adapter->msix_entries);

		kfree(adapter->msix_entries);

		adapter->msix_entries = NULL;

		adapter->msix_entries = NULL;

	} else {

		return vectors;

		/*

	}

		 * Adjust for only the vectors we'll use, which is minimum



	/* Adjust for only the vectors we'll use, which is minimum

	 * of max_msix_q_vectors + NON_Q_VECTORS, or the number of

	 * of max_msix_q_vectors + NON_Q_VECTORS, or the number of

	 * vectors we were allocated.

	 * vectors we were allocated.

	 */

	 */

	adapter->num_msix_vectors = vectors;

	adapter->num_msix_vectors = vectors;

	}





	return err;

	return 0;

}

}





/**

/**