From 69853c6ef201328562772b4f6adbed11c0cf2168 Mon Sep 17 00:00:00 2001

From: Eugene Syromiatnikov <esyr@redhat.com>

Date: Thu, 27 Aug 2020 19:20:02 +0200

Subject: [PATCH 7/7] Revert "[netdrv] ice: let core reject the unsupported

 coalescing parameters"

This reverts commit 090b055534b6b2c2a480d8dca667bbd1de6481e9.

---

 drivers/net/ethernet/intel/ice/ice_ethtool.c | 59 ++++++++++++++++++++++++++--

 1 file changed, 56 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c

index 2b0aa0afcd1e..0b2ceaf1a53c 100644

--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c

+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c

@@ -3493,6 +3493,12 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec,

 		break;

 	case ICE_TX_CONTAINER:

+		if (ec->tx_coalesce_usecs_high) {

+			netdev_info(vsi->netdev, "setting %s-usecs-high is not supported\n",

+				    c_type_str);

+			return -EINVAL;

+		}

+

 		use_adaptive_coalesce = ec->use_adaptive_tx_coalesce;

 		coalesce_usecs = ec->tx_coalesce_usecs;

@@ -3569,6 +3575,53 @@ ice_set_q_coalesce(struct ice_vsi *vsi, struct ethtool_coalesce *ec, int q_num)

 }

 /**

+ * ice_is_coalesce_param_invalid - check for unsupported coalesce parameters

+ * @netdev: pointer to the netdev associated with this query

+ * @ec: ethtool structure to fill with driver's coalesce settings

+ *

+ * Print netdev info if driver doesn't support one of the parameters

+ * and return error. When any parameters will be implemented, remove only

+ * this parameter from param array.

+ */

+static int

+ice_is_coalesce_param_invalid(struct net_device *netdev,

+			      struct ethtool_coalesce *ec)

+{

+	struct ice_ethtool_not_used {

+		u32 value;

+		const char *name;

+	} param[] = {

+		{ec->stats_block_coalesce_usecs, "stats-block-usecs"},

+		{ec->rate_sample_interval, "sample-interval"},

+		{ec->pkt_rate_low, "pkt-rate-low"},

+		{ec->pkt_rate_high, "pkt-rate-high"},

+		{ec->rx_max_coalesced_frames, "rx-frames"},

+		{ec->rx_coalesce_usecs_irq, "rx-usecs-irq"},

+		{ec->rx_max_coalesced_frames_irq, "rx-frames-irq"},

+		{ec->tx_max_coalesced_frames, "tx-frames"},

+		{ec->tx_coalesce_usecs_irq, "tx-usecs-irq"},

+		{ec->tx_max_coalesced_frames_irq, "tx-frames-irq"},

+		{ec->rx_coalesce_usecs_low, "rx-usecs-low"},

+		{ec->rx_max_coalesced_frames_low, "rx-frames-low"},

+		{ec->tx_coalesce_usecs_low, "tx-usecs-low"},

+		{ec->tx_max_coalesced_frames_low, "tx-frames-low"},

+		{ec->rx_max_coalesced_frames_high, "rx-frames-high"},

+		{ec->tx_max_coalesced_frames_high, "tx-frames-high"}

+	};

+	int i;

+

+	for (i = 0; i < ARRAY_SIZE(param); i++) {

+		if (param[i].value) {

+			netdev_info(netdev, "Setting %s not supported\n",

+				    param[i].name);

+			return -EINVAL;

+		}

+	}

+

+	return 0;

+}

+

+/**

  * ice_print_if_odd_usecs - print message if user tries to set odd [tx|rx]-usecs

  * @netdev: netdev used for print

  * @itr_setting: previous user setting

@@ -3608,6 +3661,9 @@ __ice_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ec,

 	struct ice_netdev_priv *np = netdev_priv(netdev);

 	struct ice_vsi *vsi = np->vsi;

+	if (ice_is_coalesce_param_invalid(netdev, ec))

+		return -EINVAL;

+

 	if (q_num < 0) {

 		struct ice_q_vector *q_vector = vsi->q_vectors[0];

 		int v_idx;

@@ -3802,9 +3858,6 @@ ice_get_module_eeprom(struct net_device *netdev,

 }

 static const struct ethtool_ops ice_ethtool_ops = {

-	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

-				     ETHTOOL_COALESCE_USE_ADAPTIVE |

-				     ETHTOOL_COALESCE_RX_USECS_HIGH,

 	.get_link_ksettings	= ice_get_link_ksettings,

 	.set_link_ksettings	= ice_set_link_ksettings,

 	.get_drvinfo		= ice_get_drvinfo,

-- 

2.13.6