> +static int _mv88e6xxx_vtu_getnext(struct dsa_switch *ds, u16 vid, > + struct mv88e6xxx_vtu_entry *entry) > +{ > + int ret, i; > + > + ret = _mv88e6xxx_vtu_wait(ds); > + if (ret < 0) > + return ret; > + > + ret = _mv88e6xxx_reg_write(ds, REG_GLOBAL, GLOBAL_VTU_VID, > + vid & GLOBAL_VTU_VID_MASK); > + if (ret < 0) > + return ret; > + > + ret = _mv88e6xxx_vtu_cmd(ds, GLOBAL_VTU_OP_VTU_GET_NEXT); > + if (ret < 0) > + return ret; > + > + ret = _mv88e6xxx_reg_read(ds, REG_GLOBAL, GLOBAL_VTU_VID); > + if (ret < 0) > + return ret; > + > + entry->vid = ret & GLOBAL_VTU_VID_MASK; > + entry->valid = !!(ret & GLOBAL_VTU_VID_VALID); > + > + if (entry->valid) { > + /* Ports 0-3, offsets 0, 4, 8, 12 */ > + ret = _mv88e6xxx_reg_read(ds, REG_GLOBAL, GLOBAL_VTU_DATA_0_3); > + if (ret < 0) > + return ret; > + > + for (i = 0; i < 4; ++i) > + entry->tags[i] = (ret >> (i * 4)) & 3; > + > + /* Ports 4-6, offsets 0, 4, 8 */ > + ret = _mv88e6xxx_reg_read(ds, REG_GLOBAL, GLOBAL_VTU_DATA_4_7); > + if (ret < 0) > + return ret; > + > + for (i = 4; i < 7; ++i) > + entry->tags[i] = (ret >> ((i - 4) * 4)) & 3;
Hi Vivien It looks like you still have up to 7 ports, rather than use ps->num_ports. I have a ten port switch i would like to use VLANs with :-) > + > + if (mv88e6xxx_6097_family(ds) || mv88e6xxx_6165_family(ds) || > + mv88e6xxx_6351_family(ds) || mv88e6xxx_6352_family(ds)) { > + ret = _mv88e6xxx_reg_read(ds, REG_GLOBAL, > + GLOBAL_VTU_FID); > + if (ret < 0) > + return ret; > + > + entry->fid = ret & GLOBAL_VTU_FID_MASK; > + > + ret = _mv88e6xxx_reg_read(ds, REG_GLOBAL, > + GLOBAL_VTU_SID); > + if (ret < 0) > + return ret; > + > + entry->sid = ret & GLOBAL_VTU_SID_MASK; > + } else { > + entry->fid = 0; > + entry->sid = 0; > + } > + } > + > + return 0; > +} > + > +static int _mv88e6xxx_vtu_loadpurge(struct dsa_switch *ds, > + struct mv88e6xxx_vtu_entry *entry) > +{ > + u16 data = 0; > + int ret, i; > + > + ret = _mv88e6xxx_vtu_wait(ds); > + if (ret < 0) > + return ret; > + > + if (entry->valid) { > + /* Set Data Register, ports 0-3, offsets 0, 4, 8, 12 */ > + for (data = i = 0; i < 4; ++i) > + data |= entry->tags[i] << (i * 4); > + ret = _mv88e6xxx_reg_write(ds, REG_GLOBAL, GLOBAL_VTU_DATA_0_3, > + data); > + if (ret < 0) > + return ret; > + > + /* Set Data Register, ports 4-6, offsets 0, 4, 8 */ > + for (data = 0, i = 4; i < 7; ++i) > + data |= entry->tags[i] << ((i - 4) * 4); > + ret = _mv88e6xxx_reg_write(ds, REG_GLOBAL, GLOBAL_VTU_DATA_4_7, > + data); Same again here. Andrew -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/