From c056d480b40a68f2520ccc156c7fae672d69d57d Mon Sep 17 00:00:00 2001

From: Florian Fainelli <f.fainelli@gmail.com>

Date: Tue, 30 Mar 2021 15:00:24 -0700

Subject: [PATCH] net: phy: broadcom: Only advertise EEE for supported modes

Git-commit: c056d480b40a68f2520ccc156c7fae672d69d57d

Patch-mainline: v5.12-rc7

References: git-fixes

We should not be advertising EEE for modes that we do not support,

correct that oversight by looking at the PHY device supported linkmodes.

Fixes: 99cec8a4dda2 ("net: phy: broadcom: Allow enabling or disabling of EEE")

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/net/phy/bcm-phy-lib.c | 13 ++++++++++---

 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/net/phy/bcm-phy-lib.c b/drivers/net/phy/bcm-phy-lib.c

index 53282a6d5928..287cccf8f7f4 100644

--- a/drivers/net/phy/bcm-phy-lib.c

+++ b/drivers/net/phy/bcm-phy-lib.c

@@ -369,7 +369,7 @@ EXPORT_SYMBOL_GPL(bcm_phy_enable_apd);

 int bcm_phy_set_eee(struct phy_device *phydev, bool enable)

 {

-	int val;

+	int val, mask = 0;

 	/* Enable EEE at PHY level */

 	val = phy_read_mmd(phydev, MDIO_MMD_AN, BRCM_CL45VEN_EEE_CONTROL);

@@ -388,10 +388,17 @@ int bcm_phy_set_eee(struct phy_device *phydev, bool enable)

 	if (val < 0)

 		return val;

+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,

+			      phydev->supported))

+		mask |= MDIO_EEE_1000T;

+	if (linkmode_test_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT,

+			      phydev->supported))

+		mask |= MDIO_EEE_100TX;

+

 	if (enable)

-		val |= (MDIO_EEE_100TX | MDIO_EEE_1000T);

+		val |= mask;

 	else

-		val &= ~(MDIO_EEE_100TX | MDIO_EEE_1000T);

+		val &= ~mask;

 	phy_write_mmd(phydev, MDIO_MMD_AN, BCM_CL45VEN_EEE_ADV, (u32)val);

-- 

2.26.2