net: dsa: mv88e6xxx: Provide function for common port initialization

Provide mv88e6xxx_setup_port_common() for common port initialization.
Currently only write Port 1 Control and VLAN configuration since
this will be needed for hardware bridging. More can be added later
if desired/needed.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 39 insertions, 0 deletions

diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index 6496beb74510..2052e51edd5d 100644
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -700,6 +700,45 @@ int mv88e6xxx_set_eee(struct dsa_switch *ds, int port,
         return 0;
 }
 
+int mv88e6xxx_setup_port_common(struct dsa_switch *ds, int port)
+{
+        struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
+        int ret, reg;
+
+        mutex_lock(&ps->smi_mutex);
+
+        /* Port Control 1: disable trunking.  Also, if this is the
+         * CPU port, enable learn messages to be sent to this port.
+         */
+        ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), 0x05,
+                                   dsa_is_cpu_port(ds, port) ? 0x8000 : 0x0000);
+        if (ret)
+                goto abort;
+
+        /* Port based VLAN map: give each port its own address
+         * database, allow the CPU port to talk to each of the 'real'
+         * ports, and allow each of the 'real' ports to only talk to
+         * the upstream port.
+         */
+        reg = (port & 0xf) << 12;
+        if (dsa_is_cpu_port(ds, port))
+                reg |= ds->phys_port_mask;
+        else
+                reg |= 1 << dsa_upstream_port(ds);
+
+        ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), 0x06, reg);
+        if (ret)
+                goto abort;
+
+        /* Default VLAN ID and priority: don't set a default VLAN
+         * ID, and set the default packet priority to zero.
+         */
+        ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), 0x07, 0x0000);
+abort:
+        mutex_unlock(&ps->smi_mutex);
+        return ret;
+}
+
 int mv88e6xxx_setup_common(struct dsa_switch *ds)
 {
         struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);