[PATCH net-next 3/3] dsa: mv88e6xxx: Enable/Disable SERDES on port enable/disable

[Andrew Lunn]

Implement the port enable/disable callbacks, which enable/disable the
SERDES interfaces, if applicable. This should save a bit of
power/heat.

Signed-off-by: Andrew Lunn <and...@lunn.ch>
---
 drivers/net/dsa/mv88e6xxx/chip.c | 44 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 067f64dcf1b6..c002869acaab 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1996,9 +1996,6 @@ static int mv88e6xxx_setup_port_mode(struct 
mv88e6xxx_chip *chip, int port)
        if (chip->info->tag_protocol == DSA_TAG_PROTO_EDSA)
                return mv88e6xxx_set_port_mode_edsa(chip, port);
 
-       if (chip->info->ops->serdes_power)
-               return chip->info->ops->serdes_power(chip, port, true);
-
        return 0;
 }
 
@@ -2168,7 +2165,44 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip 
*chip, int port)
        /* Default VLAN ID and priority: don't set a default VLAN
         * ID, and set the default packet priority to zero.
         */
-       return mv88e6xxx_port_write(chip, port, PORT_DEFAULT_VLAN, 0x0000);
+       err = mv88e6xxx_port_write(chip, port, PORT_DEFAULT_VLAN, 0x0000);
+       if (err)
+               return err;
+
+       /* Enable the SERDES interface for DSA and CPU ports. Normal
+        * ports SERDES are enabled when the port is enabled, thus
+        * saving a bit of power.
+        */
+       if ((dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port)) &&
+           chip->info->ops->serdes_power)
+               err = chip->info->ops->serdes_power(chip, port, true);
+
+       return err;
+}
+
+static int mv88e6xxx_port_enable(struct dsa_switch *ds, int port,
+                                struct phy_device *phydev)
+{
+       struct mv88e6xxx_chip *chip = ds->priv;
+       int err = 0;
+
+       mutex_lock(&chip->reg_lock);
+       if (chip->info->ops->serdes_power)
+               err = chip->info->ops->serdes_power(chip, port, true);
+       mutex_unlock(&chip->reg_lock);
+
+       return err;
+}
+
+static void mv88e6xxx_port_disable(struct dsa_switch *ds, int port,
+                                  struct phy_device *phydev)
+{
+       struct mv88e6xxx_chip *chip = ds->priv;
+
+       mutex_lock(&chip->reg_lock);
+       if (chip->info->ops->serdes_power)
+               chip->info->ops->serdes_power(chip, port, false);
+       mutex_unlock(&chip->reg_lock);
 }
 
 static int mv88e6xxx_g1_set_switch_mac(struct mv88e6xxx_chip *chip, u8 *addr)
@@ -4023,6 +4057,8 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = 
{
        .get_strings            = mv88e6xxx_get_strings,
        .get_ethtool_stats      = mv88e6xxx_get_ethtool_stats,
        .get_sset_count         = mv88e6xxx_get_sset_count,
+       .port_enable            = mv88e6xxx_port_enable,
+       .port_disable           = mv88e6xxx_port_disable,
        .set_eee                = mv88e6xxx_set_eee,
        .get_eee                = mv88e6xxx_get_eee,
        .get_eeprom_len         = mv88e6xxx_get_eeprom_len,
-- 
2.11.0