net: dsa: mv88e6xxx: enable SERDES after setup

SERDES is powered on for CPU and DSA ports and powered down for unused
ports at setup time. But now that DSA calls mv88e6xxx_port_enable
and mv88e6xxx_port_disable for all ports, the SERDES power can now
be handled after setup inconditionally for all ports.

Using the port enable and disable callbacks also have the benefit to
handle the SERDES IRQ for non user ports as well.

Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 27e1622bb03bd725c09c38506a1654bda71d9c2f..c72b3db75c54324be135a91b2ef3626f6277333f 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2151,16 +2151,6 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
        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))) {
-               err = mv88e6xxx_serdes_power(chip, port, true);
-               if (err)
-                       return err;
-       }
-
        /* Port Control 2: don't force a good FCS, set the maximum frame size to
         * 10240 bytes, disable 802.1q tags checking, don't discard tagged or
         * untagged frames on this port, do a destination address lookup on all
@@ -2267,9 +2257,6 @@ static int mv88e6xxx_port_enable(struct dsa_switch *ds, int port,
        struct mv88e6xxx_chip *chip = ds->priv;
        int err;
 
-       if (!dsa_is_user_port(ds, port))
-               return 0;
-
        mv88e6xxx_reg_lock(chip);
 
        err = mv88e6xxx_serdes_power(chip, port, true);
@@ -2286,9 +2273,6 @@ static void mv88e6xxx_port_disable(struct dsa_switch *ds, int port)
 {
        struct mv88e6xxx_chip *chip = ds->priv;
 
-       if (!dsa_is_user_port(ds, port))
-               return;
-
        mv88e6xxx_reg_lock(chip);
 
        if (chip->info->ops->serdes_irq_free)
@@ -2461,27 +2445,16 @@ static int mv88e6xxx_setup(struct dsa_switch *ds)
 
        /* Setup Switch Port Registers */
        for (i = 0; i < mv88e6xxx_num_ports(chip); i++) {
+               if (dsa_is_unused_port(ds, i))
+                       continue;
+
                /* Prevent the use of an invalid port. */
-               if (mv88e6xxx_is_invalid_port(chip, i) &&
-                   !dsa_is_unused_port(ds, i)) {
+               if (mv88e6xxx_is_invalid_port(chip, i)) {
                        dev_err(chip->dev, "port %d is invalid\n", i);
                        err = -EINVAL;
                        goto unlock;
                }
 
-               if (dsa_is_unused_port(ds, i)) {
-                       err = mv88e6xxx_port_set_state(chip, i,
-                                                      BR_STATE_DISABLED);
-                       if (err)
-                               goto unlock;
-
-                       err = mv88e6xxx_serdes_power(chip, i, false);
-                       if (err)
-                               goto unlock;
-
-                       continue;
-               }
-
                err = mv88e6xxx_setup_port(chip, i);
                if (err)
                        goto unlock;