From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A6696C48BC4 for ; Tue, 20 Feb 2024 12:44:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 4355C41592; Tue, 20 Feb 2024 12:44:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CMy7IOFEu3Ph; Tue, 20 Feb 2024 12:44:15 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D87A74157E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1708433054; bh=3gFiqg0wRVqX60s4FjRbJyKM1Au170z+vdSs/9NDhPY=; h=Date:From:To:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=cP1naiiHopN6rbzRxM13A7n0M+eSNhRJBHFeW1Wob7Wthfnp7YARnTNlcZTIfMezl E0z1qS/RY/XpaCVvGke/mp7WjjV37dZn0J4CMmlYQJFcrJH4dcEf3czKuCYMwKG7z0 Z5EQaoCJLkent2q5l2bphYjWlr0912zNOssvzpjuMQd2rYhZ92J+nl9JW7lVtnvXHT fY9eGbmHxlgUr/MhpY3cum/6ja8HYiQ+MYCli6POpd2V7y43NU6/24kfiUM87J62pJ JRuN+QnsIAYSIGsFmnr8t1j0yRPGfoKvc/5WLHLbpz1kSBma8TiplWSiYEe/DDOwq6 kAelk/ZP2ClHQ== Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id D87A74157E; Tue, 20 Feb 2024 12:44:14 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 6D2761BF3A7 for ; Tue, 20 Feb 2024 12:44:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 57D4A4149D for ; Tue, 20 Feb 2024 12:44:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bDHjmgznU7dd for ; Tue, 20 Feb 2024 12:44:12 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=139.178.84.217; helo=dfw.source.kernel.org; envelope-from=horms@kernel.org; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 611D34149C DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 611D34149C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by smtp2.osuosl.org (Postfix) with ESMTPS id 611D34149C for ; Tue, 20 Feb 2024 12:44:12 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 05D3E60F6B; Tue, 20 Feb 2024 12:44:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2082DC433F1; Tue, 20 Feb 2024 12:44:07 +0000 (UTC) Date: Tue, 20 Feb 2024 12:44:05 +0000 From: Simon Horman To: Andrew Lunn Message-ID: <20240220124405.GB40273@kernel.org> References: <20240218-keee-u32-cleanup-v4-0-71f13b7c3e60@lunn.ch> <20240218-keee-u32-cleanup-v4-3-71f13b7c3e60@lunn.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240218-keee-u32-cleanup-v4-3-71f13b7c3e60@lunn.ch> X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708433050; bh=pOErrnrrbQEnaNXElPlM3SFEJg4SBjhPI7dWuasZy/4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=atZ3fq9AY0IiRLZO2jJFAcr63jgN0ZbIIYtOxV8gmqrHKW19DYq2yO9IHt9WGQFzC w1RGc9MU0txJnxNkm4J75ZOhJMHChc5R3UyxDDlp+k+ngAc/MiVpfjokd4hwaUkZhR sqPGEvVNj6nL66wzCdfBmkdNJToKuJAZ5Gpz5HSrKLN1bACwSerEeRIABSqcZUosqV IG27lxcoQEoepMm8GZfctO0Mp9bN0a1kNTwFFyICClYwYuJQkrp1N7mkFdU2nMez8+ hnmTenjYSa0uMH1kSO+A/3PcqVw/RHGOMHelIadPB4PrXvOXE5JFoRf+Kpw/MqaLcn z0sA+BCpO0i5A== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=kernel.org X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=atZ3fq9A Subject: Re: [Intel-wired-lan] [PATCH net-next v4 3/9] net: qlogic: qede: Use linkmode helpers for EEE X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ariel Elior , Manish Chopra , netdev@vger.kernel.org, linux-usb@vger.kernel.org, Jesse Brandeburg , linux-kernel@vger.kernel.org, Eric Dumazet , Tony Nguyen , intel-wired-lan@lists.osuosl.org, Jakub Kicinski , Paolo Abeni , "David S. Miller" Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" On Sun, Feb 18, 2024 at 11:07:00AM -0600, Andrew Lunn wrote: > Make use of the existing linkmode helpers for bit manipulation of EEE > advertise, support and link partner support. The aim is to drop the > restricted _u32 variants in the near future. > > Signed-off-by: Andrew Lunn Thanks Andrew, the nit below notwithstanding this looks good to me. Reviewed-by: Simon Horman > --- > drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 60 ++++++++++++++++--------- > 1 file changed, 38 insertions(+), 22 deletions(-) > > diff --git a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c ... > @@ -1812,9 +1820,12 @@ static int qede_get_eee(struct net_device *dev, struct ethtool_keee *edata) > > static int qede_set_eee(struct net_device *dev, struct ethtool_keee *edata) > { > + __ETHTOOL_DECLARE_LINK_MODE_MASK(supported) = {}; > + __ETHTOOL_DECLARE_LINK_MODE_MASK(tmp) = {}; > struct qede_dev *edev = netdev_priv(dev); > struct qed_link_output current_link; > struct qed_link_params params; > + bool unsupp; > > if (!edev->ops->common->can_link_change(edev->cdev)) { > DP_INFO(edev, "Link settings are not allowed to be changed\n"); > @@ -1832,21 +1843,26 @@ static int qede_set_eee(struct net_device *dev, struct ethtool_keee *edata) > memset(¶ms, 0, sizeof(params)); > params.override_flags |= QED_LINK_OVERRIDE_EEE_CONFIG; > > - if (!(edata->advertised_u32 & (ADVERTISED_1000baseT_Full | > - ADVERTISED_10000baseT_Full)) || > - ((edata->advertised_u32 & (ADVERTISED_1000baseT_Full | > - ADVERTISED_10000baseT_Full)) != > - edata->advertised_u32)) { > + linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, > + supported); > + linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, > + supported); > + > + unsupp = linkmode_andnot(tmp, edata->advertised, supported); nit: Given the types involved, I might have written this as: unsupp = !!linkmode_andnot(tmp, edata->advertised, supported); > + if (unsupp) { > DP_VERBOSE(edev, QED_MSG_DEBUG, > - "Invalid advertised capabilities %d\n", > - edata->advertised_u32); > + "Invalid advertised capabilities %*pb\n", > + __ETHTOOL_LINK_MODE_MASK_NBITS, edata->advertised); > return -EINVAL; > } > > - if (edata->advertised_u32 & ADVERTISED_1000baseT_Full) > + if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, > + edata->advertised)) > params.eee.adv_caps = QED_EEE_1G_ADV; > - if (edata->advertised_u32 & ADVERTISED_10000baseT_Full) > - params.eee.adv_caps |= QED_EEE_10G_ADV; > + if (linkmode_test_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, > + edata->advertised)) > + params.eee.adv_caps = QED_EEE_10G_ADV; > + > params.eee.enable = edata->eee_enabled; > params.eee.tx_lpi_enable = edata->tx_lpi_enabled; > params.eee.tx_lpi_timer = edata->tx_lpi_timer; > > -- > 2.43.0 > >