WRT3200ACM: reverted to network switch, instead of DSA

WRT3200ACM has switched to DSA, loosing the ability to configure
the network switch from LiCI or use port mirroring. The physical ports
are exposed as VLANs: lan1, lan2, lan3, lan4, and wan. Custom VLANs
can be created, in an obfuscated way lan1.1, lan1.2, etc.

This patch reverts the changes mentioned above. Two physical interfaces
are exposed: lan, and wan with separate MAC addresses. The ability to
create custom VLANs, and mirror ports in LuCI is restored.

Signed-off-by: Georgi Valkov <[email protected]>

Author: httpstorm

package/kernel/linux/modules/netdevices.mk

@@ -654,6 +654,21 @@ endef
 $(eval $(call KernelPackage,swconfig))
 
 
+define KernelPackage/switch-mvsw61xx
+  SUBMENU:=$(NETWORK_DEVICES_MENU)
+  TITLE:=Marvell 88E61xx switch support
+  DEPENDS:=+kmod-swconfig
+  KCONFIG:=CONFIG_MVSW61XX_PHY
+  FILES:=$(LINUX_DIR)/drivers/net/phy/mvsw61xx.ko
+  AUTOLOAD:=$(call AutoLoad,42,mvsw61xx)
+endef
+
+define KernelPackage/switch-mvsw61xx/description
+ Marvell 88E61xx switch support
+endef
+
+$(eval $(call KernelPackage,switch-mvsw61xx))
+
 define KernelPackage/switch-ip17xx
   SUBMENU:=$(NETWORK_DEVICES_MENU)
   TITLE:=IC+ IP17XX switch support

target/linux/mvebu/config-6.6

@@ -284,6 +284,7 @@ CONFIG_MVNETA=y
 CONFIG_MVNETA_BM=y
 CONFIG_MVNETA_BM_ENABLE=y
 # CONFIG_MVPP2 is not set
+CONFIG_MVSW61XX_PHY=y
 CONFIG_MV_XOR=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEON=y
@@ -394,6 +395,7 @@ CONFIG_SPI_ORION=y
 CONFIG_SRAM=y
 CONFIG_SRAM_EXEC=y
 CONFIG_SRCU=y
+CONFIG_SWCONFIG=y
 CONFIG_SWPHY=y
 CONFIG_SWP_EMULATE=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y

target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network

@@ -27,7 +27,9 @@ mvebu_setup_interfaces()
 	linksys,wrt1900acs|\
 	linksys,wrt3200acm|\
 	linksys,wrt32x)
-		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
+		ucidef_set_interfaces_lan_wan "lan.1" "wan.2"
+		ucidef_add_switch "switch0" \
+			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@lan" "4:wan" "6@wan"
 		;;
 	fortinet,fg-50e|\
 	fortinet,fg-51e|\

target/linux/mvebu/cortexa9/base-files/lib/preinit/06_set_iface_mac

@@ -0,0 +1,55 @@
+#
+# Copyright (C) 2014-2015 OpenWrt.org
+# Copyright (C) 2016 LEDE-Project.org
+#
+
+preinit_set_mac_address() {
+	local mac
+
+	. /lib/functions.sh
+
+	case $(board_name) in
+	buffalo,ls421de)
+		mac=$(mtd_get_mac_ascii u-boot-env eth1addr)
+		ip link set dev eth0 address $mac 2>/dev/null
+		;;
+	linksys,wrt1200ac|linksys,wrt1900ac-v2|linksys,wrt1900acs|linksys,wrt3200acm|linksys,wrt32x)
+		# rename interfaces back to the way they were with 4.4
+		case "$(readlink /sys/class/net/eth0)" in
+			*f1070000*)
+				ip link set eth0 name wan
+				ip link set eth1 name lan
+			;;
+			*)
+				ip link set eth0 name lan
+				ip link set eth1 name wan
+			;;
+		esac
+
+		mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
+		mac_wan=$(macaddr_setbit_la "$mac")
+		ip link set dev lan address $mac 2>/dev/null
+		ip link set dev wan address $mac_wan 2>/dev/null
+		;;
+	linksys,wrt1900ac-v1)
+		ip link set eth0 name lan
+		ip link set eth1 name wan
+		mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
+		ip link set dev lan address $mac 2>/dev/null
+		ip link set dev wan address $mac 2>/dev/null
+		;;
+	marvell,a385-db-ap|solidrun,clearfog*a1)
+		# rename interfaces back to the way they were with 4.4
+		case "$(readlink /sys/class/net/eth0)" in
+			*f1070000*)
+				ip link set eth0 name tmp0
+				ip link set eth1 name eth0
+				ip link set eth2 name eth1
+				ip link set tmp0 name eth2
+			;;
+		esac
+		;;
+	esac
+}
+
+boot_hook_add preinit_main preinit_set_mac_address

target/linux/mvebu/image/cortexa9.mk

@@ -237,7 +237,7 @@ TARGET_DEVICES += kobol_helios4
 define Device/linksys
   $(Device/NAND-128K)
   DEVICE_VENDOR := Linksys
-  DEVICE_PACKAGES := kmod-mwlwifi wpad-basic-mbedtls
+  DEVICE_PACKAGES := kmod-mwlwifi swconfig wpad-basic-mbedtls
   IMAGES += factory.img
   IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | \
 	append-ubi | pad-to $$$$(PAGESIZE)