renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 11:13:58 +08:00
Code

ixgbe: Fix 82598 MSI-X allocation on systems with more than 8 CPU cores

Browse Source 
MSI-X allocation broke after the 82599 merge on systems with more than 8
CPU cores.  82598 drops back into MSI mode, which isn't sufficient to run
full, efficient 10G line rate.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
PJ Waskiewicz 2009-03-31 21:34:05 +00:00 committed by David S. Miller
parent cd7664f69f
commit 8be0e4671d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/ixgbe/ixgbe_main.c
View File

@ -2934,6 +2934,7 @@ err_tx_ring_allocation:
**/ **/
static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter) static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
{ {
struct ixgbe_hw *hw = &adapter->hw;
int err = 0; int err = 0;
int vector, v_budget; int vector, v_budget;
@ -2948,12 +2949,12 @@ static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
/* /*
* At the same time, hardware can only support a maximum of * At the same time, hardware can only support a maximum of
* MAX_MSIX_COUNT vectors. With features such as RSS and VMDq, * hw.mac->max_msix_vectors vectors. With features
* we can easily reach upwards of 64 Rx descriptor queues and * such as RSS and VMDq, we can easily surpass the number of Rx and Tx
* 32 Tx queues. Thus, we cap it off in those rare cases where * descriptor queues supported by our device. Thus, we cap it off in
* the cpu count also exceeds our vector limit. * those rare cases where the cpu count also exceeds our vector limit.
*/ */
v_budget = min(v_budget, MAX_MSIX_COUNT); v_budget = min(v_budget, (int)hw->mac.max_msix_vectors);
/* A failure in MSI-X entry allocation isn't fatal, but it does /* A failure in MSI-X entry allocation isn't fatal, but it does
* mean we disable MSI-X capabilities of the adapter. */ * mean we disable MSI-X capabilities of the adapter. */