ipq806x: switch to kernel 5.10

coolsnowwolf · Jan 24, 2024 · 7515f84 · 7515f84
1 parent b23965c
commit 7515f84
Show file tree

Hide file tree

Showing 129 changed files with 4,965 additions and 12,419 deletions.
diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile
@@ -10,8 +10,7 @@ CPU_TYPE:=cortex-a15
 CPU_SUBTYPE:=neon-vfpv4
 SUBTARGETS:=generic
 
-KERNEL_PATCHVER:=5.4
-KERNEL_TESTING_PATCHVER:=5.4
+KERNEL_PATCHVER:=5.10
 
 KERNELNAME:=zImage Image dtbs
 
@@ -22,7 +21,6 @@ DEFAULT_PACKAGES += \
 	kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
 	kmod-phy-qcom-ipq806x-usb kmod-usb3 kmod-usb-dwc3-qcom \
 	kmod-ath10k-ct wpad-openssl uboot-envtools \
-	kmod-shortcut-fe kmod-qca-nss-drv kmod-qca-nss-ecm-standard kmod-qca-nss-gmac kmod-qca-nss-drv-pppoe kmod-qca-mcs \
-	autocore-arm htop automount autosamba luci-app-adbyby-plus luci-app-ipsec-vpnd luci-app-unblockmusic luci-app-zerotier
-
+	autocore-arm automount autosamba htop
+
 $(eval $(call BuildTarget))
diff --git a/target/linux/ipq806x/base-files/etc/board.d/01_leds b/target/linux/ipq806x/base-files/etc/board.d/01_leds
@@ -21,9 +21,10 @@ edgecore,ecw5410)
 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy1tpt"
 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy0tpt"
 	;;
-linksys,e8350-v1)
-        ucidef_set_led_wlan "wlan" "WLAN" "${boardname}:green:wifi" "phy0tpt"
-        ;;
+meraki,mr52)
+	ucidef_set_led_netdev "eth0" "eth0" "green:lan1" "eth0"
+	ucidef_set_led_netdev "eth1" "eth1" "green:lan2" "eth1"
+	;;
 nec,wg2600hp)
 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy1tpt"
 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy0tpt"

diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network
@@ -11,21 +11,19 @@ board_config_update
 board=$(board_name)
 
 case "$board" in
-arris,rac2v1a)
+arris,tr4400-v2)
 	ucidef_set_interfaces_lan_wan "eth1" "eth2"
 	ucidef_add_switch "switch0" \
 		"1:lan" "2:lan" "3:lan" "4:lan" "6u@eth1" "0u@eth0"
 	;;
 askey,rt4230w-rev6 |\
-askey,rt4230w-rev9.3 |\
 asrock,g10 |\
 nec,wg2600hp)
 	ucidef_add_switch "switch0" \
 		"2:lan" "3:lan" "4:lan" "5:lan" "6@eth1" "1:wan" "0@eth0"
 	;;
 buffalo,wxr-2533dhp |\
 compex,wpq864 |\
-linksys,e8350-v1 |\
 netgear,d7800 |\
 netgear,r7500 |\
 netgear,r7500v2 |\
@@ -36,14 +34,6 @@ surf,g-nat200)
 	;;
 edgecore,ecw5410)
 	ucidef_set_interfaces_lan_wan "eth1" "eth0"
-	if [ -b "$(find_mtd_part 0:art)" ]; then
-		ucidef_set_interface_macaddr "lan" "$(mtd_get_mac_binary "0:art" 0x6)"
-		ucidef_set_interface_macaddr "wan" "$(mtd_get_mac_binary "0:art" 0x0)"
-	else
-		# XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-		ucidef_set_interface_macaddr "lan" "$(mtd_get_mac_binary "0:ART" 0x6)"
-		ucidef_set_interface_macaddr "wan" "$(mtd_get_mac_binary "0:ART" 0x0)"
-	fi
 	;;
 linksys,ea7500-v1)
 	hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)
@@ -59,6 +49,12 @@ linksys,ea8500)
 	ucidef_set_interface_macaddr "lan" "$hw_mac_addr"
 	ucidef_set_interface_macaddr "wan" "$hw_mac_addr"
 	;;
