From patchwork Mon Feb 6 13:50:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 53261 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2245734wrn; Mon, 6 Feb 2023 05:53:21 -0800 (PST) X-Google-Smtp-Source: AK7set/Fc6JnW9z6pAZzX7qHNEifBDKvVVbWg10Qz0MXnfUAgNTOb+08ORTgnYhVghotGP+bln6c X-Received: by 2002:a50:9987:0:b0:4aa:bb71:423d with SMTP id m7-20020a509987000000b004aabb71423dmr1658024edb.1.1675691601758; Mon, 06 Feb 2023 05:53:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675691601; cv=none; d=google.com; s=arc-20160816; b=lv89gi0/DA6xYsZ/tQ0oMiFqyjdxeNAP+0K52/0uNAYxpZ2xh8Gt9w15hbIF+ggGKt I/O8aLPOhlErmsM+ruB/LaaMhrtO1uHfbfuiJEjRKgd/RO7eLp7cqrrPno7tPCPQFCM1 bWOyTTjtUcEB5YlDodll3CBCepvm2fY3myOyKUE7uVLrGNmQAYzygNWwHoosgwuVemND 3eiWgN3pq6BJhlzg3sZDEPLJR//h6QJzS6UW4TtmsJ/YLn+hnOJcAYSC3gDDatTULUxj sMVy8oJXAVXOXimqm50RW0mE8skpGT1Ooh1NJe4qxehfqWkwPSIh8rUYpsfGKwYMe3J2 H3Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=n39vrR2F1y3/VtZDsP17clAGM6bVAC/vgQBNBH6a0bs=; b=noeDzUT2fkPQYaoqTGxNiNwEVsuDlMtXf3aCQwIL7IA8V+2W3rozRVX563MKC4U4pW IoPzptzbTB44QcAihajSNk30U2hwsM+V7xTt8oUsVw03nraxnFed7ogq8K5vIR/9+IRS LVt2bWRU0/qNz6HOtir3C2GaDsC9WsJYr4HYEC7Mli0x6BvnJD4w71rfFmP2y6EhlufF zKs2+CX0E4f5v8N/gv20t/lSeo1e7OqpTYB6X3SEoJ7pnzcFPeGbPKz+Z6Dds8ND8keN WUsDc/DIq9Wdjv4t+4NfbkIhqFlj1j4ZWg0U4zrrNnlnTaDr6GKBySXdzqoFLFy+O/a7 BmEg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fi27-20020a056402551b00b004a091a92414si12847581edb.472.2023.02.06.05.52.58; Mon, 06 Feb 2023 05:53:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230445AbjBFNwI (ORCPT + 99 others); Mon, 6 Feb 2023 08:52:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229665AbjBFNvc (ORCPT ); Mon, 6 Feb 2023 08:51:32 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 376881F903 for ; Mon, 6 Feb 2023 05:51:13 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pP1tY-0007HJ-5A; Mon, 06 Feb 2023 14:50:56 +0100 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pP1tV-0034e0-UJ; Mon, 06 Feb 2023 14:50:55 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pP1tV-00DaQg-5n; Mon, 06 Feb 2023 14:50:53 +0100 From: Oleksij Rempel To: Woojung Huh , UNGLinuxDriver@microchip.com, Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Wei Fang , Heiner Kallweit Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Arun.Ramadoss@microchip.com, intel-wired-lan@lists.osuosl.org Subject: [PATCH net-next v5 18/23] igb: replace EEE ethtool helpers to linkmode variants Date: Mon, 6 Feb 2023 14:50:45 +0100 Message-Id: <20230206135050.3237952-19-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230206135050.3237952-1-o.rempel@pengutronix.de> References: <20230206135050.3237952-1-o.rempel@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757089997018702735?= X-GMAIL-MSGID: =?utf-8?q?1757089997018702735?= Replace EEE ethtool helpers with linkmode variants. This will reduce similar code snippets and prepare ethtool EEE interface to linkmode migration. Signed-off-by: Oleksij Rempel --- drivers/net/ethernet/intel/igb/igb_ethtool.c | 23 +++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c index 7d60da1b7bf4..5aa4c28fc447 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c @@ -3026,6 +3026,8 @@ static int igb_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd) static int igb_get_eee(struct net_device *netdev, struct ethtool_eee *edata) { struct igb_adapter *adapter = netdev_priv(netdev); + __ETHTOOL_DECLARE_LINK_MODE_MASK(adv) = {}; + __ETHTOOL_DECLARE_LINK_MODE_MASK(lp) = {}; struct e1000_hw *hw = &adapter->hw; u32 ret_val; u16 phy_data; @@ -3036,9 +3038,12 @@ static int igb_get_eee(struct net_device *netdev, struct ethtool_eee *edata) edata->supported = (SUPPORTED_1000baseT_Full | SUPPORTED_100baseT_Full); - if (!hw->dev_spec._82575.eee_disable) - edata->advertised = - mmd_eee_adv_to_ethtool_adv_t(adapter->eee_advert); + + if (!hw->dev_spec._82575.eee_disable) { + mii_eee_cap1_mod_linkmode_t(adv, adapter->eee_advert); + ethtool_convert_link_mode_to_legacy_u32(&edata->advertised, + adv); + } /* The IPCNFG and EEER registers are not supported on I354. */ if (hw->mac.type == e1000_i354) { @@ -3064,7 +3069,9 @@ static int igb_get_eee(struct net_device *netdev, struct ethtool_eee *edata) if (ret_val) return -ENODATA; - edata->lp_advertised = mmd_eee_adv_to_ethtool_adv_t(phy_data); + mii_eee_cap1_mod_linkmode_t(lp, phy_data); + ethtool_convert_link_mode_to_legacy_u32(&edata->lp_advertised, + lp); break; case e1000_i354: case e1000_i210: @@ -3075,7 +3082,9 @@ static int igb_get_eee(struct net_device *netdev, struct ethtool_eee *edata) if (ret_val) return -ENODATA; - edata->lp_advertised = mmd_eee_adv_to_ethtool_adv_t(phy_data); + mii_eee_cap1_mod_linkmode_t(lp, phy_data); + ethtool_convert_link_mode_to_legacy_u32(&edata->lp_advertised, + lp); break; default: @@ -3105,6 +3114,7 @@ static int igb_set_eee(struct net_device *netdev, struct ethtool_eee *edata) { struct igb_adapter *adapter = netdev_priv(netdev); + __ETHTOOL_DECLARE_LINK_MODE_MASK(adv) = {}; struct e1000_hw *hw = &adapter->hw; struct ethtool_eee eee_curr; bool adv1g_eee = true, adv100m_eee = true; @@ -3149,7 +3159,8 @@ static int igb_set_eee(struct net_device *netdev, return -EINVAL; } - adapter->eee_advert = ethtool_adv_to_mmd_eee_adv_t(edata->advertised); + adv[0] = edata->advertised; + adapter->eee_advert = linkmode_to_mii_eee_cap1_t(adv); if (hw->dev_spec._82575.eee_disable != !edata->eee_enabled) { hw->dev_spec._82575.eee_disable = !edata->eee_enabled; adapter->flags |= IGB_FLAG_EEE;