Commit 45e9d59d authored by Jonas Gorski's avatar Jonas Gorski Committed by Jakub Kicinski
Browse files

net: dsa: b53: do not allow to configure VLAN 0 



Since we cannot set forwarding destinations per VLAN, we should not have
a VLAN 0 configured, as it would allow untagged traffic to work across
ports on VLAN aware bridges regardless if a PVID untagged VLAN exists.

So remove the VLAN 0 on join, an re-add it on leave. But only do so if
we have a VLAN aware bridge, as without it, untagged traffic would
become tagged with VID 0 on a VLAN unaware bridge.

Fixes: a2482d2c ("net: dsa: b53: Plug in VLAN support")
Signed-off-by: default avatarJonas Gorski <jonas.gorski@gmail.com>
Tested-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Link: https://patch.msgid.link/20250429201710.330937-8-jonas.gorski@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 13b152ae

drivers/net/dsa/b53/b53_common.c

+27 −9
Original line number Diff line number Diff line
@@ -1544,6 +1544,9 @@ int b53_vlan_add(struct dsa_switch *ds, int port, 
	if (err)

		return err;



	if (vlan->vid == 0)

		return 0;



	b53_read16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), &old_pvid);

	if (pvid)

		new_pvid = vlan->vid;
@@ -1556,10 +1559,7 @@ int b53_vlan_add(struct dsa_switch *ds, int port, 


	b53_get_vlan_entry(dev, vlan->vid, vl);



	if (vlan->vid == 0 && vlan->vid == b53_default_pvid(dev))

		untagged = true;



	if (vlan->vid > 0 && dsa_is_cpu_port(ds, port))

	if (dsa_is_cpu_port(ds, port))

		untagged = false;



	vl->members |= BIT(port);
@@ -1589,6 +1589,9 @@ int b53_vlan_del(struct dsa_switch *ds, int port, 
	struct b53_vlan *vl;

	u16 pvid;



	if (vlan->vid == 0)

		return 0;



	b53_read16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), &pvid);



	vl = &dev->vlans[vlan->vid];
@@ -1935,8 +1938,9 @@ int b53_br_join(struct dsa_switch *ds, int port, struct dsa_bridge bridge, 
		bool *tx_fwd_offload, struct netlink_ext_ack *extack)

{

	struct b53_device *dev = ds->priv;

	struct b53_vlan *vl;

	s8 cpu_port = dsa_to_port(ds, port)->cpu_dp->index;

	u16 pvlan, reg;

	u16 pvlan, reg, pvid;

	unsigned int i;



	/* On 7278, port 7 which connects to the ASP should only receive
@@ -1945,6 +1949,9 @@ int b53_br_join(struct dsa_switch *ds, int port, struct dsa_bridge bridge, 
	if (dev->chip_id == BCM7278_DEVICE_ID && port == 7)

		return -EINVAL;



	pvid = b53_default_pvid(dev);

	vl = &dev->vlans[pvid];



	/* Make this port leave the all VLANs join since we will have proper

	 * VLAN entries from now on

	 */
@@ -1956,6 +1963,15 @@ int b53_br_join(struct dsa_switch *ds, int port, struct dsa_bridge bridge, 
		b53_write16(dev, B53_VLAN_PAGE, B53_JOIN_ALL_VLAN_EN, reg);

	}



	if (ds->vlan_filtering) {

		b53_get_vlan_entry(dev, pvid, vl);

		vl->members &= ~BIT(port);

		if (vl->members == BIT(cpu_port))

			vl->members &= ~BIT(cpu_port);

		vl->untag = vl->members;

		b53_set_vlan_entry(dev, pvid, vl);

	}



	b53_read16(dev, B53_PVLAN_PAGE, B53_PVLAN_PORT_MASK(port), &pvlan);



	b53_for_each_port(dev, i) {
@@ -2023,11 +2039,13 @@ void b53_br_leave(struct dsa_switch *ds, int port, struct dsa_bridge bridge) 
		b53_write16(dev, B53_VLAN_PAGE, B53_JOIN_ALL_VLAN_EN, reg);

	}



	if (ds->vlan_filtering) {

		b53_get_vlan_entry(dev, pvid, vl);

		vl->members |= BIT(port) | BIT(cpu_port);

		vl->untag |= BIT(port) | BIT(cpu_port);

		b53_set_vlan_entry(dev, pvid, vl);

	}

}

EXPORT_SYMBOL(b53_br_leave);



void b53_br_set_stp_state(struct dsa_switch *ds, int port, u8 state)