Commit 32f5f54a authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

i40e/i40evf: control auto ITR through ethtool 



For all of our supported kernels, ethtool allows us to directly control
adaptive ITR instead of just faking it with an ITR value. Support this
capability so that user knows explicitly when ITR is being controlled
dynamically. Suggested by Ben Hutchings.

CC: Ben Hutchings <ben@decadent.org.uk>
Change-ID: Iae6b79c5db767a63d22ecd9a9c24acaff02a096e
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ca99eb99

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

+23 −34
Original line number Diff line number Diff line
@@ -1009,14 +1009,13 @@ static int i40e_get_coalesce(struct net_device *netdev, 
	ec->rx_max_coalesced_frames_irq = vsi->work_limit;



	if (ITR_IS_DYNAMIC(vsi->rx_itr_setting))

		ec->rx_coalesce_usecs = 1;

	else

		ec->rx_coalesce_usecs = vsi->rx_itr_setting;

		ec->use_adaptive_rx_coalesce = 1;



	if (ITR_IS_DYNAMIC(vsi->tx_itr_setting))

		ec->tx_coalesce_usecs = 1;

	else

		ec->tx_coalesce_usecs = vsi->tx_itr_setting;

		ec->use_adaptive_tx_coalesce = 1;



	ec->rx_coalesce_usecs = vsi->rx_itr_setting & ~I40E_ITR_DYNAMIC;

	ec->tx_coalesce_usecs = vsi->tx_itr_setting & ~I40E_ITR_DYNAMIC;



	return 0;

}
@@ -1035,37 +1034,27 @@ static int i40e_set_coalesce(struct net_device *netdev, 
	if (ec->tx_max_coalesced_frames_irq || ec->rx_max_coalesced_frames_irq)

		vsi->work_limit = ec->tx_max_coalesced_frames_irq;



	switch (ec->rx_coalesce_usecs) {

	case 0:

		vsi->rx_itr_setting = 0;

		break;

	case 1:

		vsi->rx_itr_setting = (I40E_ITR_DYNAMIC |

				       ITR_REG_TO_USEC(I40E_ITR_RX_DEF));

		break;

	default:

		if ((ec->rx_coalesce_usecs < (I40E_MIN_ITR << 1)) ||

		    (ec->rx_coalesce_usecs > (I40E_MAX_ITR << 1)))

			return -EINVAL;

	if ((ec->rx_coalesce_usecs >= (I40E_MIN_ITR << 1)) &&

	    (ec->rx_coalesce_usecs <= (I40E_MAX_ITR << 1)))

		vsi->rx_itr_setting = ec->rx_coalesce_usecs;

		break;

	}



	switch (ec->tx_coalesce_usecs) {

	case 0:

		vsi->tx_itr_setting = 0;

		break;

	case 1:

		vsi->tx_itr_setting = (I40E_ITR_DYNAMIC |

				       ITR_REG_TO_USEC(I40E_ITR_TX_DEF));

		break;

	default:

		if ((ec->tx_coalesce_usecs < (I40E_MIN_ITR << 1)) ||

		    (ec->tx_coalesce_usecs > (I40E_MAX_ITR << 1)))

	else

		return -EINVAL;



	if ((ec->tx_coalesce_usecs >= (I40E_MIN_ITR << 1)) &&

	    (ec->tx_coalesce_usecs <= (I40E_MAX_ITR << 1)))

		vsi->tx_itr_setting = ec->tx_coalesce_usecs;

		break;

	}

	else

		return -EINVAL;



	if (ec->use_adaptive_rx_coalesce)

		vsi->rx_itr_setting |= I40E_ITR_DYNAMIC;

	else

		vsi->rx_itr_setting &= ~I40E_ITR_DYNAMIC;



	if (ec->use_adaptive_tx_coalesce)

		vsi->tx_itr_setting |= I40E_ITR_DYNAMIC;

	else

		vsi->tx_itr_setting &= ~I40E_ITR_DYNAMIC;



	vector = vsi->base_vector;

	for (i = 0; i < vsi->num_q_vectors; i++, vector++) {

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

+29 −36
Original line number Diff line number Diff line
@@ -295,14 +295,13 @@ static int i40evf_get_coalesce(struct net_device *netdev, 
	ec->rx_max_coalesced_frames = vsi->work_limit;



	if (ITR_IS_DYNAMIC(vsi->rx_itr_setting))

		ec->rx_coalesce_usecs = 1;

	else

		ec->rx_coalesce_usecs = vsi->rx_itr_setting;

		ec->use_adaptive_rx_coalesce = 1;



	if (ITR_IS_DYNAMIC(vsi->tx_itr_setting))

		ec->tx_coalesce_usecs = 1;

	else

		ec->tx_coalesce_usecs = vsi->tx_itr_setting;

		ec->use_adaptive_tx_coalesce = 1;



	ec->rx_coalesce_usecs = vsi->rx_itr_setting & ~I40E_ITR_DYNAMIC;

	ec->tx_coalesce_usecs = vsi->tx_itr_setting & ~I40E_ITR_DYNAMIC;



	return 0;

}
@@ -323,40 +322,34 @@ static int i40evf_set_coalesce(struct net_device *netdev, 
	struct i40e_q_vector *q_vector;

	int i;



	if (ec->tx_max_coalesced_frames || ec->rx_max_coalesced_frames)

		vsi->work_limit = ec->tx_max_coalesced_frames;

	if (ec->tx_max_coalesced_frames_irq || ec->rx_max_coalesced_frames_irq)

		vsi->work_limit = ec->tx_max_coalesced_frames_irq;



	switch (ec->rx_coalesce_usecs) {

	case 0:

		vsi->rx_itr_setting = 0;

		break;

	case 1:

		vsi->rx_itr_setting = (I40E_ITR_DYNAMIC

				       | ITR_REG_TO_USEC(I40E_ITR_RX_DEF));

		break;

	default:

		if ((ec->rx_coalesce_usecs < (I40E_MIN_ITR << 1)) ||

		    (ec->rx_coalesce_usecs > (I40E_MAX_ITR << 1)))

			return -EINVAL;

	if ((ec->rx_coalesce_usecs >= (I40E_MIN_ITR << 1)) &&

	    (ec->rx_coalesce_usecs <= (I40E_MAX_ITR << 1)))

		vsi->rx_itr_setting = ec->rx_coalesce_usecs;

		break;

	}



	switch (ec->tx_coalesce_usecs) {

	case 0:

		vsi->tx_itr_setting = 0;

		break;

	case 1:

		vsi->tx_itr_setting = (I40E_ITR_DYNAMIC

				       | ITR_REG_TO_USEC(I40E_ITR_TX_DEF));

		break;

	default:

		if ((ec->tx_coalesce_usecs < (I40E_MIN_ITR << 1)) ||

		    (ec->tx_coalesce_usecs > (I40E_MAX_ITR << 1)))

	else

		return -EINVAL;



	if ((ec->tx_coalesce_usecs >= (I40E_MIN_ITR << 1)) &&

	    (ec->tx_coalesce_usecs <= (I40E_MAX_ITR << 1)))

		vsi->tx_itr_setting = ec->tx_coalesce_usecs;

		break;

	}

	else if (ec->use_adaptive_tx_coalesce)

		vsi->tx_itr_setting = (I40E_ITR_DYNAMIC |

				       ITR_REG_TO_USEC(I40E_ITR_RX_DEF));

	else

		return -EINVAL;



	if (ec->use_adaptive_rx_coalesce)

		vsi->rx_itr_setting |= I40E_ITR_DYNAMIC;

	else

		vsi->rx_itr_setting &= ~I40E_ITR_DYNAMIC;



	if (ec->use_adaptive_tx_coalesce)

		vsi->tx_itr_setting |= I40E_ITR_DYNAMIC;

	else

		vsi->tx_itr_setting &= ~I40E_ITR_DYNAMIC;



	for (i = 0; i < adapter->num_msix_vectors - NONQ_VECS; i++) {

		q_vector = adapter->q_vector[i];

CRA Git | Maintained and supported by SUSTech CRA and CCSE