net: phy: mv88e61xx: Force CPU port link up

When connecting to from a CPU direct to a 88e6097 typically RGMII is
used. In order for traffic to actually pass we need to force the link up
so the CPU MAC on the other end will see the link.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c
index 17040bd6ccdd5c93c9a8aaa98a198ebc41711069..ea54a15310530c8397db2a089715f91105227ef6 100644 (file)
--- a/drivers/net/phy/mv88e61xx.c
+++ b/drivers/net/phy/mv88e61xx.c
@@ -705,6 +705,31 @@ unforce:
        return res;
 }
 
+static int mv88e61xx_fixed_port_setup(struct phy_device *phydev, u8 port)
+{
+       int val;
+
+       val = mv88e61xx_port_read(phydev, port, PORT_REG_PHYS_CTRL);
+       if (val < 0)
+               return val;
+
+       val &= ~(PORT_REG_PHYS_CTRL_SPD_MASK |
+                PORT_REG_PHYS_CTRL_FC_VALUE);
+       val |= PORT_REG_PHYS_CTRL_PCS_AN_EN |
+              PORT_REG_PHYS_CTRL_PCS_AN_RST |
+              PORT_REG_PHYS_CTRL_FC_FORCE |
+              PORT_REG_PHYS_CTRL_DUPLEX_VALUE |
+              PORT_REG_PHYS_CTRL_DUPLEX_FORCE |
+              PORT_REG_PHYS_CTRL_SPD1000;
+
+       if (port == CONFIG_MV88E61XX_CPU_PORT)
+               val |= PORT_REG_PHYS_CTRL_LINK_VALUE |
+                      PORT_REG_PHYS_CTRL_LINK_FORCE;
+
+       return mv88e61xx_port_write(phydev, port, PORT_REG_PHYS_CTRL,
+                                  val);
+}
+
 static int mv88e61xx_set_cpu_port(struct phy_device *phydev)
 {
        int val;
@@ -748,6 +773,11 @@ static int mv88e61xx_set_cpu_port(struct phy_device *phydev)
                        if (val < 0)
                                return val;
                }
+       } else {
+               val = mv88e61xx_fixed_port_setup(phydev,
+                                                CONFIG_MV88E61XX_CPU_PORT);
+               if (val < 0)
+                       return val;
        }
 
        return 0;
@@ -810,27 +840,6 @@ static int mv88e61xx_phy_setup(struct phy_device *phydev, u8 phy)
        return 0;
 }
 
-static int mv88e61xx_fixed_port_setup(struct phy_device *phydev, u8 port)
-{
-       int val;
-
-       val = mv88e61xx_port_read(phydev, port, PORT_REG_PHYS_CTRL);
-       if (val < 0)
-               return val;
-
-       val &= ~(PORT_REG_PHYS_CTRL_SPD_MASK |
-                PORT_REG_PHYS_CTRL_FC_VALUE);
-       val |= PORT_REG_PHYS_CTRL_PCS_AN_EN |
-              PORT_REG_PHYS_CTRL_PCS_AN_RST |
-              PORT_REG_PHYS_CTRL_FC_FORCE |
-              PORT_REG_PHYS_CTRL_DUPLEX_VALUE |
-              PORT_REG_PHYS_CTRL_DUPLEX_FORCE |
-              PORT_REG_PHYS_CTRL_SPD1000;
-
-       return mv88e61xx_port_write(phydev, port, PORT_REG_PHYS_CTRL,
-                                  val);
-}
-
 static int mv88e61xx_phy_config_port(struct phy_device *phydev, u8 phy)
 {
        int val;