net: dsa: b53: Call b53_eee_init() from b53_mac_link_up()

And make sure this is done for the MLO_AN_PHY case, where it actually
makes sense, contrary to b53_adjust_link() which only did it for
fixed-PHY configurations where it does not make sense.

Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/20240423183339.1368511-7-florian.fainelli@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 18b87e903943e8ddc9025fb15a658be99bb06894..a4b50ee97f8770eda67a33c0820393170ab1e77a 100644 (file)
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1481,9 +1481,13 @@ static void b53_phylink_mac_link_up(struct dsa_switch *ds, int port,
                                    bool tx_pause, bool rx_pause)
 {
        struct b53_device *dev = ds->priv;
+       struct ethtool_keee *p = &dev->ports[port].eee;
 
-       if (mode == MLO_AN_PHY)
+       if (mode == MLO_AN_PHY) {
+               /* Re-negotiate EEE if it was enabled already */
+               p->eee_enabled = b53_eee_init(ds, port, phydev);
                return;
+       }
 
        if (mode == MLO_AN_FIXED) {
                /* Force flow control on BCM5301x's CPU port */