[openwrt/openwrt] ramips: mt7620: disable SOC VLANs for external switches

[LEDE Commits]

ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/1769e3162e02ebe372274836ae6ad75a0391f50d

commit 1769e3162e02ebe372274836ae6ad75a0391f50d
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Tue Apr 20 12:35:47 2021 -0400

    ramips: mt7620: disable SOC VLANs for external switches
    
    These boards have AR8327 or QCA8337 external ethernet switch.
    The SOC also has it's own internal switch
    where VLAN is now enabled by default.
    
    Changes to preinit caused all switches to have VLANs enabled by default
    even if they are not configured with a topology in uci_defaults
    (see commit f017f617aecbd47debd4d3a734dc0e471342db96)
    
    When both internal and external switches have VLANs,
    and the external switch has both LAN and WAN,
    the TX traffic from the SOC cannot flow to the tagged port on the external switch
    because the VLAN IDs are not matching.
    
    So disable the internal switch VLANs by default on these boards.
    
    Also, add a topology for the internal switch,
    so that on LuCI there is not an "unknown topology" warning.
    
    In theory, it may be possible to have LAN ports on both switches
    through internal and external PHYs, but there are no known boards that have this.
    
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
    (cherry picked from commit 2adeada04558848058105cdad8195848d10d1486)
---
 target/linux/ramips/mt7620/base-files/etc/board.d/02_network | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
index 5ebffbaf7d..e867b58aed 100755
--- a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
@@ -137,6 +137,9 @@ ramips_setup_interfaces()
 	engenius,esr600)
 		ucidef_add_switch "switch0" \
 			"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan" "0 at eth0"
+		ucidef_add_switch "switch1" \
+			"5:lan" "6 at eth0"
+		ucidef_add_switch_attr "switch1" "enable" "false"
 		;;
 	fon,fon2601)
 		ucidef_add_switch "switch0" \
@@ -169,6 +172,9 @@ ramips_setup_interfaces()
 	lava,lr-25g001)
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "0 at eth0"
+		ucidef_add_switch "switch1" \
+			"5:lan" "6 at eth0"
+		ucidef_add_switch_attr "switch1" "enable" "false"
 		;;
 	lenovo,newifi-y1|\
 	xiaomi,miwifi-mini)