+meraki,mr42)
+	ucidef_set_interface_lan "eth0"
+	;;
+meraki,mr52)
+	ucidef_set_interfaces_lan_wan "eth0" "eth1"
+	;;
 nec,wg2600hp3)
 	ucidef_add_switch "switch0" \
 		"2:lan" "3:lan" "4:lan" "5:lan" "0@eth1" "1:wan" "6@eth0"
@@ -70,13 +66,6 @@ tplink,vr2600v)
 	ucidef_add_switch "switch0" \
 		"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "6@eth1" "5:wan" "0@eth0"
 	;;
-norton,core-518)
-	hw_mac_addr=$(mtd_get_mac_ascii_mmc 0:APPSBLENV ethaddr)
-	ucidef_add_switch "switch0" \
-		"2:lan" "3:lan" "4:lan" "6u@eth1" "5:wan" "0u@eth0"
-	ucidef_set_interface_macaddr "wan" "$hw_mac_addr"
-	ucidef_set_interface_macaddr "lan" "$(macaddr_add $hw_mac_addr 1)"
-	;;
 qcom,ipq8064-ap161)
 	ucidef_set_interface_lan "eth1 eth2"
 	ucidef_add_switch "switch0" \
@@ -103,9 +92,6 @@ ubnt,unifi-ac-hd)
 	;;
 zyxel,nbg6817)
 	hw_mac_addr=$(mtd_get_mac_ascii 0:appsblenv ethaddr)
-	# XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-	[ -n "$hw_mac_addr" ] || \
-		hw_mac_addr=$(mtd_get_mac_ascii 0:APPSBLENV ethaddr)
 	ucidef_add_switch "switch0" \
 		"1:lan" "2:lan" "3:lan" "4:lan" "6@eth1" "5:wan" "0@eth0"
 	ucidef_set_interface_macaddr "lan" "$(macaddr_add $hw_mac_addr 2)"

diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -9,6 +9,10 @@ board=$(board_name)
 case "$FIRMWARE" in
 "ath10k/cal-pci-0000:01:00.0.bin")
 	case "$board" in
+	meraki,mr52)
+		CI_UBIPART=art
+		caldata_extract_ubi "ART" 0x1000 0x844
+		;;
 	ruijie,rg-mtfi-m520)
 		caldata_extract "ART" 0x1000 0x844
 		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii PRODUCTINFO ethaddr) 2)
@@ -25,149 +29,70 @@ case "$FIRMWARE" in
 	;;
 "ath10k/pre-cal-pci-0000:01:00.0.bin")
 	case $board in
-	arris,rac2v1a)
-		caldata_extract "0:ART" 0x1000 0x2f20
-		ath10k_patch_mac $(mtd_get_mac_binary fw_env 0x12)
-		;;
-	askey,rt4230w-rev6 |\
-	askey,rt4230w-rev9.3)
+	askey,rt4230w-rev6)
 		caldata_extract "0:ART" 0x1000 0x2f20
 		;;
 	asrock,g10)
-		if [ -b "$(find_mtd_part 0:art)" ]; then
-			caldata_extract "0:art" 0x1000 0x2f20
-		else
-			# XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-			caldata_extract "0:ART" 0x1000 0x2f20
-		fi
-		;;
-	buffalo,wxr-2533dhp)
-		caldata_extract "ART" 0x1000 0x2f20
-		ath10k_patch_mac $(mtd_get_mac_binary ART 0x1e)
-		;;
-	edgecore,ecw5410)
-		if [ -b "$(find_mtd_part 0:art)" ]; then
-			caldata_extract "0:art" 0x1000 0x2f20
-		else
-			# XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-			caldata_extract "0:ART" 0x1000 0x2f20
-		fi
+		caldata_extract "0:art" 0x1000 0x2f20
 		;;
 	linksys,ea7500-v1 |\
 	linksys,ea8500)
 		caldata_extract "art" 0x1000 0x2f20
 		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii devinfo hw_mac_addr) 1)
 		;;
