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

net: dsa: check VLAN capability of every switch 



Now that the VLAN object is propagated to every switch chip of the
switch fabric, we can easily ensure that they all support the required
VLAN operations before modifying an entry on a single switch.

To achieve that, remove the condition skipping other target switches,
and add a bitmap of VLAN members, eventually containing the target port,
if we are programming the switch target.

This will allow us to easily add other VLAN members, such as the DSA or
CPU ports (to introduce cross-chip VLAN support) or the other port
members if we want to reduce hardware accesses later.

Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c91498e1

net/dsa/switch.c

+17 −10
Original line number Diff line number Diff line
@@ -159,19 +159,27 @@ static int dsa_switch_vlan_add(struct dsa_switch *ds, 
{

	const struct switchdev_obj_port_vlan *vlan = info->vlan;

	struct switchdev_trans *trans = info->trans;

	DECLARE_BITMAP(members, ds->num_ports);

	int port, err;



	/* Do not care yet about other switch chips of the fabric */

	if (ds->index != info->sw_index)

		return 0;

	/* Build a mask of VLAN members */

	bitmap_zero(members, ds->num_ports);

	if (ds->index == info->sw_index)

		set_bit(info->port, members);



	if (switchdev_trans_ph_prepare(trans)) {

		if (!ds->ops->port_vlan_prepare || !ds->ops->port_vlan_add)

			return -EOPNOTSUPP;



		return ds->ops->port_vlan_prepare(ds, info->port, vlan, trans);

		for_each_set_bit(port, members, ds->num_ports) {

			err = ds->ops->port_vlan_prepare(ds, port, vlan, trans);

			if (err)

				return err;

		}

	}



	ds->ops->port_vlan_add(ds, info->port, vlan, trans);

	for_each_set_bit(port, members, ds->num_ports)

		ds->ops->port_vlan_add(ds, port, vlan, trans);



	return 0;

}
@@ -181,14 +189,13 @@ static int dsa_switch_vlan_del(struct dsa_switch *ds, 
{

	const struct switchdev_obj_port_vlan *vlan = info->vlan;



	/* Do not care yet about other switch chips of the fabric */

	if (ds->index != info->sw_index)

		return 0;



	if (!ds->ops->port_vlan_del)

		return -EOPNOTSUPP;



	if (ds->index == info->sw_index)

		return ds->ops->port_vlan_del(ds, info->port, vlan);



	return 0;

}



static int dsa_switch_event(struct notifier_block *nb,

CRA Git | Maintained and supported by SUSTech CRA and CCSE