From patchwork Mon Jan 30 08:07:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 50168 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2061686wrn; Mon, 30 Jan 2023 00:08:07 -0800 (PST) X-Google-Smtp-Source: AK7set9rXz7UyC50wxnIPZQHbZexiE0yZLkUCiD/wnqrQIKn+2vDEpi+y741arAogLubhHA0A98N X-Received: by 2002:a17:907:6d9c:b0:881:7f2d:7a87 with SMTP id sb28-20020a1709076d9c00b008817f2d7a87mr10766966ejc.63.1675066087206; Mon, 30 Jan 2023 00:08:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675066087; cv=none; d=google.com; s=arc-20160816; b=n6+IaPjBGA7wCK7Al8e/QbAlvlcZDC9vvuQGh5y5Vb4w0ob9jez3AsUSDAWJDIHR4T OR5jsqKgW8ePu6a/1xpMqqyIgIGS/EBRNK1s5TJo30TEWouOnYD05zHBfjjpvSETa4v5 5wmZQrcUkoptvBGA0zE6zKVLQsLswAY176A+9HGzu8Vr3dBSx9DOJJUkq5voNAoilGIj TLrQXPPGF0LkMMG+E/ADrm8yVb3MO4yw43wbs9diDCgLvzoERYWTg+w39gr8fhwBz+Ct gEFc1btl20bfCWPltUpgQSmsI9VU/Ndqua1emg4TB6B/eoQ+E7tpn+HOtnjeZ2WXB4QT MGIQ== 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=uMSHi6CGzSY4+k2aHAubKXZdpFkcTcSyQo1bzP0QwEk=; b=1FzaSP80nlbmINVV9mTv6oXjAOWMWZiHgBFWSuxyQ9Jb72g1pGX4gZIJRiu6j8vnAJ iOdEVaABaoYkk5cuoS1QUw4lJsPJlYdguvdTGx7qodpldpFbIX0sJ4Zxhma6UWuX43m8 2ER6eW2cD/VwqXeQsKOY7YoZ0auG9Q/jAfUg58a1li0wJ6GTAXPLLFr9/vOdqVLnT5Gw xE0XFLE+vRtWxBWEWIyUgGOysHEQ5FkE5yWBjwYvCDlBAiuc6zb+6GWOR/4FSjh3O6Zn cWPBkPjwxHVkNNrNN/q4aKaBxtFIuVnU3zve3G+Vi38i/yqeB16ti9NSJoB8bLPxju5b SFLg== 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 16-20020a170906015000b0087bdb8e120fsi11283933ejh.369.2023.01.30.00.07.44; Mon, 30 Jan 2023 00:08:07 -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 S235596AbjA3IHd (ORCPT + 99 others); Mon, 30 Jan 2023 03:07:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229653AbjA3IHb (ORCPT ); Mon, 30 Jan 2023 03:07:31 -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 AEFDF18AA7 for ; Mon, 30 Jan 2023 00:07:29 -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 1pMPCB-0003f8-2b; Mon, 30 Jan 2023 09:07:19 +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 1pMPCA-001Pw2-5J; Mon, 30 Jan 2023 09:07:17 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pMPC7-000aKA-Lo; Mon, 30 Jan 2023 09:07:15 +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 Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Arun.Ramadoss@microchip.com Subject: [PATCH net-next v3 08/15] net: phy: start using genphy_c45_ethtool_get/set_eee() Date: Mon, 30 Jan 2023 09:07:07 +0100 Message-Id: <20230130080714.139492-9-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130080714.139492-1-o.rempel@pengutronix.de> References: <20230130080714.139492-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?1756434097336819075?= X-GMAIL-MSGID: =?utf-8?q?1756434097336819075?= All preparations are done. Now we can start using new functions and remove the old code. Signed-off-by: Oleksij Rempel --- drivers/net/phy/phy.c | 60 ++----------------------------------------- 1 file changed, 2 insertions(+), 58 deletions(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 41cfb24c48c1..54b62a604238 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -1578,33 +1578,10 @@ EXPORT_SYMBOL(phy_get_eee_err); */ int phy_ethtool_get_eee(struct phy_device *phydev, struct ethtool_eee *data) { - int val; - if (!phydev->drv) return -EIO; - /* Get Supported EEE */ - val = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_PCS_EEE_ABLE); - if (val < 0) - return val; - data->supported = mmd_eee_cap_to_ethtool_sup_t(val); - - /* Get advertisement EEE */ - val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV); - if (val < 0) - return val; - data->advertised = mmd_eee_adv_to_ethtool_adv_t(val); - data->eee_enabled = !!data->advertised; - - /* Get LP advertisement EEE */ - val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_LPABLE); - if (val < 0) - return val; - data->lp_advertised = mmd_eee_adv_to_ethtool_adv_t(val); - - data->eee_active = !!(data->advertised & data->lp_advertised); - - return 0; + return genphy_c45_ethtool_get_eee(phydev, data); } EXPORT_SYMBOL(phy_ethtool_get_eee); @@ -1617,43 +1594,10 @@ EXPORT_SYMBOL(phy_ethtool_get_eee); */ int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data) { - int cap, old_adv, adv = 0, ret; - if (!phydev->drv) return -EIO; - /* Get Supported EEE */ - cap = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_PCS_EEE_ABLE); - if (cap < 0) - return cap; - - old_adv = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV); - if (old_adv < 0) - return old_adv; - - if (data->eee_enabled) { - adv = !data->advertised ? cap : - ethtool_adv_to_mmd_eee_adv_t(data->advertised) & cap; - /* Mask prohibited EEE modes */ - adv &= ~phydev->eee_broken_modes; - } - - if (old_adv != adv) { - ret = phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, adv); - if (ret < 0) - return ret; - - /* Restart autonegotiation so the new modes get sent to the - * link partner. - */ - if (phydev->autoneg == AUTONEG_ENABLE) { - ret = phy_restart_aneg(phydev); - if (ret < 0) - return ret; - } - } - - return 0; + return genphy_c45_ethtool_set_eee(phydev, data); } EXPORT_SYMBOL(phy_ethtool_set_eee);