mirror of
https://github.com/torvalds/linux.git
synced 2026-05-25 15:41:52 +02:00
net: dsa: allow use of phylink managed EEE support
In order to allow DSA drivers to use phylink managed EEE, we need to change the behaviour of the DSA's .set_eee() ethtool method. Implementation of the DSA .set_mac_eee() method becomes optional with phylink managed EEE as it is only used to validate the EEE parameters supplied from userspace. The rest of the EEE state management should be left to phylink. Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Link: https://patch.msgid.link/E1thR9l-003vXC-9F@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
2001d21592
commit
b8927bd44f
|
|
@ -1243,16 +1243,25 @@ static int dsa_user_set_eee(struct net_device *dev, struct ethtool_keee *e)
|
|||
if (!ds->ops->support_eee || !ds->ops->support_eee(ds, dp->index))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
/* Port's PHY and MAC both need to be EEE capable */
|
||||
if (!dev->phydev)
|
||||
return -ENODEV;
|
||||
/* If the port is using phylink managed EEE, then an unimplemented
|
||||
* set_mac_eee() is permissible.
|
||||
*/
|
||||
if (!phylink_mac_implements_lpi(ds->phylink_mac_ops)) {
|
||||
/* Port's PHY and MAC both need to be EEE capable */
|
||||
if (!dev->phydev)
|
||||
return -ENODEV;
|
||||
|
||||
if (!ds->ops->set_mac_eee)
|
||||
return -EOPNOTSUPP;
|
||||
if (!ds->ops->set_mac_eee)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
ret = ds->ops->set_mac_eee(ds, dp->index, e);
|
||||
if (ret)
|
||||
return ret;
|
||||
ret = ds->ops->set_mac_eee(ds, dp->index, e);
|
||||
if (ret)
|
||||
return ret;
|
||||
} else if (ds->ops->set_mac_eee) {
|
||||
ret = ds->ops->set_mac_eee(ds, dp->index, e);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return phylink_ethtool_set_eee(dp->pl, e);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user