From patchwork Fri Mar 13 04:07:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 222582 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85678C2BB1D for ; Fri, 13 Mar 2020 04:08:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C60320771 for ; Fri, 13 Mar 2020 04:08:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584072504; bh=P7nDgmfu0Mi1kzjATtYotef52CzNEI9Oajed06rlfew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GPo4MnvBmbTC/fUoIWyar1YNzoL2w0tH9qcF63Ck1s4ZC2gIilCaxH+xta2JlM6k6 R+R2pvDzvu77vx7uonY577cCfRE5Nw/JSOw92tFz05qD2emNCecxylI23Njq3jA2mD JWO40+z7uztFqaKHh1YOzOhpucDhtJl/q5EHGCOY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726670AbgCMEIW (ORCPT ); Fri, 13 Mar 2020 00:08:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:39292 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726628AbgCMEIQ (ORCPT ); Fri, 13 Mar 2020 00:08:16 -0400 Received: from kicinski-fedora-PC1C0HJN.thefacebook.com (unknown [163.114.132.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5D61D20767; Fri, 13 Mar 2020 04:08:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584072496; bh=P7nDgmfu0Mi1kzjATtYotef52CzNEI9Oajed06rlfew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rOAwt0LRGqk9fENOoVZo0hjJ2jGvWkCX6/xy/Ti9B4rTa2nEQN36lUHrGIwFtSKA3 uo5uXFbUuTLjwDUcRM7QVfPQfnFog4/HIjQT9PfqRPNSFhcfu1TN/PNwx58zrxhFrT 7lONlhz4HR17upSceJLS6nsT9KJw5+o+1WKNTUPA= From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, kernel-team@fb.com, cooldavid@cooldavid.org, sebastian.hesselbarth@gmail.com, thomas.petazzoni@bootlin.com, maxime.chevallier@bootlin.com, rmk+kernel@armlinux.org.uk, mcroce@redhat.com, sgoutham@marvell.com, gakula@marvell.com, sbhatta@marvell.com, hkelam@marvell.com, mlindner@marvell.com, stephen@networkplumber.org, christopher.lee@cspi.com, manishc@marvell.com, rahulv@marvell.com, GR-Linux-NIC-Dev@marvell.com, aelior@marvell.com, GR-everest-linux-l2@marvell.com, shshaikh@marvell.com, nic_swsd@realtek.com, hkallweit1@gmail.com, bh74.an@samsung.com, romieu@fr.zoreil.com Subject: [PATCH net-next 10/15] net: netxen: let core reject the unsupported coalescing parameters Date: Thu, 12 Mar 2020 21:07:58 -0700 Message-Id: <20200313040803.2367590-11-kuba@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200313040803.2367590-1-kuba@kernel.org> References: <20200313040803.2367590-1-kuba@kernel.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters. As a side effect of these changes the error code for unsupported params changes from EINVAL to EOPNOTSUPP. The driver was missing a check for rate_sample_interval. Signed-off-by: Jakub Kicinski --- .../qlogic/netxen/netxen_nic_ethtool.c | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c index 6a2d91d58968..66f45fce90fa 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c @@ -748,24 +748,7 @@ static int netxen_set_intr_coalesce(struct net_device *netdev, if (ethcoal->rx_coalesce_usecs > 0xffff || ethcoal->rx_max_coalesced_frames > 0xffff || ethcoal->tx_coalesce_usecs > 0xffff || - ethcoal->tx_max_coalesced_frames > 0xffff || - ethcoal->rx_coalesce_usecs_irq || - ethcoal->rx_max_coalesced_frames_irq || - ethcoal->tx_coalesce_usecs_irq || - ethcoal->tx_max_coalesced_frames_irq || - ethcoal->stats_block_coalesce_usecs || - ethcoal->use_adaptive_rx_coalesce || - ethcoal->use_adaptive_tx_coalesce || - ethcoal->pkt_rate_low || - ethcoal->rx_coalesce_usecs_low || - ethcoal->rx_max_coalesced_frames_low || - ethcoal->tx_coalesce_usecs_low || - ethcoal->tx_max_coalesced_frames_low || - ethcoal->pkt_rate_high || - ethcoal->rx_coalesce_usecs_high || - ethcoal->rx_max_coalesced_frames_high || - ethcoal->tx_coalesce_usecs_high || - ethcoal->tx_max_coalesced_frames_high) + ethcoal->tx_max_coalesced_frames > 0xffff) return -EINVAL; if (!ethcoal->rx_coalesce_usecs || @@ -923,6 +906,8 @@ netxen_get_dump_data(struct net_device *netdev, struct ethtool_dump *dump, } const struct ethtool_ops netxen_nic_ethtool_ops = { + .supported_coalesce_params = ETHTOOL_COALESCE_USECS | + ETHTOOL_COALESCE_MAX_FRAMES, .get_drvinfo = netxen_nic_get_drvinfo, .get_regs_len = netxen_nic_get_regs_len, .get_regs = netxen_nic_get_regs,