ice: Use coalesce values from q_vector 0 when increasing q_vectors
authorBrett Creeley <brett.creeley@intel.com>
Sat, 16 May 2020 00:55:04 +0000 (17:55 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sun, 31 May 2020 10:56:40 +0000 (03:56 -0700)
Currently when a VSI is built (i.e. reset, set channels, etc.)
the coalesce settings will be preserved in most cases. However, when the
number of q_vectors are increased the settings for the new q_vectors
will be set to the driver defaults of AIM on, Rx/Tx ITR 50, and INTRL 0.
This is causing issues with how the ethtool layer gets the current
coalesce settings since it only uses q_vector 0. So, assume that the user
set the coalesce settings globally (i.e. ethtool -C eth0) and use q_vector
0's settings for all of the new q_vectors.

Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ice/ice_lib.c

index ecc04a6..28b46cc 100644 (file)
@@ -2707,15 +2707,13 @@ ice_vsi_rebuild_set_coalesce(struct ice_vsi *vsi,
                ice_vsi_rebuild_update_coalesce(vsi->q_vectors[i],
                                                &coalesce[i]);
 
-       for (; i < vsi->num_q_vectors; i++) {
-               struct ice_coalesce_stored coalesce_dflt = {
-                       .itr_tx = ICE_DFLT_TX_ITR,
-                       .itr_rx = ICE_DFLT_RX_ITR,
-                       .intrl = 0
-               };
+       /* number of q_vectors increased, so assume coalesce settings were
+        * changed globally (i.e. ethtool -C eth0 instead of per-queue) and use
+        * the previous settings from q_vector 0 for all of the new q_vectors
+        */
+       for (; i < vsi->num_q_vectors; i++)
                ice_vsi_rebuild_update_coalesce(vsi->q_vectors[i],
-                                               &coalesce_dflt);
-       }
+                                               &coalesce[0]);
 }
 
 /**