| From foo@baz Sat Jun 13 09:48:35 PDT 2015 |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| Date: Fri, 15 May 2015 16:30:41 -0700 |
| Subject: net: phy: Allow EEE for all RGMII variants |
| |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| |
| [ Upstream commit 7e14069651591c81046ffaec13c3dac8cb70f5fb ] |
| |
| RGMII interfaces come in multiple flavors: RGMII with transmit or |
| receive internal delay, no delays at all, or delays in both direction. |
| |
| This change extends the initial check for PHY_INTERFACE_MODE_RGMII to |
| cover all of these variants since EEE should be allowed for any of these |
| modes, since it is a property of the RGMII, hence Gigabit PHY capability |
| more than the RGMII electrical interface and its delays. |
| |
| Fixes: a59a4d192166 ("phy: add the EEE support and the way to access to the MMD registers") |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/phy/phy.c | 7 ++++--- |
| 1 file changed, 4 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/net/phy/phy.c |
| +++ b/drivers/net/phy/phy.c |
| @@ -1053,13 +1053,14 @@ int phy_init_eee(struct phy_device *phyd |
| { |
| /* According to 802.3az,the EEE is supported only in full duplex-mode. |
| * Also EEE feature is active when core is operating with MII, GMII |
| - * or RGMII. Internal PHYs are also allowed to proceed and should |
| - * return an error if they do not support EEE. |
| + * or RGMII (all kinds). Internal PHYs are also allowed to proceed and |
| + * should return an error if they do not support EEE. |
| */ |
| if ((phydev->duplex == DUPLEX_FULL) && |
| ((phydev->interface == PHY_INTERFACE_MODE_MII) || |
| (phydev->interface == PHY_INTERFACE_MODE_GMII) || |
| - (phydev->interface == PHY_INTERFACE_MODE_RGMII) || |
| + (phydev->interface >= PHY_INTERFACE_MODE_RGMII && |
| + phydev->interface <= PHY_INTERFACE_MODE_RGMII_TXID) || |
| phy_is_internal(phydev))) { |
| int eee_lp, eee_cap, eee_adv; |
| u32 lp, cap, adv; |