-	nec,wg2600hp |\
-	nec,wg2600hp3)
-		caldata_extract "ART" 0x1000 0x2f20
-		ath10k_patch_mac $(mtd_get_mac_binary PRODUCTDATA 0x12)
-		;;
-	netgear,d7800 |\
-	netgear,r7500v2 |\
-	netgear,r7800 |\
-	netgear,xr500)
-		caldata_extract "art" 0x1000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x6) 1)
-		;;
-	norton,core-518)
-		caldata_extract_mmc "0:ART" 0x1000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii_mmc 0:APPSBLENV ethaddr) 2)
-		;;
-	tplink,ad7200 |\
-	tplink,c2600)
-		caldata_extract "radio" 0x1000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary default-mac 0x8) -1)
-		;;
-	tplink,vr2600v)
-		caldata_extract "ART" 0x1000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary default-mac 0x0) -1)
+	meraki,mr42)
+		CI_UBIPART=art
+		caldata_extract_ubi "ART" 0x1000 0x2f20
 		;;
 	zyxel,nbg6817)
-		if [ -b "$(find_mtd_part 0:art)" ]; then
-			caldata_extract "0:art" 0x1000 0x2f20
-			ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:appsblenv ethaddr) 1)
-		else
-			# XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-			caldata_extract "0:ART" 0x1000 0x2f20
-			ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) 1)
-		fi
+		caldata_extract "0:art" 0x1000 0x2f20
+		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:appsblenv ethaddr) 1)
 		;;
 	esac
 	;;
 "ath10k/pre-cal-pci-0001:01:00.0.bin")
 	case $board in
-	arris,rac2v1a)
-		caldata_extract "0:ART" 0x5000 0x2f20
-		ath10k_patch_mac $(mtd_get_mac_binary fw_env 0xc)
-		;;
-	askey,rt4230w-rev6 |\
-	askey,rt4230w-rev9.3)
+	askey,rt4230w-rev6)
 		caldata_extract "0:ART" 0x5000 0x2f20
 		;;
 	asrock,g10)
-		if [ -b "$(find_mtd_part 0:art)" ]; then
-			caldata_extract "0:art" 0x5000 0x2f20
-		else
-			# XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-			caldata_extract "0:ART" 0x5000 0x2f20
-		fi
+		caldata_extract "0:art" 0x5000 0x2f20
 		;;
-	buffalo,wxr-2533dhp)
-		caldata_extract "ART" 0x5000 0x2f20
-		ath10k_patch_mac $(mtd_get_mac_binary ART 0x18)
+	edgecore,ecw5410)
+		caldata_extract "0:art" 0x1000 0x2f20
 		;;
 	linksys,ea7500-v1 |\
 	linksys,ea8500)
 		caldata_extract "art" 0x5000 0x2f20
 		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii devinfo hw_mac_addr) 2)
 		;;
-	nec,wg2600hp |\
-	nec,wg2600hp3)
-		caldata_extract "ART" 0x5000 0x2f20
-		ath10k_patch_mac $(mtd_get_mac_binary PRODUCTDATA 0xc)
-		;;
-	netgear,d7800 |\
-	netgear,r7500v2 |\
-	netgear,r7800 |\
-	netgear,xr500)
-		caldata_extract "art" 0x5000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x6) 2)
-		;;
-	norton,core-518)
-		caldata_extract_mmc "0:ART" 0x5000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii_mmc 0:APPSBLENV ethaddr) 3)
-		;;
-	tplink,ad7200 |\
-	tplink,c2600)
-		caldata_extract "radio" 0x5000 0x2f20
-		ath10k_patch_mac $(mtd_get_mac_binary default-mac 0x8)
-		;;
-	tplink,vr2600v)
-		caldata_extract "ART" 0x5000 0x2f20
-		ath10k_patch_mac $(mtd_get_mac_binary default-mac 0x0)
+	meraki,mr42 |\
+	meraki,mr52)
+		CI_UBIPART=art
+		caldata_extract_ubi "ART" 0x5000 0x2f20
 		;;
 	zyxel,nbg6817)
