| Message ID | E1tUlku-007Uyc-RP@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 22cedc609759edf414c519ae8242dd5461f4c4cd |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: dsa: cleanup EEE (part 2) | expand |
On 06/01/2025 11:58, Russell King (Oracle) wrote: > dsa_user_get_eee() calls the DSA switch get_mac_eee() method followed > by phylink_ethtool_get_eee(), which goes on to call > phy_ethtool_get_eee(). This overwrites all members of the passed > ethtool_keee, which means anything written by the DSA switch > get_mac_eee() method will be discarded. > > Remove setting any members in mt753x_get_mac_eee(). > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Reviewed-by: Chester A. Unal <chester.a.unal@arinc9.com> Chester A.
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 9605febd3573..4c78d049b9f4 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -3088,12 +3088,6 @@ mt753x_setup(struct dsa_switch *ds) static int mt753x_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e) { - struct mt7530_priv *priv = ds->priv; - u32 eeecr = mt7530_read(priv, MT753X_PMEEECR_P(port)); - - e->tx_lpi_enabled = !(eeecr & LPI_MODE_EN); - e->tx_lpi_timer = LPI_THRESH_GET(eeecr); - return 0; }
dsa_user_get_eee() calls the DSA switch get_mac_eee() method followed by phylink_ethtool_get_eee(), which goes on to call phy_ethtool_get_eee(). This overwrites all members of the passed ethtool_keee, which means anything written by the DSA switch get_mac_eee() method will be discarded. Remove setting any members in mt753x_get_mac_eee(). Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- drivers/net/dsa/mt7530.c | 6 ------ 1 file changed, 6 deletions(-)