netdev - [PATCH net-next] net: bcmgenet: use genphy_c45_eee_is_active directly, instead of phy_init

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <e463bc66-c684-4847-b865-1f59dbadee7e@gmail.com>
Date: Tue, 11 Mar 2025 07:43:10 +0100
From: Heiner Kallweit <hkallweit1@...il.com>
To: Doug Berger <opendmb@...il.com>,
 Florian Fainelli <florian.fainelli@...adcom.com>,
 Andrew Lunn <andrew@...n.ch>, Paolo Abeni <pabeni@...hat.com>,
 Jakub Kicinski <kuba@...nel.org>, Eric Dumazet <edumazet@...gle.com>,
 David Miller <davem@...emloft.net>
Cc: "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
 Broadcom internal kernel review list <bcm-kernel-feedback-list@...adcom.com>
Subject: [PATCH net-next] net: bcmgenet: use genphy_c45_eee_is_active
 directly, instead of phy_init_eee

Use genphy_c45_eee_is_active directly instead of phy_init_eee,
this prepares for removing phy_init_eee. With the second
argument being Null, phy_init_eee doesn't initialize anything.

Signed-off-by: Heiner Kallweit <hkallweit1@...il.com>
---
 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 ++-
 drivers/net/ethernet/broadcom/genet/bcmmii.c   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 3e93f9574..c953559e3 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -1350,7 +1350,8 @@ static int bcmgenet_set_eee(struct net_device *dev, struct ethtool_keee *e)
 	if (!p->eee_enabled) {
 		bcmgenet_eee_enable_set(dev, false, false);
 	} else {
-		active = phy_init_eee(dev->phydev, false) >= 0;
+		active = dev->phydev->drv &&
+			 genphy_c45_eee_is_active(dev->phydev, NULL) > 0;
 		bcmgenet_umac_writel(priv, e->tx_lpi_timer, UMAC_EEE_LPI_TIMER);
 		bcmgenet_eee_enable_set(dev, active, e->tx_lpi_enabled);
 	}
diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
index c4a3698ce..5aa8e16fe 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@ -91,7 +91,7 @@ static void bcmgenet_mac_config(struct net_device *dev)
 	bcmgenet_umac_writel(priv, reg, UMAC_CMD);
 	spin_unlock_bh(&priv->reg_lock);
 
-	active = phy_init_eee(phydev, 0) >= 0;
+	active = phydev->drv && genphy_c45_eee_is_active(phydev, NULL) > 0;
 	bcmgenet_eee_enable_set(dev,
 				priv->eee.eee_enabled && active,
 				priv->eee.tx_lpi_enabled);
-- 
2.48.1