From patchwork Thu Feb 29 14:07:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 208370 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp419507dyb; Thu, 29 Feb 2024 06:09:29 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW22b7/1RJMcnQ+KyIUCTClO+BsMgZiaq4S6jGH0AGJjTVehdu8Vnla4A35NLAlDXYvXBdBCpZGxzODENbamxg6vvW77w== X-Google-Smtp-Source: AGHT+IHd5V9Hrd4Lv65phcKF9nu+KicvHasV/XUsVtG30nmkfH5iCegSwHJIdmPzaoS4cbfZFli5 X-Received: by 2002:a92:d8c6:0:b0:365:2ffc:b747 with SMTP id l6-20020a92d8c6000000b003652ffcb747mr2697511ilo.17.1709215768880; Thu, 29 Feb 2024 06:09:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709215768; cv=pass; d=google.com; s=arc-20160816; b=kaQZpMYHsHY1vCzNEsd8uylK6rbMidfpmImo9IIZsv5qDFcQDe+JvdBDlvrihxQWVK MpCiDRzLueZxZMqfVWYy98wnxp62tJ61pYLTvqgr7HOl3VPjshVJH+OJxIu+LFIXPMJG 9S3MNrjivelqpX3v+G+tt3GpVCUJb73l77z2jorPFqUHaNSm5FBy/qjGOJ2qaGc1MOqP 1GcRtty/PCYwgGRZiTPWtE321G1VuLaqPyolsbRTPNkCYyCVB+kelCvlZLf+iOjob0UP sZkEgSTzDHqWUjkj3pVt/9zbXodO8qoDfuvPI090xTx51GNsT91kZQby+BSiGiZExNuq 048A== 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=CuD6Ps7t8KIfv8qpx+eOqKTVEKWpjiQFwAgI8DpQfojcsesJvMrDeUCOzXfbWpNbBU wVhPZ1L2ZKrCww+2GcfABkf65rxXC1CIZwpiYtEHe84BO2UTifnC34x4GuaY6KQpVO/3 aHx06E6sIdiJzfjtwAefUQNf6w0SpLkipKzT5XghNUraSGlDyeovstAQ24PIgMNjq2gc MkDdqvKsRWYkys1EJn+ACJylrzN2Rmn6hCtHQTPEMVOPsuHNe6qZLA37Nv0DjGr4xp/M fNRpW46PAlNnKempiDMiJdBB8Yyi4aV7lH9RgvrdTfQPg4TKM6RVRCwfxdoDQ7RiphjU JAuw==; 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-86797-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86797-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id v17-20020a92c6d1000000b00364ff2d898asi476066ilm.175.2024.02.29.06.09.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 06:09:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-86797-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-86797-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86797-ouuuleilei=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 sv.mirrors.kernel.org (Postfix) with ESMTPS id A19D8286124 for ; Thu, 29 Feb 2024 14:09:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 28D6E137C21; Thu, 29 Feb 2024 14:08:25 +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 C931912BF22 for ; Thu, 29 Feb 2024 14:08:20 +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=1709215703; cv=none; b=EHCl0uFTxMNHv21CT7U9Nb8Aw1KcqORx9UhIYxFNTqpzUwzkDvHf/ZC3QRttTIyL2Z4oUTbvFXK5ri8fR6i5eKQ2hr1NBhuGAGkgEeAPKwlLCBWX1fHQAfvUzo1fvKUgYrVbgo39T9dz1YYLhWqbhFvuc2OSwbLAW+LrkshJ32o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709215703; c=relaxed/simple; bh=JO8ieonndskihpfJzOJE8oPTytpJgtmq3zUd6sxNeYM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hiYwYx9oKWmoxzrPyl+u1pkSZQ5vWi35rr5SVCtcIzXdu/YcLC2emfmHfyCftd7+YHNwkF695/+kcn2HUaUx0KW5Oukm3207m5QA6MxvR1AmangUGV852Q27O/8etCPuIrmUuL2+PPnW4r6SU9n8JQpfOKfM+za/u36IbPSh2Dw= 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 1rfh4t-0000St-MW; Thu, 29 Feb 2024 15:08:03 +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 1rfh4r-003bZq-MN; Thu, 29 Feb 2024 15:08:01 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rfh4r-00ELm2-1Z; Thu, 29 Feb 2024 15:08:01 +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 v7 2/8] net: phy: Add phydev->enable_tx_lpi to simplify adjust link callbacks Date: Thu, 29 Feb 2024 15:07:54 +0100 Message-Id: <20240229140800.3420180-3-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240229140800.3420180-1-o.rempel@pengutronix.de> References: <20240229140800.3420180-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 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792242634120325535 X-GMAIL-MSGID: 1792242634120325535 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;