From patchwork Wed Feb 1 14:58:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 51380 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp325763wrn; Wed, 1 Feb 2023 07:01:58 -0800 (PST) X-Google-Smtp-Source: AK7set87LhTRyKIrRIoj7VFVPX6MeezMkuJAdhxzHlas8rfvVG4e11Jk59ocE+9crgskXT0HmPIn X-Received: by 2002:a05:6a20:3a87:b0:bd:3a3:98cb with SMTP id d7-20020a056a203a8700b000bd03a398cbmr2373565pzh.1.1675263717713; Wed, 01 Feb 2023 07:01:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675263717; cv=none; d=google.com; s=arc-20160816; b=jYwe7B3rcqa2MqtIJBTJEHR7gDoXG4KC3b6uIHIqcnoIQuOp1BGN/P86DoUC3zSoXp 6ItwOuZj8lJBQlTR7hQ3zu5XHhtBgqy0qX9YM/E3nYTSSOo3YOEeBUufB7MoKKrOkt4m woc4J4H/c/lNvGziIE8iapclQu+kEbnvtn9YBFINZi7f8CqkMeR4D2CYALT+zjr0NCxd v9yDe0ZsWcLZuE+bCKZkEyDIuJqllHML/0iPmm4FSpHEiB2css1XiRFJXCB6geOo2hWy u4xW2VTcaTShkdQgRMW7sQbEciuEwExM+cmAwy0Hx5eo2dXBjNYJYshTTiFNnpMo16n5 DWKQ== 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=gAsP97CvowYa1cuFip/L5MMbEWV9vy9Axk2o33Lrrso=; b=Q1SXfXQy5BEcwXOd0orZKe7+M15BFysp9Y7A31liUDCQJSgtsL0X9duhIcz9mxQjlX crQ37xp4yMN5ni+58amo/jPZrrW+42QK4qHGZLyRla1wP4VcD3L3+GZHv0XIP5LcQGKh K6Y2Gdwzeoz+9MKYzAb9QlaBaYJTHzjWJh4U/KgWl0m0cmbyH7Mgbff2dEpu95b3mHYH p4yzZm9LK0ReG6HEs1bvRmLkO701Zrz+GqxfnaMswn+YxC5ujY+I3+qc7+X69NpKZYQK MU9yS8dkgNzRQMCoVGnHlDg5SfqqzDA+BOaaTacRp+Kg5TqUMaOeF6t9VEg+sXGOe1E1 1jkw== 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 x22-20020a63b216000000b004bbfa29fb4asi18495754pge.563.2023.02.01.07.01.43; Wed, 01 Feb 2023 07:01:57 -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 S232723AbjBAPAJ (ORCPT + 99 others); Wed, 1 Feb 2023 10:00:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232506AbjBAO7G (ORCPT ); Wed, 1 Feb 2023 09:59:06 -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 63E9C69B1B for ; Wed, 1 Feb 2023 06:59:04 -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 1pNEZY-0002rr-KZ; Wed, 01 Feb 2023 15:58:52 +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 1pNEZY-001w28-K2; Wed, 01 Feb 2023 15:58:51 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pNEZT-009hXb-Jm; Wed, 01 Feb 2023 15:58:47 +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 v4 21/23] r8152: replace EEE ethtool helpers to linkmode variants Date: Wed, 1 Feb 2023 15:58:43 +0100 Message-Id: <20230201145845.2312060-22-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230201145845.2312060-1-o.rempel@pengutronix.de> References: <20230201145845.2312060-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?1756641328181091088?= X-GMAIL-MSGID: =?utf-8?q?1756641328181091088?= 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/usb/r8152.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index decb5ba56a25..dbfde0aec003 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -8745,17 +8745,23 @@ static void rtl8152_get_strings(struct net_device *dev, u32 stringset, u8 *data) static int r8152_get_eee(struct r8152 *tp, struct ethtool_eee *eee) { - u32 lp, adv, supported = 0; + __ETHTOOL_DECLARE_LINK_MODE_MASK(lm_able) = {}; + __ETHTOOL_DECLARE_LINK_MODE_MASK(lm_adv) = {}; + __ETHTOOL_DECLARE_LINK_MODE_MASK(lm_lp) = {}; + u32 lp, adv, supported; u16 val; val = r8152_mmd_read(tp, MDIO_MMD_PCS, MDIO_PCS_EEE_ABLE); - supported = mmd_eee_cap_to_ethtool_sup_t(val); + mii_eee_100_10000_adv_mod_linkmode_t(lm_able, val); + ethtool_convert_link_mode_to_legacy_u32(&supported, lm_able); val = r8152_mmd_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV); - adv = mmd_eee_adv_to_ethtool_adv_t(val); + mii_eee_100_10000_adv_mod_linkmode_t(lm_adv, val); + ethtool_convert_link_mode_to_legacy_u32(&adv, lm_adv); val = r8152_mmd_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_LPABLE); - lp = mmd_eee_adv_to_ethtool_adv_t(val); + mii_eee_100_10000_adv_mod_linkmode_t(lm_lp, val); + ethtool_convert_link_mode_to_legacy_u32(&lp, lm_lp); eee->eee_enabled = tp->eee_en; eee->eee_active = !!(supported & adv & lp); @@ -8768,7 +8774,11 @@ static int r8152_get_eee(struct r8152 *tp, struct ethtool_eee *eee) static int r8152_set_eee(struct r8152 *tp, struct ethtool_eee *eee) { - u16 val = ethtool_adv_to_mmd_eee_adv_t(eee->advertised); + __ETHTOOL_DECLARE_LINK_MODE_MASK(adv) = {}; + u16 val; + + adv[0] = eee->advertised; + val = linkmode_adv_to_mii_eee_100_10000_adv_t(adv); tp->eee_en = eee->eee_enabled; tp->eee_adv = val; @@ -8780,17 +8790,23 @@ static int r8152_set_eee(struct r8152 *tp, struct ethtool_eee *eee) static int r8153_get_eee(struct r8152 *tp, struct ethtool_eee *eee) { - u32 lp, adv, supported = 0; + __ETHTOOL_DECLARE_LINK_MODE_MASK(lm_able) = {}; + __ETHTOOL_DECLARE_LINK_MODE_MASK(lm_adv) = {}; + __ETHTOOL_DECLARE_LINK_MODE_MASK(lm_lp) = {}; + u32 lp, adv, supported; u16 val; val = ocp_reg_read(tp, OCP_EEE_ABLE); - supported = mmd_eee_cap_to_ethtool_sup_t(val); + mii_eee_100_10000_adv_mod_linkmode_t(lm_able, val); + ethtool_convert_link_mode_to_legacy_u32(&supported, lm_able); val = ocp_reg_read(tp, OCP_EEE_ADV); - adv = mmd_eee_adv_to_ethtool_adv_t(val); + mii_eee_100_10000_adv_mod_linkmode_t(lm_adv, val); + ethtool_convert_link_mode_to_legacy_u32(&adv, lm_adv); val = ocp_reg_read(tp, OCP_EEE_LPABLE); - lp = mmd_eee_adv_to_ethtool_adv_t(val); + mii_eee_100_10000_adv_mod_linkmode_t(lm_lp, val); + ethtool_convert_link_mode_to_legacy_u32(&lp, lm_lp); eee->eee_enabled = tp->eee_en; eee->eee_active = !!(supported & adv & lp);