rtl83xx: dsa: reset PVID to 1 instead of 0
authorHarshal Gohel <hg@simonwunderlich.de>
Wed, 3 Jan 2024 15:15:12 +0000 (16:15 +0100)
committerSander Vanheule <sander@svanheule.net>
Tue, 9 Jan 2024 20:20:37 +0000 (21:20 +0100)
Before, PVID is reset for all ports and goes out of bounds. Also, PVID
is later changed by dsa configuration by `ip link` and `bridge vlan`
commands, this does not change the CPU port PVID and CPU PVID stays 0.
It does not allow sending packets from OpenWrt to any connected devices
unless default configuration is changed

This change iterates up to and including cpu_port and sets default PVID
to 1. For lan* ports PVID can be configured with `ip link` and `bridge
vlan` commands

Acked-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Harshal Gohel <hg@simonwunderlich.de>
target/linux/realtek/files-5.15/drivers/net/dsa/rtl83xx/dsa.c

index 0e1d64ae691284a6cd0bb888e849dde40ec09e33..a5b8ccea1c8c629d085d25245b6f8c5b7249fec4 100644 (file)
@@ -137,9 +137,9 @@ static void rtl83xx_vlan_setup(struct rtl838x_switch_priv *priv)
                priv->r->vlan_set_tagged(i, &info);
 
        /* reset PVIDs; defaults to 1 on reset */
-       for (int i = 0; i <= priv->ds->num_ports; i++) {
-               priv->r->vlan_port_pvid_set(i, PBVLAN_TYPE_INNER, 0);
-               priv->r->vlan_port_pvid_set(i, PBVLAN_TYPE_OUTER, 0);
+       for (int i = 0; i <= priv->cpu_port; i++) {
+               priv->r->vlan_port_pvid_set(i, PBVLAN_TYPE_INNER, 1);
+               priv->r->vlan_port_pvid_set(i, PBVLAN_TYPE_OUTER, 1);
                priv->r->vlan_port_pvidmode_set(i, PBVLAN_TYPE_INNER, PBVLAN_MODE_UNTAG_AND_PRITAG);
                priv->r->vlan_port_pvidmode_set(i, PBVLAN_TYPE_OUTER, PBVLAN_MODE_UNTAG_AND_PRITAG);
        }