Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb9b9020 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: add STU capability 



Some switch models have a STU (per VLAN port state database). Add a new
capability flag to switches info, instead of checking their family.

Also if the 6165 family has an STU, it must have a VTU, so add the
MV88E6XXX_FLAG_VTU to its family flags.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 15d7d7d4

drivers/net/dsa/mv88e6xxx.c

+2 −12
Original line number Diff line number Diff line
@@ -453,16 +453,6 @@ static bool mv88e6xxx_has_fid_reg(struct mv88e6xxx_priv_state *ps) 
	return false;

}



static bool mv88e6xxx_has_stu(struct mv88e6xxx_priv_state *ps)

{

	/* Does the device have STU and dedicated SID registers for VTU ops? */

	if (mv88e6xxx_6097_family(ps) || mv88e6xxx_6165_family(ps) ||

	    mv88e6xxx_6351_family(ps) || mv88e6xxx_6352_family(ps))

		return true;



	return false;

}



/* We expect the switch to perform auto negotiation if there is a real

 * phy. However, in the case of a fixed link phy, we force the port

 * settings from the fixed link settings.
@@ -1599,7 +1589,7 @@ static int _mv88e6xxx_vtu_getnext(struct mv88e6xxx_priv_state *ps, 
			next.fid |= ret & 0xf;

		}



		if (mv88e6xxx_has_stu(ps)) {

		if (mv88e6xxx_has(ps, MV88E6XXX_FLAG_STU)) {

			ret = _mv88e6xxx_reg_read(ps, REG_GLOBAL,

						  GLOBAL_VTU_SID);

			if (ret < 0)
@@ -1686,7 +1676,7 @@ static int _mv88e6xxx_vtu_loadpurge(struct mv88e6xxx_priv_state *ps, 
	if (ret < 0)

		return ret;



	if (mv88e6xxx_has_stu(ps)) {

	if (mv88e6xxx_has(ps, MV88E6XXX_FLAG_STU)) {

		reg = entry->sid & GLOBAL_VTU_SID_MASK;

		ret = _mv88e6xxx_reg_write(ps, REG_GLOBAL, GLOBAL_VTU_SID, reg);

		if (ret < 0)

drivers/net/dsa/mv88e6xxx.h

+14 −2
Original line number Diff line number Diff line
@@ -403,6 +403,12 @@ enum mv88e6xxx_cap { 
	 */

	MV88E6XXX_CAP_SMI_PHY,



	/* Per VLAN Spanning Tree Unit (STU).

	 * The Port State database, if present, is accessed through VTU

	 * operations and dedicated SID registers. See GLOBAL_VTU_SID.

	 */

	MV88E6XXX_CAP_STU,



	/* Switch MAC/WoL/WoF register.

	 * This requires an indirect access to set the switch MAC address

	 * through GLOBAL2_SWITCH_MAC, otherwise GLOBAL_MAC_01, GLOBAL_MAC_23,
@@ -436,6 +442,7 @@ enum mv88e6xxx_cap { 
#define MV88E6XXX_FLAG_PPU		BIT(MV88E6XXX_CAP_PPU)

#define MV88E6XXX_FLAG_PPU_ACTIVE	BIT(MV88E6XXX_CAP_PPU_ACTIVE)

#define MV88E6XXX_FLAG_SMI_PHY		BIT(MV88E6XXX_CAP_SMI_PHY)

#define MV88E6XXX_FLAG_STU		BIT(MV88E6XXX_CAP_STU)

#define MV88E6XXX_FLAG_SWITCH_MAC	BIT(MV88E6XXX_CAP_SWITCH_MAC_WOL_WOF)

#define MV88E6XXX_FLAG_TEMP		BIT(MV88E6XXX_CAP_TEMP)

#define MV88E6XXX_FLAG_TEMP_LIMIT	BIT(MV88E6XXX_CAP_TEMP_LIMIT)
@@ -451,12 +458,15 @@ enum mv88e6xxx_cap { 
#define MV88E6XXX_FLAGS_FAMILY_6097	\

	(MV88E6XXX_FLAG_ATU |		\

	 MV88E6XXX_FLAG_PPU |		\

	 MV88E6XXX_FLAG_STU |		\

	 MV88E6XXX_FLAG_VLANTABLE |	\

	 MV88E6XXX_FLAG_VTU)



#define MV88E6XXX_FLAGS_FAMILY_6165	\

	(MV88E6XXX_FLAG_SWITCH_MAC |	\

	 MV88E6XXX_FLAG_TEMP)

	(MV88E6XXX_FLAG_STU |		\

	 MV88E6XXX_FLAG_SWITCH_MAC |	\

	 MV88E6XXX_FLAG_TEMP |		\

	 MV88E6XXX_FLAG_VTU)



#define MV88E6XXX_FLAGS_FAMILY_6185	\

	(MV88E6XXX_FLAG_ATU |		\
@@ -482,6 +492,7 @@ enum mv88e6xxx_cap { 
	 MV88E6XXX_FLAG_PORTSTATE |	\

	 MV88E6XXX_FLAG_PPU_ACTIVE |	\

	 MV88E6XXX_FLAG_SMI_PHY |	\

	 MV88E6XXX_FLAG_STU |		\

	 MV88E6XXX_FLAG_SWITCH_MAC |	\

	 MV88E6XXX_FLAG_TEMP |		\

	 MV88E6XXX_FLAG_VLANTABLE |	\
@@ -494,6 +505,7 @@ enum mv88e6xxx_cap { 
	 MV88E6XXX_FLAG_PORTSTATE |	\

	 MV88E6XXX_FLAG_PPU_ACTIVE |	\

	 MV88E6XXX_FLAG_SMI_PHY |	\

	 MV88E6XXX_FLAG_STU |		\

	 MV88E6XXX_FLAG_SWITCH_MAC |	\

	 MV88E6XXX_FLAG_TEMP |		\

	 MV88E6XXX_FLAG_TEMP_LIMIT |	\