-		if [ -b "$(find_mtd_part 0:art)" ]; then
-			caldata_extract "0:art" 0x5000 0x2f20
-			ath10k_patch_mac $(mtd_get_mac_ascii 0:appsblenv ethaddr)
-		else
-			# XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-			caldata_extract "0:ART" 0x5000 0x2f20
-			ath10k_patch_mac $(mtd_get_mac_ascii 0:APPSBLENV ethaddr)
-		fi
+		caldata_extract "0:art" 0x5000 0x2f20
+		ath10k_patch_mac $(mtd_get_mac_ascii 0:appsblenv ethaddr)
+		;;
+	esac
+	;;
+"ath10k/cal-pci-0002:01:00.0.bin")
+	case "$board" in
+	meraki,mr42)
+		CI_UBIPART=art
+		caldata_extract_ubi "ART" 0x9000 0x844
 		;;
 	esac
 	;;
 "ath10k/pre-cal-pci-0002:01:00.0.bin")
 	case $board in
 	edgecore,ecw5410)
-		if [ -b "$(find_mtd_part 0:art)" ]; then
-			caldata_extract "0:art" 0x5000 0x2f20
-		else
-			# XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-			caldata_extract "0:ART" 0x5000 0x2f20
-		fi
+		caldata_extract "0:art" 0x5000 0x2f20
+		;;
+	meraki,mr52)
+		CI_UBIPART=art
+		caldata_extract_ubi "ART" 0x9000 0x2f20
 		;;
 	esac
 	;;

diff --git a/target/linux/ipq806x/base-files/etc/init.d/bootcount b/target/linux/ipq806x/base-files/etc/init.d/bootcount
@@ -16,30 +16,5 @@ boot() {
 	linksys,ea8500)
 		mtd resetbc s_env || true
 		;;
-	norton,core-518)
-        . /lib/functions/caldata.sh
-        FIRMWARE='ath10k/pre-cal-pci-0000:01:00.0.bin'
-		[ -e /lib/firmware/$FIRMWARE ] || {
-            caldata_extract_mmc "0:ART" 0x1000 0x2f20
-		    ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii_mmc 0:APPSBLENV ethaddr) 2)
-        }
-
-        FIRMWARE='ath10k/pre-cal-pci-0001:01:00.0.bin'
-        [ -e /lib/firmware/$FIRMWARE ] || {
-            caldata_extract_mmc "0:ART" 0x5000 0x2f20
-		    ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii_mmc 0:APPSBLENV ethaddr) 3)
-        }
-
-		[ -e /etc/config/wireless ] || {
-			/sbin/wifi config
-			/sbin/wifi up
-		}
-
-		[ -s /etc/config/wireless ] || {
-			rm /etc/config/wireless
-			/sbin/wifi config
-			/sbin/wifi up
-		}
-		;;
 	esac
 }
diff --git a/target/linux/ipq806x/base-files/etc/init.d/cpu_freq b/target/linux/ipq806x/base-files/etc/init.d/cpu_freq
@@ -9,13 +9,9 @@ boot() {
 
   if [ "$governor" = "ondemand" ]; then
     # Effective only with ondemand
+    echo 600000 > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq
+    echo 600000 > /sys/devices/system/cpu/cpufreq/policy1/scaling_min_freq
     echo 10 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor
     echo 50 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold
   fi
-
-	echo 1000000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
-	echo 1000000 > /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq
-
-	sysctl -w vm.min_free_kbytes=65536
-	sysctl -w net.netfilter.nf_conntrack_max=65535
 }
diff --git a/target/linux/ipq806x/base-files/etc/uci-defaults/05_fix-compat-version b/target/linux/ipq806x/base-files/etc/uci-defaults/05_fix-compat-version
@@ -0,0 +1,11 @@
+. /lib/functions.sh
+
+case "$(board_name)" in
+	linksys,ea7500-v1|\
+	linksys,ea8500)
+		uci set system.@system[0].compat_version="2.0"
+		uci commit system
+	;;
+esac
+
+exit 0
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/asrock.sh b/target/linux/ipq806x/base-files/lib/upgrade/asrock.sh
@@ -2,8 +2,6 @@
 
 asrock_bootconfig_mangle() {
 	local mtdnum="$(find_mtd_index 0:bootconfig)"
-	# XXX: drop upper case after kernel v5.4 is gone (qcom-smem)
-	[ -n "$mtdnum" ] || mtdnum="$(find_mtd_index 0:BOOTCONFIG)"
 
 	if [ -z "$mtdnum" ]; then
 		echo "cannot find bootconfig mtd partition"