From patchwork Tue Feb 21 05:03:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 59765 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1691113wrn; Mon, 20 Feb 2023 21:46:06 -0800 (PST) X-Google-Smtp-Source: AK7set8E1j/k2IPe8Rdtl75jBDAW/PMztjcDZtFR5zqLa0Di63KmNouWaiLa4XeiYd0UUVd4ugNj X-Received: by 2002:a17:902:f983:b0:19a:8636:9e36 with SMTP id ky3-20020a170902f98300b0019a86369e36mr2627272plb.14.1676958366014; Mon, 20 Feb 2023 21:46:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676958365; cv=none; d=google.com; s=arc-20160816; b=LdCU/xeqxbwN8pDvSUZxXPMxXq7VWWwoXPoe+vVcZGsf2u5MKYqlR7fKJ+f51rhO/b zPITtTyBdN8KQgjRxDaLz6xOBk8wDHU8MZ5pInDLK0dJtkfe87aZosiFly/1zj9/ro0o BgNWm0+AmW4eIVCi863k9U61OLFJwJ9a8G3m5Wx+76H+d0vK6181uClXUJz9hdhjt4Hw yZu6BF3lbv5DiQre9WAg3wIbonn1PrKtGiYM3xR9zIzJewwc0HFyoviRy5UT2sjEWJ8L 9xDc5evyNS9LxF5Q5MoUjHBAwKGZabUD6z+emSgVRSEyPONV+UL2viY6msTJZdKPYWwU a/jQ== 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=R7UmsbPdOwbFa+WfXAB2DMznfEvQv905rVXkh6/A1j8=; b=x7a4qtfEurfShztxRCyQvrxN/mBJU61c5cHLesE46fMo6A6zbaTcC1k6AUQc0GYhlp a1DoASrzGv/g1ZcKtbJdwTdUtVY7kgdm3v6x7+A52tz4yRr6oUSyGR8Creml3tJL0Z9v ffRiBqpfg4GeWJPLuqi0q3R5G+1W47XIvM02uWkZPg5NEM29j1fNosKAj1NLY+7IK6t/ /4O+hVAXwlh0VZxd6/8ze9wq9A0dJZ5iHrKsBZK+i7/FZVhcxKJ8i6bzcUWDoGnql/Qx t5y6v6AjNnexAGOE/d/cUgnGx3Rt91Ucs++2E9F5UN4GX1isVrRvkyrtVPAGLzjcPNnm p7sg== 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 19-20020a170902c21300b0019644d4246csi11147398pll.418.2023.02.20.21.45.53; Mon, 20 Feb 2023 21:46:05 -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 S233227AbjBUFEN (ORCPT + 99 others); Tue, 21 Feb 2023 00:04:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231755AbjBUFDv (ORCPT ); Tue, 21 Feb 2023 00:03:51 -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 8F7AB1CAC7 for ; Mon, 20 Feb 2023 21:03:47 -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 1pUKoU-0002zw-4H; Tue, 21 Feb 2023 06:03:38 +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 1pUKoR-006PyR-Hh; Tue, 21 Feb 2023 06:03:36 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pUKoR-002QO1-PJ; Tue, 21 Feb 2023 06:03:35 +0100 From: Oleksij Rempel To: Andrew Lunn , Heiner Kallweit , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Oleksij Rempel , Russell King , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Russell King Subject: [PATCH net-next v2 2/4] net: phy: c45: add genphy_c45_an_config_eee_aneg() function Date: Tue, 21 Feb 2023 06:03:32 +0100 Message-Id: <20230221050334.578012-3-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230221050334.578012-1-o.rempel@pengutronix.de> References: <20230221050334.578012-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?1758418295653129876?= X-GMAIL-MSGID: =?utf-8?q?1758418295653129876?= Add new genphy_c45_an_config_eee_aneg() function and replace some of genphy_c45_write_eee_adv() calls. This will be needed by the next patch. Signed-off-by: Oleksij Rempel Reviewed-by: Russell King (Oracle) --- drivers/net/phy/phy-c45.c | 12 +++++++++++- drivers/net/phy/phy_device.c | 2 +- include/linux/phy.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c index f23cce2c5199..904f64818922 100644 --- a/drivers/net/phy/phy-c45.c +++ b/drivers/net/phy/phy-c45.c @@ -262,7 +262,7 @@ int genphy_c45_an_config_aneg(struct phy_device *phydev) linkmode_and(phydev->advertising, phydev->advertising, phydev->supported); - ret = genphy_c45_write_eee_adv(phydev, phydev->supported_eee); + ret = genphy_c45_an_config_eee_aneg(phydev); if (ret < 0) return ret; else if (ret) @@ -858,6 +858,16 @@ int genphy_c45_read_eee_abilities(struct phy_device *phydev) } EXPORT_SYMBOL_GPL(genphy_c45_read_eee_abilities); +/** + * genphy_c45_an_config_eee_aneg - write advertised EEE link modes + * @phydev: target phy_device struct + * @adv: the linkmode advertisement settings + */ +int genphy_c45_an_config_eee_aneg(struct phy_device *phydev) +{ + return genphy_c45_write_eee_adv(phydev, phydev->supported_eee); +} + /** * genphy_c45_pma_read_abilities - read supported link modes from PMA * @phydev: target phy_device struct diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 8d927c5e3bf8..0c47665effaf 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -2231,7 +2231,7 @@ int __genphy_config_aneg(struct phy_device *phydev, bool changed) { int err; - err = genphy_c45_write_eee_adv(phydev, phydev->supported_eee); + err = genphy_c45_an_config_eee_aneg(phydev); if (err < 0) return err; else if (err) diff --git a/include/linux/phy.h b/include/linux/phy.h index 727bff531a14..19d83e112beb 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1765,6 +1765,7 @@ int genphy_c45_ethtool_get_eee(struct phy_device *phydev, int genphy_c45_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data); int genphy_c45_write_eee_adv(struct phy_device *phydev, unsigned long *adv); +int genphy_c45_an_config_eee_aneg(struct phy_device *phydev); /* Generic C45 PHY driver */ extern struct phy_driver genphy_c45_driver;