|
@@ -1032,30 +1032,21 @@ i40evf_acquire_msix_vectors(struct i40evf_adapter *adapter, int vectors)
|
|
|
* Right now, we simply care about how many we'll get; we'll
|
|
|
* set them up later while requesting irq's.
|
|
|
*/
|
|
|
- while (vectors >= vector_threshold) {
|
|
|
- err = pci_enable_msix(adapter->pdev, adapter->msix_entries,
|
|
|
- vectors);
|
|
|
- if (!err) /* Success in acquiring all requested vectors. */
|
|
|
- break;
|
|
|
- else if (err < 0)
|
|
|
- vectors = 0; /* Nasty failure, quit now */
|
|
|
- else /* err == number of vectors we should try again with */
|
|
|
- vectors = err;
|
|
|
- }
|
|
|
-
|
|
|
- if (vectors < vector_threshold) {
|
|
|
+ err = pci_enable_msix_range(adapter->pdev, adapter->msix_entries,
|
|
|
+ vector_threshold, vectors);
|
|
|
+ if (err < 0) {
|
|
|
dev_err(&adapter->pdev->dev, "Unable to allocate MSI-X interrupts.\n");
|
|
|
kfree(adapter->msix_entries);
|
|
|
adapter->msix_entries = NULL;
|
|
|
- err = -EIO;
|
|
|
- } else {
|
|
|
- /* Adjust for only the vectors we'll use, which is minimum
|
|
|
- * of max_msix_q_vectors + NONQ_VECS, or the number of
|
|
|
- * vectors we were allocated.
|
|
|
- */
|
|
|
- adapter->num_msix_vectors = vectors;
|
|
|
+ return err;
|
|
|
}
|
|
|
- return err;
|
|
|
+
|
|
|
+ /* Adjust for only the vectors we'll use, which is minimum
|
|
|
+ * of max_msix_q_vectors + NONQ_VECS, or the number of
|
|
|
+ * vectors we were allocated.
|
|
|
+ */
|
|
|
+ adapter->num_msix_vectors = err;
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
/**
|