p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

i40e: remove workaround for resetting XPS 

Since commit 3ffa037d7f ("i40e: Set XPS bit mask to zero in DCB mode")
we've tried to reset the XPS settings by building a custom
empty CPU mask.

This workaround is not necessary because we're not really removing the
XPS setting, but simply setting it so that no CPU is valid.

Second, we shorten the code further by using zalloc_cpumask_var instead
of a separate call to bitmap_zero().

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Jacob Keller 2017-07-14 09:10:08 -04:00 committed by Jeff Kirsher
parent 19279235be
commit ba4460d45a
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/ethernet/intel/i40e/i40e_main.c
View File

@ -2874,22 +2874,15 @@ static void i40e_vsi_free_rx_resources(struct i40e_vsi *vsi)
static void i40e_config_xps_tx_ring(struct i40e_ring *ring) static void i40e_config_xps_tx_ring(struct i40e_ring *ring)
{ {
struct i40e_vsi *vsi = ring->vsi; struct i40e_vsi *vsi = ring->vsi;
cpumask_var_t mask;
if (!ring->q_vector || !ring->netdev) if (!ring->q_vector || !ring->netdev)
return; return;
/* Single TC mode enable XPS */ if ((vsi->tc_config.numtc <= 1) &&
if (vsi->tc_config.numtc <= 1) { !test_and_set_bit(__I40E_TX_XPS_INIT_DONE, &ring->state)) {
if (!test_and_set_bit(__I40E_TX_XPS_INIT_DONE, &ring->state)) netif_set_xps_queue(ring->netdev,
netif_set_xps_queue(ring->netdev, &ring->q_vector->affinity_mask,
&ring->q_vector->affinity_mask, ring->queue_index);
ring->queue_index);
} else if (alloc_cpumask_var(&mask, GFP_KERNEL)) {
/* Disable XPS to allow selection based on TC */
bitmap_zero(cpumask_bits(mask), nr_cpumask_bits);
netif_set_xps_queue(ring->netdev, mask, ring->queue_index);
free_cpumask_var(mask);
} }
/* schedule our worker thread which will take care of /* schedule our worker thread which will take care of