UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Alexander 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: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Gordeev 2014-02-18 11:11:46 +01:00 committed by David S. Miller
parent b45e620c52
commit 5c1e358802
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
View File

@ -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
* of max_msix_q_vectors + NON_Q_VECTORS, or the number of
* vectors we were allocated.
*/
adapter->num_msix_vectors = vectors;
} }
return err; /* Adjust for only the vectors we'll use, which is minimum
* of max_msix_q_vectors + NON_Q_VECTORS, or the number of
* vectors we were allocated.
*/
adapter->num_msix_vectors = vectors;
return 0;
} }
/** /**