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

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

net: dsa: mv88e6xxx: factorize VTU access 



Add a MV88E6XXX_FLAG_VTU flag to indentify switch models with a VLAN
Table Unit.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 936f234a

drivers/net/dsa/mv88e6123.c

+5 −0
Original line number Diff line number Diff line
@@ -136,6 +136,11 @@ struct dsa_switch_driver mv88e6123_switch_driver = { 
	.port_bridge_join	= mv88e6xxx_port_bridge_join,

	.port_bridge_leave	= mv88e6xxx_port_bridge_leave,

	.port_stp_state_set	= mv88e6xxx_port_stp_state_set,

	.port_vlan_filtering	= mv88e6xxx_port_vlan_filtering,

	.port_vlan_prepare	= mv88e6xxx_port_vlan_prepare,

	.port_vlan_add		= mv88e6xxx_port_vlan_add,

	.port_vlan_del		= mv88e6xxx_port_vlan_del,

	.port_vlan_dump		= mv88e6xxx_port_vlan_dump,

};



MODULE_ALIAS("platform:mv88e6123");

drivers/net/dsa/mv88e6xxx.c

+16 −0
Original line number Diff line number Diff line
@@ -1596,6 +1596,9 @@ int mv88e6xxx_port_vlan_dump(struct dsa_switch *ds, int port, 
	u16 pvid;

	int err;



	if (!mv88e6xxx_has(ps, MV88E6XXX_FLAG_VTU))

		return -EOPNOTSUPP;



	mutex_lock(&ps->smi_mutex);



	err = _mv88e6xxx_port_pvid_get(ps, port, &pvid);
@@ -2019,6 +2022,9 @@ int mv88e6xxx_port_vlan_filtering(struct dsa_switch *ds, int port, 
		PORT_CONTROL_2_8021Q_DISABLED;

	int ret;



	if (!mv88e6xxx_has(ps, MV88E6XXX_FLAG_VTU))

		return -EOPNOTSUPP;



	mutex_lock(&ps->smi_mutex);



	ret = _mv88e6xxx_reg_read(ps, REG_PORT(port), PORT_CONTROL_2);
@@ -2052,8 +2058,12 @@ int mv88e6xxx_port_vlan_prepare(struct dsa_switch *ds, int port, 
				const struct switchdev_obj_port_vlan *vlan,

				struct switchdev_trans *trans)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	int err;



	if (!mv88e6xxx_has(ps, MV88E6XXX_FLAG_VTU))

		return -EOPNOTSUPP;



	/* If the requested port doesn't belong to the same bridge as the VLAN

	 * members, do not support it (yet) and fallback to software VLAN.

	 */
@@ -2094,6 +2104,9 @@ void mv88e6xxx_port_vlan_add(struct dsa_switch *ds, int port, 
	bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID;

	u16 vid;



	if (!mv88e6xxx_has(ps, MV88E6XXX_FLAG_VTU))

		return;



	mutex_lock(&ps->smi_mutex);



	for (vid = vlan->vid_begin; vid <= vlan->vid_end; ++vid)
@@ -2151,6 +2164,9 @@ int mv88e6xxx_port_vlan_del(struct dsa_switch *ds, int port, 
	u16 pvid, vid;

	int err = 0;



	if (!mv88e6xxx_has(ps, MV88E6XXX_FLAG_VTU))

		return -EOPNOTSUPP;



	mutex_lock(&ps->smi_mutex);



	err = _mv88e6xxx_port_pvid_get(ps, port, &pvid);

drivers/net/dsa/mv88e6xxx.h

+18 −6
Original line number Diff line number Diff line
@@ -394,6 +394,11 @@ enum mv88e6xxx_cap { 
	 * the output (or egress) ports to which it is allowed to send frames.

	 */

	MV88E6XXX_CAP_VLANTABLE,



	/* VLAN Table Unit.

	 * The VTU is used to program 802.1Q VLANs. See GLOBAL_VTU_OP.

	 */

	MV88E6XXX_CAP_VTU,

};



/* Bitmask of capabilities */
@@ -406,14 +411,17 @@ enum mv88e6xxx_cap { 
#define MV88E6XXX_FLAG_TEMP		BIT(MV88E6XXX_CAP_TEMP)

#define MV88E6XXX_FLAG_TEMP_LIMIT	BIT(MV88E6XXX_CAP_TEMP_LIMIT)

#define MV88E6XXX_FLAG_VLANTABLE	BIT(MV88E6XXX_CAP_VLANTABLE)

#define MV88E6XXX_FLAG_VTU		BIT(MV88E6XXX_CAP_VTU)



#define MV88E6XXX_FLAGS_FAMILY_6095	\

	(MV88E6XXX_FLAG_PPU |		\

	 MV88E6XXX_FLAG_VLANTABLE)

	 MV88E6XXX_FLAG_VLANTABLE |	\

	 MV88E6XXX_FLAG_VTU)



#define MV88E6XXX_FLAGS_FAMILY_6097	\

	(MV88E6XXX_FLAG_PPU |		\

	 MV88E6XXX_FLAG_VLANTABLE)

	 MV88E6XXX_FLAG_VLANTABLE |	\

	 MV88E6XXX_FLAG_VTU)



#define MV88E6XXX_FLAGS_FAMILY_6165	\

	(MV88E6XXX_FLAG_SWITCH_MAC |	\
@@ -421,7 +429,8 @@ enum mv88e6xxx_cap { 


#define MV88E6XXX_FLAGS_FAMILY_6185	\

	(MV88E6XXX_FLAG_PPU |		\

	 MV88E6XXX_FLAG_VLANTABLE)

	 MV88E6XXX_FLAG_VLANTABLE |	\

	 MV88E6XXX_FLAG_VTU)



#define MV88E6XXX_FLAGS_FAMILY_6320	\

	(MV88E6XXX_FLAG_EEE |		\
@@ -431,14 +440,16 @@ enum mv88e6xxx_cap { 
	 MV88E6XXX_FLAG_SWITCH_MAC |	\

	 MV88E6XXX_FLAG_TEMP |		\

	 MV88E6XXX_FLAG_TEMP_LIMIT |	\

	 MV88E6XXX_FLAG_VLANTABLE)

	 MV88E6XXX_FLAG_VLANTABLE |	\

	 MV88E6XXX_FLAG_VTU)



#define MV88E6XXX_FLAGS_FAMILY_6351	\

	(MV88E6XXX_FLAG_PORTSTATE |	\

	 MV88E6XXX_FLAG_SMI_PHY |	\

	 MV88E6XXX_FLAG_SWITCH_MAC |	\

	 MV88E6XXX_FLAG_TEMP |		\

	 MV88E6XXX_FLAG_VLANTABLE)

	 MV88E6XXX_FLAG_VLANTABLE |	\

	 MV88E6XXX_FLAG_VTU)



#define MV88E6XXX_FLAGS_FAMILY_6352	\

	(MV88E6XXX_FLAG_EEE |		\
@@ -448,7 +459,8 @@ enum mv88e6xxx_cap { 
	 MV88E6XXX_FLAG_SWITCH_MAC |	\

	 MV88E6XXX_FLAG_TEMP |		\

	 MV88E6XXX_FLAG_TEMP_LIMIT |	\

	 MV88E6XXX_FLAG_VLANTABLE)

	 MV88E6XXX_FLAG_VLANTABLE |	\

	 MV88E6XXX_FLAG_VTU)



struct mv88e6xxx_info {

	enum mv88e6xxx_family family;