Commit 3e4715ec authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-dsa-mv88e6xxx-remove-some-6250-specific-methods' 

Rasmus Villemoes says:

====================
net: dsa: mv88e6xxx: remove some 6250-specific methods

v2:
 - resend now that the bug-fix patch (87fe0436, "net: dsa:
   mv88e6xxx: also read STU state in mv88e6250_g1_vtu_getnext") is in
   net and also merged to net-next.
 - include various tags in patch 1.
 - add second similar patch for loadpurge.
====================

Link: https://lore.kernel.org/r/20210125150449.115032-1-rasmus.villemoes@prevas.dk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9b0b7837 b28f3f3c

drivers/net/dsa/mv88e6xxx/chip.c

+2 −2
Original line number Diff line number Diff line
@@ -4049,8 +4049,8 @@ static const struct mv88e6xxx_ops mv88e6250_ops = { 
	.mgmt_rsvd2cpu = mv88e6352_g2_mgmt_rsvd2cpu,

	.pot_clear = mv88e6xxx_g2_pot_clear,

	.reset = mv88e6250_g1_reset,

	.vtu_getnext = mv88e6250_g1_vtu_getnext,

	.vtu_loadpurge = mv88e6250_g1_vtu_loadpurge,

	.vtu_getnext = mv88e6185_g1_vtu_getnext,

	.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 −4
Original line number Diff line number Diff line
@@ -336,10 +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_getnext(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

+6 −63
Original line number Diff line number Diff line
@@ -336,39 +336,6 @@ int mv88e6xxx_g1_vtu_getnext(struct mv88e6xxx_chip *chip, 
	return mv88e6xxx_g1_vtu_vid_read(chip, entry);

}



int mv88e6250_g1_vtu_getnext(struct mv88e6xxx_chip *chip,

			     struct mv88e6xxx_vtu_entry *entry)

{

	u16 val;

	int err;



	err = mv88e6xxx_g1_vtu_getnext(chip, entry);

	if (err)

		return err;



	if (entry->valid) {

		err = mv88e6185_g1_vtu_data_read(chip, entry);

		if (err)

			return err;



		err = mv88e6185_g1_stu_data_read(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

		 */

		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_OP, &val);

		if (err)

			return err;



		entry->fid = val & 0x000f;

		entry->fid |= (val & 0x0300) >> 4;

	}



	return 0;

}



int mv88e6185_g1_vtu_getnext(struct mv88e6xxx_chip *chip,

			     struct mv88e6xxx_vtu_entry *entry)

{
@@ -389,7 +356,7 @@ int mv88e6185_g1_vtu_getnext(struct mv88e6xxx_chip *chip, 
			return err;



		/* VTU DBNum[3:0] are located in VTU Operation 3:0

		 * VTU DBNum[7:4] are located in VTU Operation 11:8

		 * VTU DBNum[7:4] ([5:4] for 6250) are located in VTU Operation 11:8 (9:8)

		 */

		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_VTU_OP, &val);

		if (err)
@@ -397,6 +364,7 @@ int mv88e6185_g1_vtu_getnext(struct mv88e6xxx_chip *chip, 


		entry->fid = val & 0x000f;

		entry->fid |= (val & 0x0f00) >> 4;

		entry->fid &= mv88e6xxx_num_databases(chip) - 1;

	}



	return 0;
@@ -466,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)

{
@@ -516,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;