i40evf: don't use more queues than CPUs

It's kind of silly to configure and attempt to use a bunch of queue
pairs when you're running on a single (virtual) CPU. Instead of
unconditionally configuring all of the queues that the PF gives us,
clamp the number of queue pairs to the number of CPUs.

Change-ID: I321714c9e15072ee76de8f95ab9a81f86ed347d1
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Patrick Lu <patrick.lu@intel.com>
Tested-by: Jim Young <jamesx.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
index efee6b290c0f..876411c39ee0 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
@@ -59,7 +59,7 @@ static const struct i40evf_stats i40evf_gstrings_stats[] = {
 #define I40EVF_GLOBAL_STATS_LEN ARRAY_SIZE(i40evf_gstrings_stats)
 #define I40EVF_QUEUE_STATS_LEN(_dev) \
         (((struct i40evf_adapter *) \
-                netdev_priv(_dev))->vsi_res->num_queue_pairs \
+                netdev_priv(_dev))->num_active_queues \
                   * 2 * (sizeof(struct i40e_queue_stats) / sizeof(u64)))
 #define I40EVF_STATS_LEN(_dev) \
         (I40EVF_GLOBAL_STATS_LEN + I40EVF_QUEUE_STATS_LEN(_dev))
@@ -121,11 +121,11 @@ static void i40evf_get_ethtool_stats(struct net_device *netdev,
                 p = (char *)adapter + i40evf_gstrings_stats[i].stat_offset;
                 data[i] =  *(u64 *)p;
         }
-        for (j = 0; j < adapter->vsi_res->num_queue_pairs; j++) {
+        for (j = 0; j < adapter->num_active_queues; j++) {
                 data[i++] = adapter->tx_rings[j]->stats.packets;
                 data[i++] = adapter->tx_rings[j]->stats.bytes;
         }
-        for (j = 0; j < adapter->vsi_res->num_queue_pairs; j++) {
+        for (j = 0; j < adapter->num_active_queues; j++) {
                 data[i++] = adapter->rx_rings[j]->stats.packets;
                 data[i++] = adapter->rx_rings[j]->stats.bytes;
         }
@@ -151,13 +151,13 @@ static void i40evf_get_strings(struct net_device *netdev, u32 sset, u8 *data)
                                ETH_GSTRING_LEN);
                         p += ETH_GSTRING_LEN;
                 }
-                for (i = 0; i < adapter->vsi_res->num_queue_pairs; i++) {
+                for (i = 0; i < adapter->num_active_queues; i++) {
                         snprintf(p, ETH_GSTRING_LEN, "tx-%u.packets", i);
                         p += ETH_GSTRING_LEN;
                         snprintf(p, ETH_GSTRING_LEN, "tx-%u.bytes", i);
                         p += ETH_GSTRING_LEN;
                 }
-                for (i = 0; i < adapter->vsi_res->num_queue_pairs; i++) {
+                for (i = 0; i < adapter->num_active_queues; i++) {
                         snprintf(p, ETH_GSTRING_LEN, "rx-%u.packets", i);
                         p += ETH_GSTRING_LEN;
                         snprintf(p, ETH_GSTRING_LEN, "rx-%u.bytes", i);
@@ -430,7 +430,7 @@ static int i40evf_get_rxnfc(struct net_device *netdev,
 
         switch (cmd->cmd) {
         case ETHTOOL_GRXRINGS:
-                cmd->data = adapter->vsi_res->num_queue_pairs;
+                cmd->data = adapter->num_active_queues;
                 ret = 0;
                 break;
         case ETHTOOL_GRXFH:
@@ -598,12 +598,12 @@ static void i40evf_get_channels(struct net_device *netdev,
         struct i40evf_adapter *adapter = netdev_priv(netdev);
 
         /* Report maximum channels */
-        ch->max_combined = adapter->vsi_res->num_queue_pairs;
+        ch->max_combined = adapter->num_active_queues;
 
         ch->max_other = NONQ_VECS;
         ch->other_count = NONQ_VECS;
 
-        ch->combined_count = adapter->vsi_res->num_queue_pairs;
+        ch->combined_count = adapter->num_active_queues;
 }
 
 /**