Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5b5f370 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

i40e/i40evf: Use ring pointers to clean up _set_itr_per_queue 



This change cleans up the i40e/i40evf_set_itr_per_queue function by
dropping all the unneeded pointer chases. Instead we can just pull out the
pointers for the Tx and Rx rings and use them throughout the function.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e0f60a81

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+12 −10
Original line number Diff line number Diff line
@@ -2305,6 +2305,8 @@ static void i40e_set_itr_per_queue(struct i40e_vsi *vsi, 
				   struct ethtool_coalesce *ec,

				   int queue)

{

	struct i40e_ring *rx_ring = vsi->rx_rings[queue];

	struct i40e_ring *tx_ring = vsi->tx_rings[queue];

	struct i40e_pf *pf = vsi->back;

	struct i40e_hw *hw = &pf->hw;

	struct i40e_q_vector *q_vector;
@@ -2312,26 +2314,26 @@ static void i40e_set_itr_per_queue(struct i40e_vsi *vsi, 


	intrl = i40e_intrl_usec_to_reg(vsi->int_rate_limit);



	vsi->rx_rings[queue]->rx_itr_setting = ec->rx_coalesce_usecs;

	vsi->tx_rings[queue]->tx_itr_setting = ec->tx_coalesce_usecs;

	rx_ring->rx_itr_setting = ec->rx_coalesce_usecs;

	tx_ring->tx_itr_setting = ec->tx_coalesce_usecs;



	if (ec->use_adaptive_rx_coalesce)

		vsi->rx_rings[queue]->rx_itr_setting |= I40E_ITR_DYNAMIC;

		rx_ring->rx_itr_setting |= I40E_ITR_DYNAMIC;

	else

		vsi->rx_rings[queue]->rx_itr_setting &= ~I40E_ITR_DYNAMIC;

		rx_ring->rx_itr_setting &= ~I40E_ITR_DYNAMIC;



	if (ec->use_adaptive_tx_coalesce)

		vsi->tx_rings[queue]->tx_itr_setting |= I40E_ITR_DYNAMIC;

		tx_ring->tx_itr_setting |= I40E_ITR_DYNAMIC;

	else

		vsi->tx_rings[queue]->tx_itr_setting &= ~I40E_ITR_DYNAMIC;

		tx_ring->tx_itr_setting &= ~I40E_ITR_DYNAMIC;



	q_vector = vsi->rx_rings[queue]->q_vector;

	q_vector->rx.itr = ITR_TO_REG(vsi->rx_rings[queue]->rx_itr_setting);

	q_vector = rx_ring->q_vector;

	q_vector->rx.itr = ITR_TO_REG(rx_ring->rx_itr_setting);

	vector = vsi->base_vector + q_vector->v_idx;

	wr32(hw, I40E_PFINT_ITRN(I40E_RX_ITR, vector - 1), q_vector->rx.itr);



	q_vector = vsi->tx_rings[queue]->q_vector;

	q_vector->tx.itr = ITR_TO_REG(vsi->tx_rings[queue]->tx_itr_setting);

	q_vector = tx_ring->q_vector;

	q_vector->tx.itr = ITR_TO_REG(tx_ring->tx_itr_setting);

	vector = vsi->base_vector + q_vector->v_idx;

	wr32(hw, I40E_PFINT_ITRN(I40E_TX_ITR, vector - 1), q_vector->tx.itr);

drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c

+14 −14
Original line number Diff line number Diff line
@@ -512,31 +512,31 @@ static void i40evf_set_itr_per_queue(struct i40evf_adapter *adapter, 
				     struct ethtool_coalesce *ec,

				     int queue)

{

	struct i40e_ring *rx_ring = &adapter->rx_rings[queue];

	struct i40e_ring *tx_ring = &adapter->tx_rings[queue];

	struct i40e_vsi *vsi = &adapter->vsi;

	struct i40e_hw *hw = &adapter->hw;

	struct i40e_q_vector *q_vector;

	u16 vector;



	adapter->rx_rings[queue].rx_itr_setting = ec->rx_coalesce_usecs;

	adapter->tx_rings[queue].tx_itr_setting = ec->tx_coalesce_usecs;

	rx_ring->rx_itr_setting = ec->rx_coalesce_usecs;

	tx_ring->tx_itr_setting = ec->tx_coalesce_usecs;



	if (ec->use_adaptive_rx_coalesce)

		adapter->rx_rings[queue].rx_itr_setting |= I40E_ITR_DYNAMIC;

	else

		adapter->rx_rings[queue].rx_itr_setting &= ~I40E_ITR_DYNAMIC;

	rx_ring->rx_itr_setting |= I40E_ITR_DYNAMIC;

	if (!ec->use_adaptive_rx_coalesce)

		rx_ring->rx_itr_setting ^= I40E_ITR_DYNAMIC;



	if (ec->use_adaptive_tx_coalesce)

		adapter->tx_rings[queue].tx_itr_setting |= I40E_ITR_DYNAMIC;

	else

		adapter->tx_rings[queue].tx_itr_setting &= ~I40E_ITR_DYNAMIC;

	tx_ring->tx_itr_setting |= I40E_ITR_DYNAMIC;

	if (!ec->use_adaptive_tx_coalesce)

		tx_ring->tx_itr_setting ^= I40E_ITR_DYNAMIC;



	q_vector = adapter->rx_rings[queue].q_vector;

	q_vector->rx.itr = ITR_TO_REG(adapter->rx_rings[queue].rx_itr_setting);

	q_vector = rx_ring->q_vector;

	q_vector->rx.itr = ITR_TO_REG(rx_ring->rx_itr_setting);

	vector = vsi->base_vector + q_vector->v_idx;

	wr32(hw, I40E_VFINT_ITRN1(I40E_RX_ITR, vector - 1), q_vector->rx.itr);



	q_vector = adapter->tx_rings[queue].q_vector;

	q_vector->tx.itr = ITR_TO_REG(adapter->tx_rings[queue].tx_itr_setting);

	q_vector = tx_ring->q_vector;

	q_vector->tx.itr = ITR_TO_REG(tx_ring->tx_itr_setting);

	vector = vsi->base_vector + q_vector->v_idx;

	wr32(hw, I40E_VFINT_ITRN1(I40E_TX_ITR, vector - 1), q_vector->tx.itr);