From patchwork Mon Feb 6 13:50:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 53276 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2251430wrn; Mon, 6 Feb 2023 06:03:59 -0800 (PST) X-Google-Smtp-Source: AK7set8UgicBm/yKQM9M64wiL8fQb7iqgnlPHTyPS6sT4LexyvZP0UDAXCtVxt4DHh9TUmdnSNut X-Received: by 2002:a05:6a21:33aa:b0:bc:fe7e:cfd9 with SMTP id yy42-20020a056a2133aa00b000bcfe7ecfd9mr23920481pzb.18.1675692239486; Mon, 06 Feb 2023 06:03:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675692239; cv=none; d=google.com; s=arc-20160816; b=w/eiwpXk4UkfMek5RaqLm6d6E6KUltskrRlgibXQrWL6jBzz/f0uTZz8bsXwQzVYxQ A+JtYQVytl+3KcNdmAlWyitYPBB2Q6y4uxMIxdiIoOMJnVI8rVT4jYNvLacdDsaZT0/X 8/oWQviBNLswC5T5EwwiYeVfqK388l1kjMv8512JSDBAdQIwQfpqv1wj1sdiHtTUwbjG tufvDJMIlTPcFw7IPaSYMAqJaAdDBDkYd1gmIFowD2IlAV4aDNDopXi/VYw8T8ueU0J9 ukaUGEvpp/BqGTTEegi4KvfjUpUebxL2yjvnow329CwOrNEgHsxzHP3lumbO/WqBpoq9 ip/Q== 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=L/iZwwuYM/UoVF/RcbGpngmITMb3IpStZyKMiRBbLHc=; b=OlqGeN6FOXlys6NxtiGOoba7oFkN2XKqt9JxpDsvINmQ8nNA+tGwJCtuF5BOMNo0YG uvDUkSpEy77ldYntKMYJSw+9VoobN6FYl9mSMiOREqWMykjRvvEDMJX7vIYMOfE/vjVf KacqvGOmjOr4434/fip2VUV2aNMaaKqfrDJoq7HAK0qqkx/J4eu0T9FNZeAm7P4HX1JU u6rQvpfMnrxZy83gANNn2E8etpIF5EO8uXF6MezzFWoNYmjyLJ2OeLHhHnhgOKD/hsLt jZeY0QrdhDiC/6jIPafUbs4vHvfbLUCXGJ35Fr/6QPyFh3aJb6MCVgcLSzIJlQLc/oPa EnGQ== 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 m30-20020a637d5e000000b004fab627daa8si6890025pgn.472.2023.02.06.06.03.46; Mon, 06 Feb 2023 06:03:59 -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 S231264AbjBFNxF (ORCPT + 99 others); Mon, 6 Feb 2023 08:53:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230169AbjBFNvk (ORCPT ); Mon, 6 Feb 2023 08:51:40 -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 915AB1DB86 for ; Mon, 6 Feb 2023 05:51:22 -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-0007HO-67; 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 1pP1tW-0034e6-3W; 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-00DaQX-3U; 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 17/23] e1000e: replace EEE ethtool helpers to linkmode variants Date: Mon, 6 Feb 2023 14:50:44 +0100 Message-Id: <20230206135050.3237952-18-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?1757090665624383525?= X-GMAIL-MSGID: =?utf-8?q?1757090665624383525?= 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/e1000e/ethtool.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c index 721f86fd5802..13c728626068 100644 --- a/drivers/net/ethernet/intel/e1000e/ethtool.c +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c @@ -2188,6 +2188,9 @@ static int e1000_get_rxnfc(struct net_device *netdev, static int e1000e_get_eee(struct net_device *netdev, struct ethtool_eee *edata) { struct e1000_adapter *adapter = netdev_priv(netdev); + __ETHTOOL_DECLARE_LINK_MODE_MASK(lm_able) = {}; + __ETHTOOL_DECLARE_LINK_MODE_MASK(lm_adv) = {}; + __ETHTOOL_DECLARE_LINK_MODE_MASK(lm_lp) = {}; struct e1000_hw *hw = &adapter->hw; u16 cap_addr, lpa_addr, pcs_stat_addr, phy_data; u32 ret_val; @@ -2222,16 +2225,19 @@ static int e1000e_get_eee(struct net_device *netdev, struct ethtool_eee *edata) ret_val = e1000_read_emi_reg_locked(hw, cap_addr, &phy_data); if (ret_val) goto release; - edata->supported = mmd_eee_cap_to_ethtool_sup_t(phy_data); + mii_eee_cap1_mod_linkmode_t(lm_able, phy_data); + ethtool_convert_link_mode_to_legacy_u32(&edata->supported, lm_able); /* EEE Advertised */ - edata->advertised = mmd_eee_adv_to_ethtool_adv_t(adapter->eee_advert); + mii_eee_cap1_mod_linkmode_t(lm_adv, adapter->eee_advert); + ethtool_convert_link_mode_to_legacy_u32(&edata->advertised, lm_adv); /* EEE Link Partner Advertised */ ret_val = e1000_read_emi_reg_locked(hw, lpa_addr, &phy_data); if (ret_val) goto release; - edata->lp_advertised = mmd_eee_adv_to_ethtool_adv_t(phy_data); + mii_eee_cap1_mod_linkmode_t(lm_lp, phy_data); + ethtool_convert_link_mode_to_legacy_u32(&edata->lp_advertised, lm_lp); /* EEE PCS Status */ ret_val = e1000_read_emi_reg_locked(hw, pcs_stat_addr, &phy_data); @@ -2264,6 +2270,7 @@ static int e1000e_get_eee(struct net_device *netdev, struct ethtool_eee *edata) static int e1000e_set_eee(struct net_device *netdev, struct ethtool_eee *edata) { struct e1000_adapter *adapter = netdev_priv(netdev); + __ETHTOOL_DECLARE_LINK_MODE_MASK(adv) = {}; struct e1000_hw *hw = &adapter->hw; struct ethtool_eee eee_curr; s32 ret_val; @@ -2287,7 +2294,8 @@ static int e1000e_set_eee(struct net_device *netdev, struct ethtool_eee *edata) 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); hw->dev_spec.ich8lan.eee_disable = !edata->eee_enabled;