net: mv88e6xxx: use resolved link config in mac_link_up()

Use the resolved link configuration to set the MAC configuration when
mac_link_up() for non-internal-PHY ports.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
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 ebaaf21..483db9d 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -632,25 +632,30 @@ static void mv88e6xxx_mac_config(struct dsa_switch *ds, int port,
                dev_err(ds->dev, "p%d: failed to configure MAC\n", port);
 }
 
-static void mv88e6xxx_mac_link_force(struct dsa_switch *ds, int port, int link)
+static void mv88e6xxx_mac_link_down(struct dsa_switch *ds, int port,
+                                   unsigned int mode,
+                                   phy_interface_t interface)
 {
        struct mv88e6xxx_chip *chip = ds->priv;
-       int err;
+       const struct mv88e6xxx_ops *ops;
+       int err = 0;
 
-       mv88e6xxx_reg_lock(chip);
-       err = chip->info->ops->port_set_link(chip, port, link);
-       mv88e6xxx_reg_unlock(chip);
+       ops = chip->info->ops;
 
-       if (err)
-               dev_err(chip->dev, "p%d: failed to force MAC link\n", port);
-}
+       /* Internal PHYs propagate their configuration directly to the MAC.
+        * External PHYs depend on whether the PPU is enabled for this port.
+        * FIXME: we should be using the PPU enable state here. What about
+        * an automedia port?
+        */
+       if (!mv88e6xxx_phy_is_internal(ds, port) && ops->port_set_link) {
+               mv88e6xxx_reg_lock(chip);
+               err = ops->port_set_link(chip, port, LINK_FORCED_DOWN);
+               mv88e6xxx_reg_unlock(chip);
 
-static void mv88e6xxx_mac_link_down(struct dsa_switch *ds, int port,
-                                   unsigned int mode,
-                                   phy_interface_t interface)
-{
-       if (mode == MLO_AN_FIXED)
-               mv88e6xxx_mac_link_force(ds, port, LINK_FORCED_DOWN);
+               if (err)
+                       dev_err(chip->dev,
+                               "p%d: failed to force MAC link down\n", port);
+       }
 }
 
 static void mv88e6xxx_mac_link_up(struct dsa_switch *ds, int port,
@@ -659,8 +664,46 @@ static void mv88e6xxx_mac_link_up(struct dsa_switch *ds, int port,
                                  int speed, int duplex,
                                  bool tx_pause, bool rx_pause)
 {
-       if (mode == MLO_AN_FIXED)
-               mv88e6xxx_mac_link_force(ds, port, LINK_FORCED_UP);
+       struct mv88e6xxx_chip *chip = ds->priv;
+       const struct mv88e6xxx_ops *ops;
+       int err = 0;
+
+       ops = chip->info->ops;
+
+       /* Internal PHYs propagate their configuration directly to the MAC.
+        * External PHYs depend on whether the PPU is enabled for this port.
+        * FIXME: we should be using the PPU enable state here. What about
+        * an automedia port?
+        */
+       if (!mv88e6xxx_phy_is_internal(ds, port)) {
+               mv88e6xxx_reg_lock(chip);
+               /* FIXME: for an automedia port, should we force the link
+                * down here - what if the link comes up due to "other" media
+                * while we're bringing the port up, how is the exclusivity
+                * handled in the Marvell hardware? E.g. port 4 on 88E6532
+                * shared between internal PHY and Serdes.
+                */
+               if (ops->port_set_speed) {
+                       err = ops->port_set_speed(chip, port, speed);
+                       if (err && err != -EOPNOTSUPP)
+                               goto error;
+               }
+
+               if (ops->port_set_duplex) {
+                       err = ops->port_set_duplex(chip, port, duplex);
+                       if (err && err != -EOPNOTSUPP)
+                               goto error;
+               }
+
+               if (ops->port_set_link)
+                       err = ops->port_set_link(chip, port, LINK_FORCED_UP);
+error:
+               mv88e6xxx_reg_unlock(chip);
+
+               if (err && err != -EOPNOTSUPP)
+                       dev_err(ds->dev,
+                               "p%d: failed to configure MAC link up\n", port);
+       }
 }
 
 static int mv88e6xxx_stats_snapshot(struct mv88e6xxx_chip *chip, int port)