Commit c056d480 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: phy: broadcom: Only advertise EEE for supported modes 



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: 99cec8a4 ("net: phy: broadcom: Allow enabling or disabling of EEE")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2ea538db

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

+10 −3
Original line number Diff line number Diff line
@@ -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);