aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>2009-03-31 17:34:05 -0400
committerDavid S. Miller <davem@davemloft.net>2009-04-02 04:02:31 -0400
commit8be0e4671d6355b2d905cb8fd051393b2cbf9510 (patch)
treeee6f9d280d0de7ebc1870150dcd60eb9dcf999ef
parentcd7664f69fe1f3f75b664503ae3e11a2971a4865 (diff)
ixgbe: Fix 82598 MSI-X allocation on systems with more than 8 CPU cores
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>
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 8f6e263787df..63c0f19c11a3 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2934,6 +2934,7 @@ err_tx_ring_allocation:
2934 **/ 2934 **/
2935static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter) 2935static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
2936{ 2936{
2937 struct ixgbe_hw *hw = &adapter->hw;
2937 int err = 0; 2938 int err = 0;
2938 int vector, v_budget; 2939 int vector, v_budget;
2939 2940
@@ -2948,12 +2949,12 @@ static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
2948 2949
2949 /* 2950 /*
2950 * At the same time, hardware can only support a maximum of 2951 * At the same time, hardware can only support a maximum of
2951 * MAX_MSIX_COUNT vectors. With features such as RSS and VMDq, 2952 * hw.mac->max_msix_vectors vectors. With features
2952 * we can easily reach upwards of 64 Rx descriptor queues and 2953 * such as RSS and VMDq, we can easily surpass the number of Rx and Tx
2953 * 32 Tx queues. Thus, we cap it off in those rare cases where 2954 * descriptor queues supported by our device. Thus, we cap it off in
2954 * the cpu count also exceeds our vector limit. 2955 * those rare cases where the cpu count also exceeds our vector limit.
2955 */ 2956 */
2956 v_budget = min(v_budget, MAX_MSIX_COUNT); 2957 v_budget = min(v_budget, (int)hw->mac.max_msix_vectors);
2957 2958
2958 /* A failure in MSI-X entry allocation isn't fatal, but it does 2959 /* A failure in MSI-X entry allocation isn't fatal, but it does
2959 * mean we disable MSI-X capabilities of the adapter. */ 2960 * mean we disable MSI-X capabilities of the adapter. */