| Message ID | 1426952815-4642-3-git-send-email-linux@roeck-us.net |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On 03/21/2015 08:46 AM, Guenter Roeck wrote: > 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. > > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/net/dsa/mv88e6xxx.c | 39 +++++++++++++++++++++++++++++++++++++++ > drivers/net/dsa/mv88e6xxx.h | 1 + > 2 files changed, 40 insertions(+) > > diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c > index 6496beb..3c2cb45 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 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); This fails to compile. It is fixed in a later commit which is why I didn't see it. Too much reordering, I guess. Sorry for that. Just a heads up; I'll wait for comments before resubmitting. Guenter -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c index 6496beb..3c2cb45 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 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); diff --git a/drivers/net/dsa/mv88e6xxx.h b/drivers/net/dsa/mv88e6xxx.h index a02d95a..a4df496 100644 --- a/drivers/net/dsa/mv88e6xxx.h +++ b/drivers/net/dsa/mv88e6xxx.h @@ -57,6 +57,7 @@ struct mv88e6xxx_hw_stat { int reg; }; +int mv88e6xxx_setup_port_common(struct dsa_switch *ds, int port); int mv88e6xxx_setup_common(struct dsa_switch *ds); int __mv88e6xxx_reg_read(struct mii_bus *bus, int sw_addr, int addr, int reg); int mv88e6xxx_reg_read(struct dsa_switch *ds, int addr, int reg);
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. Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- drivers/net/dsa/mv88e6xxx.c | 39 +++++++++++++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx.h | 1 + 2 files changed, 40 insertions(+)