Received: by 2002:ab2:3141:0:b0:1ed:23cc:44d1 with SMTP id i1csp1029135lqg; Sat, 2 Mar 2024 11:54:04 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWMRtm3UI/KFZbcsPzhWqcqq8ON9O3Xuk/SAuni+16VNizNtArRH1eLMa7LejDWzfS3enXCLX8Bt8g9j5+PwwK8JiR6dMag938byEW7DA== X-Google-Smtp-Source: AGHT+IHZ6GO4hpblY90Nrc6YTYQvqhBucPmGo7+peKne932M7RtEgSe8R/LhED7IrN6g+ocye26T X-Received: by 2002:a05:6a20:3c8e:b0:1a1:20c0:907a with SMTP id b14-20020a056a203c8e00b001a120c0907amr7197661pzj.29.1709409243708; Sat, 02 Mar 2024 11:54:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709409243; cv=pass; d=google.com; s=arc-20160816; b=yKOMZVJbbeFi0tHITFKUZQuKtEpaG9Kx/UKOCTitriyxdYTFD75vg8q4+SRmVDTdBp j+0Mq/BjqVbRdyhHghxT0cSU9ZoDmGAC/KYEkJ0mV26i2EKaYT6sMEfCe7eEDy9uy+cQ APyRcaCR3PXJT5HTUF9b25YCa1pqO8TydS6xRu7SlyYhejb1rByi5Z/efHvC7DhE9Z/A XCjeHuu4ypj0K3mB9HiyBCekdNvs2aeLjNrrDEDDnF9sMD+I4g3UBLPerzBcvx2sxM/g bmoIDKNwlx/IevrzhV6HNp+PuAOPO4ZpF2ia9QnRt/23D7cVQM9gftLBGU5tLDup1KUn xc0Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=P6tjsturxLCrxwr7ztKLNqrH12MLD4+K4T6sW2fBlvc=; fh=/mFbHcqW6l4fLIJBfKVNbHEV0oGb2iio8Q6EPf9P78A=; b=k/apWFtdhcwxL4q2YDWKgQ9ygQ1/h+mDbCUCng0oV1sobAWx4BPQmvQLHZJuyWdsPH DE0uFAHjKA8HDmXrAu1M2tr3nEbJqrAYY9ZzWOvq67rfF28Rd7mK7/9uaGQetLGJMsCv EbPnvYzGweuIZCJHXQ9XruyUX9Lu6DHN/8LNj6Sk+PcuVb6eH0yAZvPtXw4f7pffwm1P ujmOEx/lxknf7goBKHdYsfbS6E+hGHLY6ibGxb6l5fcKNuDdnh/kuim0IWdPTeRTHhcW CqJxkLT/JVVDlovrEw4twbengZ5KLuKgHjuXRV6uuuZPYEblGJLnVtM2gTr6ZgYCxFaa BIrw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-89571-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-89571-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id i17-20020a63cd11000000b005dc958db2fcsi5623699pgg.363.2024.03.02.11.54.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Mar 2024 11:54:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-89571-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-89571-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-89571-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 53D2FB20DD1 for ; Sat, 2 Mar 2024 19:53:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4339D42069; Sat, 2 Mar 2024 19:53:22 +0000 (UTC) Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2DC63FE54 for ; Sat, 2 Mar 2024 19:53:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709409201; cv=none; b=JWyGvqvUTRf8zzhsLEjqJmg9VATQtYivKVVNw2iV+wXtOg2FfKcqgs2QwYFdBEdgyqf4hIput6SgkZA4jxM5fi4ThCu6I/0F7uqkP1eD5zm+TgHeTYb4dVhtH7NjgPYq6lK0ieCbXwEdiNIVLbOmx4o0KJxW0N0DHIqRKBc5iTI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709409201; c=relaxed/simple; bh=JO8ieonndskihpfJzOJE8oPTytpJgtmq3zUd6sxNeYM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CuJDj0q7oq+hP135mfDe4gwiefiFcB5IQnrLqmcr39ABNMuGoTvSByvrpCX9m7Wybpgoa5Rj0QboQ+cosz8anSLgd7Te1xX164P918hsXb/rm6njBGLmHOQ0cYHaAjvKcTcOJn1cZ7ncoz6Ds8625/gHhTXhP4TwX0j0vuZM0mg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rgVPx-0007Gu-MZ; Sat, 02 Mar 2024 20:53:09 +0100 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rgVPv-0041mD-OJ; Sat, 02 Mar 2024 20:53:07 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rgVPv-00DSUD-2D; Sat, 02 Mar 2024 20:53:07 +0100 From: Oleksij Rempel To: Wei Fang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Andrew Lunn , Heiner Kallweit , Russell King Cc: Florian Fainelli , Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Shenwei Wang , Clark Wang , NXP Linux Team Subject: [PATCH net-next v9 2/7] net: phy: Add phydev->enable_tx_lpi to simplify adjust link callbacks Date: Sat, 2 Mar 2024 20:53:01 +0100 Message-Id: <20240302195306.3207716-3-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240302195306.3207716-1-o.rempel@pengutronix.de> References: <20240302195306.3207716-1-o.rempel@pengutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org From: Andrew Lunn MAC drivers which support EEE need to know the results of the EEE auto-neg in order to program the hardware to perform EEE or not. The oddly named phy_init_eee() can be used to determine this, it returns 0 if EEE should be used, or a negative error code, e.g. -EOPPROTONOTSUPPORT if the PHY does not support EEE or negotiate resulted in it not being used. However, many MAC drivers get this wrong. Add phydev->enable_tx_lpi which indicates the result of the autoneg for EEE, including if EEE is administratively disabled with ethtool. The MAC driver can then access this in the same way as link speed and duplex in the adjust link callback. If enable_tx_lpi is true, the MAC should send low power indications and does not need to consider anything else with respect to EEE. Reviewed-by: Florian Fainelli Signed-off-by: Andrew Lunn Signed-off-by: Oleksij Rempel --- v2: Check for errors from genphy_c45_eee_is_active v5: Rename to enable_tx_lpi to fit better with phylink changes v6: enable_tx_lpi = !!err --- drivers/net/phy/phy.c | 7 +++++++ include/linux/phy.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 14224e06d69fa..2bc0a7d51c63f 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -983,9 +983,16 @@ static int phy_check_link_status(struct phy_device *phydev) if (phydev->link && phydev->state != PHY_RUNNING) { phy_check_downshift(phydev); phydev->state = PHY_RUNNING; + err = genphy_c45_eee_is_active(phydev, + NULL, NULL, NULL); + if (err < 0) + phydev->enable_tx_lpi = false; + else + phydev->enable_tx_lpi = !!err; phy_link_up(phydev); } else if (!phydev->link && phydev->state != PHY_NOLINK) { phydev->state = PHY_NOLINK; + phydev->enable_tx_lpi = false; phy_link_down(phydev); } diff --git a/include/linux/phy.h b/include/linux/phy.h index e3ab2c347a598..a880f6d7170ea 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -594,6 +594,7 @@ struct macsec_ops; * @supported_eee: supported PHY EEE linkmodes * @advertising_eee: Currently advertised EEE linkmodes * @eee_enabled: Flag indicating whether the EEE feature is enabled + * @enable_tx_lpi: When True, MAC should transmit LPI to PHY * @lp_advertising: Current link partner advertised linkmodes * @host_interfaces: PHY interface modes supported by host * @eee_broken_modes: Energy efficient ethernet modes which should be prohibited @@ -713,6 +714,7 @@ struct phy_device { /* Energy efficient ethernet modes which should be prohibited */ u32 eee_broken_modes; + bool enable_tx_lpi; #ifdef CONFIG_LED_TRIGGER_PHY struct phy_led_trigger *phy_led_triggers; -- 2.39.2