Commit b28f3f3c authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Jakub Kicinski
Browse files

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: default avatarTobias Waldekranz <tobias@waldekranz.com>
Signed-off-by: default avatarRasmus Villemoes <rasmus.villemoes@prevas.dk>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 67c9ed1c

drivers/net/dsa/mv88e6xxx/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/net/dsa/mv88e6xxx/global1.h

+0 −2
Original line number Diff line number Diff line
@@ -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,

drivers/net/dsa/mv88e6xxx/global1_vtu.c

+4 −29
Original line number Diff line number Diff line
@@ -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;