net: dsa: mv88e6xxx: use mv88e6185_g1_vtu_loadpurge() for the 6250

Apart from the mask used to get the high bits of the fid,
mv88e6185_g1_vtu_loadpurge() and mv88e6250_g1_vtu_loadpurge() are
identical. Since the entry->fid passed in should never exceed the
number of databases, we can simply use the former as-is as replacement
for the latter.

Suggested-by: Tobias Waldekranz <tobias@waldekranz.com>
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index a579518..5143649 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -4050,7 +4050,7 @@ static const struct mv88e6xxx_ops mv88e6250_ops = {
        .pot_clear = mv88e6xxx_g2_pot_clear,
        .reset = mv88e6250_g1_reset,
        .vtu_getnext = mv88e6185_g1_vtu_getnext,
-       .vtu_loadpurge = mv88e6250_g1_vtu_loadpurge,
+       .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
        .avb_ops = &mv88e6352_avb_ops,
        .ptp_ops = &mv88e6250_ptp_ops,
        .phylink_validate = mv88e6065_phylink_validate,

diff --git a/drivers/net/dsa/mv88e6xxx/global1.h b/drivers/net/dsa/mv88e6xxx/global1.h
index d2dd2f4..7c39696 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/global1.h
+++ b/drivers/net/dsa/mv88e6xxx/global1.h
@@ -336,8 +336,6 @@ int mv88e6185_g1_vtu_getnext(struct mv88e6xxx_chip *chip,
                             struct mv88e6xxx_vtu_entry *entry);
 int mv88e6185_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,
                               struct mv88e6xxx_vtu_entry *entry);
-int mv88e6250_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,
-                              struct mv88e6xxx_vtu_entry *entry);
 int mv88e6352_g1_vtu_getnext(struct mv88e6xxx_chip *chip,
                             struct mv88e6xxx_vtu_entry *entry);
 int mv88e6352_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,

diff --git a/drivers/net/dsa/mv88e6xxx/global1_vtu.c b/drivers/net/dsa/mv88e6xxx/global1_vtu.c
index 519ae48..ae12c98 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/global1_vtu.c
+++ b/drivers/net/dsa/mv88e6xxx/global1_vtu.c
@@ -434,35 +434,6 @@ int mv88e6390_g1_vtu_getnext(struct mv88e6xxx_chip *chip,
        return 0;
 }
 
-int mv88e6250_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,
-                              struct mv88e6xxx_vtu_entry *entry)
-{
-       u16 op = MV88E6XXX_G1_VTU_OP_VTU_LOAD_PURGE;
-       int err;
-
-       err = mv88e6xxx_g1_vtu_op_wait(chip);
-       if (err)
-               return err;
-
-       err = mv88e6xxx_g1_vtu_vid_write(chip, entry);
-       if (err)
-               return err;
-
-       if (entry->valid) {
-               err = mv88e6185_g1_vtu_data_write(chip, entry);
-               if (err)
-                       return err;
-
-               /* VTU DBNum[3:0] are located in VTU Operation 3:0
-                * VTU DBNum[5:4] are located in VTU Operation 9:8
-                */
-               op |= entry->fid & 0x000f;
-               op |= (entry->fid & 0x0030) << 4;
-       }
-
-       return mv88e6xxx_g1_vtu_op(chip, op);
-}
-
 int mv88e6185_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,
                               struct mv88e6xxx_vtu_entry *entry)
 {
@@ -484,6 +455,10 @@ int mv88e6185_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,
 
                /* VTU DBNum[3:0] are located in VTU Operation 3:0
                 * VTU DBNum[7:4] are located in VTU Operation 11:8
+                *
+                * For the 6250/6220, the latter are really [5:4] and
+                * 9:8, but in those cases bits 7:6 of entry->fid are
+                * 0 since they have num_databases = 64.
                 */
                op |= entry->fid & 0x000f;
                op |= (entry->fid & 0x00f0) << 4;