It is safer to init the EEE before the DSA layer call
phy_ethtool_set_eee, as sf2 and qca8k are doing.

Signed-off-by: Vivien Didelot <vivien.dide...@savoirfairelinux.com>
---
 drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 647d5d45c1d6..b531d4a3bab5 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -855,6 +855,12 @@ static int mv88e6xxx_set_eee(struct dsa_switch *ds, int 
port,
        struct mv88e6xxx_chip *chip = ds->priv;
        int err;
 
+       if (e->eee_enabled) {
+               err = phy_init_eee(phydev, 0);
+               if (err)
+                       return err;
+       }
+
        mutex_lock(&chip->reg_lock);
        err = mv88e6xxx_energy_detect_write(chip, port, e);
        mutex_unlock(&chip->reg_lock);
-- 
2.13.3

Reply via email to