WIFI-14997 Multi BDF support for Sonicfi series

Signed-off-by: wingate5678 <wingate.chi@cybertan.com.tw>

feeds/ipq807x_v5.4/ath11k-wifi/Makefile

@@ -24,8 +24,6 @@ endef
 #
 
 ALLWIFIBOARDS:= \
-	cig-wf186w \
-	cig-wf186h \
 	cig-wf660a \
 	cig-wf194c \
 	cig-wf194c4 \
@@ -54,8 +52,6 @@ ALLWIFIBOARDS:= \
 	wallys-dr5018 \
 	wallys-dr6018 \
 	wallys-dr6018-v4 \
-	sonicfi-rap630c-311g \
-	sonicfi-rap630w-311g \
 	sonicfi-rap630w-312g \
 	sonicfi-rap650c \
 	sonicfi-rap630e \
@@ -108,6 +104,16 @@ $(call Package/ath11k-wifi-default)
     TITLE:=cig-wf196 bdf
 endef
 
+define Package/ath11k-wifi-cig-wf186w
+$(call Package/ath11k-wifi-default)
+    TITLE:=cig-wf186w bdf
+endef
+
+define Package/ath11k-wifi-cig-wf186h
+$(call Package/ath11k-wifi-default)
+    TITLE:=cig-wf186h bdf
+endef
+
 define Package/ath11k-wifi-gl-ax1800
 $(call Package/ath11k-wifi-default)
     TITLE:=gl-ax1800 bdf
@@ -199,6 +205,16 @@ $(call Package/ath11k-wifi-default)
     TITLE:=cig-wf188n bdf
 endef
 
+define Package/ath11k-wifi-sonicfi-rap630c-311g
+$(call Package/ath11k-wifi-default)
+    TITLE:=sonicfi-rap630c-311g bdf
+endef
+
+define Package/ath11k-wifi-sonicfi-rap630w-311g
+$(call Package/ath11k-wifi-default)
+    TITLE:=sonicfi-rap630w-311g bdf
+endef
+
 define ath11k-wifi-install-one-to
   $(INSTALL_DIR)  $(2)/lib/firmware/$(3)/
   $(INSTALL_DATA) $(1) $(2)/lib/firmware/$(3)/board.bin
@@ -284,6 +300,24 @@ define Package/ath11k-wifi-cig-wf196/install
 	$(INSTALL_DATA) ./board-cig-wf196-us.bin.IPQ8074 $(1)/lib/firmware/ath11k/IPQ8074/hw2.0/board.bin.US
 endef
 
+define Package/ath11k-wifi-cig-wf186w/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/qcn6122/hw1.0/
+	$(INSTALL_DATA) ./board-cig-wf186w-us.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US
+	$(INSTALL_DATA) ./board-cig-wf186w-ca.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA
+	$(INSTALL_DATA) ./board-cig-wf186w-us.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US
+	$(INSTALL_DATA) ./board-cig-wf186w-ca.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA
+endef
+
+define Package/ath11k-wifi-cig-wf186h/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/qcn6122/hw1.0/
+	$(INSTALL_DATA) ./board-cig-wf186h-us.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US
+	$(INSTALL_DATA) ./board-cig-wf186h-ca.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA
+	$(INSTALL_DATA) ./board-cig-wf186h-us.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US
+	$(INSTALL_DATA) ./board-cig-wf186h-ca.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA
+endef
+
 define Package/ath11k-wifi-optimcloud-d50/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/QCN9074/hw1.0/
@@ -393,8 +427,32 @@ define Package/ath11k-wifi-cig-wf188n/install
 	$(INSTALL_DATA) ./board-cig-wf188n-us.bin.IPQ6018 $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/board.bin.US
 endef
 
-$(eval $(call generate-ath11k-wifi-package,cig-wf186w,Cigtech WF186w))
+define Package/ath11k-wifi-sonicfi-rap630c-311g/install
-$(eval $(call generate-ath11k-wifi-package,cig-wf186h,Cigtech WF186h))
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/qcn6122/hw1.0/
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-au.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.AU
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-ca.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-sg.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.SG
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-us.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-au.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.AU
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-ca.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-sg.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.SG
+	$(INSTALL_DATA) ./board-sonicfi-rap630c-311g-us.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US
+endef
+
+define Package/ath11k-wifi-sonicfi-rap630w-311g/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
+	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/qcn6122/hw1.0/
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-au.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.AU
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-ca.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-sg.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.SG
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-us.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-au.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.AU
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-ca.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-sg.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.SG
+	$(INSTALL_DATA) ./board-sonicfi-rap630w-311g-us.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US
+endef
+
 $(eval $(call generate-ath11k-wifi-package,cig-wf660a,Cigtech WF660a))
 $(eval $(call generate-ath11k-wifi-package,cig-wf194c,Cigtech WF194c))
 $(eval $(call generate-ath11k-wifi-package,cig-wf194c4,Cigtech WF194c4))
@@ -417,8 +475,6 @@ $(eval $(call generate-ath11k-wifi-package,liteon-wpx8324,Liteon WPX8324))
 $(eval $(call generate-ath11k-wifi-package,indio-um-310ax-v1,Indio UM-310AX V1))
 $(eval $(call generate-ath11k-wifi-package,indio-um-510axp-v1,Indio UM-510AXP V1))
 $(eval $(call generate-ath11k-wifi-package,indio-um-510axm-v1,Indio UM-510AXM V1))
-$(eval $(call generate-ath11k-wifi-package,sonicfi-rap630c-311g,Sonicfi RAP630C 311G))
-$(eval $(call generate-ath11k-wifi-package,sonicfi-rap630w-311g,Sonicfi RAP630W 311G))
 $(eval $(call generate-ath11k-wifi-package,sonicfi-rap630w-312g,Sonicfi RAP630W 312G))
 $(eval $(call generate-ath11k-wifi-package,sonicfi-rap650c,SonicFi RAP650C))
 $(eval $(call generate-ath11k-wifi-package,sonicfi-rap630e,SonicFi RAP630E))
@@ -440,6 +496,8 @@ $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq8074))
 $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq6018))
 $(eval $(call BuildPackage,ath11k-wifi-qcom-qcn9000))
 $(eval $(call BuildPackage,ath11k-wifi-cig-wf196))
+$(eval $(call BuildPackage,ath11k-wifi-cig-wf186w))
+$(eval $(call BuildPackage,ath11k-wifi-cig-wf186h))
 $(eval $(call BuildPackage,ath11k-wifi-motorola-q14))
 $(eval $(call BuildPackage,ath11k-wifi-optimcloud-d50))
 $(eval $(call BuildPackage,ath11k-wifi-optimcloud-d60))
@@ -453,3 +511,5 @@ $(eval $(call BuildPackage,ath11k-wifi-hfcl-ion4xi_HMR))
 $(eval $(call BuildPackage,ath11k-wifi-edgecore-oap101))
 $(eval $(call BuildPackage,ath11k-wifi-edgecore-oap101e))
 $(eval $(call BuildPackage,ath11k-wifi-cig-wf188n))
+$(eval $(call BuildPackage,ath11k-wifi-sonicfi-rap630c-311g))
+$(eval $(call BuildPackage,ath11k-wifi-sonicfi-rap630w-311g))

feeds/ipq807x_v5.4/hostapd/files/afc_location.uc

@@ -4,19 +4,19 @@ let fs = require("fs");
 let ubus = require('ubus').connect();
 
 let gps_info = ubus.call('gps', 'info');
-let latitude = gps_info.latitude ?? 0;
+let latitude = gps_info.latitude || 0;
-let longitude = gps_info.longitude ?? 0;
+let longitude = gps_info.longitude || 0;
 
 // afc-location.json file content
 let afc_location = {};
 afc_location.location_type = "ellipse";
 afc_location.location = longitude + ":" + latitude ;
-afc_location.height = gps_info.elevation ?? 0;
+afc_location.height = gps_info.elevation || 0;
 afc_location.height_type = "AMSL";
-afc_location.major_axis = gps_info.major_axis ?? 0;
+afc_location.major_axis = int(gps_info.major_axis) || 1;
-afc_location.minor_axis = gps_info.minor_axis ?? 0;
+afc_location.minor_axis = int(gps_info.minor_axis) || 1;
-afc_location.orientation = gps_info.major_orientation ?? 0;
+afc_location.orientation = gps_info.major_orientation || 0;
-afc_location.vertical_tolerance = gps_info.vdop ?? 0;
+afc_location.vertical_tolerance = int(gps_info.vdop) || 1;
 
 let afc_location_json = fs.open("/etc/ucentral/afc-location.json", "w");
 afc_location_json.write(afc_location);

feeds/ipq807x_v5.4/hostapd/files/hostapd.uc

@@ -1,7 +1,8 @@
 let libubus = require("ubus");
-import { open, readfile } from "fs";
+import { open, readfile, writefile } from "fs";
 import { wdev_create, wdev_remove, is_equal, vlist_new, phy_is_fullmac, phy_open } from "common";
 
+let uci = require('uci').cursor();
 let ubus = libubus.connect(null, 60);
 
 hostapd.data.config = {};
@@ -893,10 +894,24 @@ return {
 		hostapd.ubus.disconnect();
 	},
 	afc_request: function(iface, data) {
-		let ret = ubus.call("afc", "request", { data });
+		let wireless_config = uci.get_all('wireless');
-		if (type(ret) != "object")
+		for (let l, afc_server in wireless_config) {
-			return;
+			if (afc_server['.type'] == 'afc-server' && afc_server.url && data) {
-		return ret.data;
+				hostapd.printf(`Sending AFC request: ${data}`);
+				writefile("/tmp/afc-request.json", data);
+
+				if (afc_server.access_token)
+					system(`curl -s -X POST ${afc_server.url} -H \'accept: \*\/\*\' -H \'Authorization: Bearer ${afc_server.access_token}\' -H \'Content-Type: application/json\' -d \'${data}\' --output /tmp/afc-response.json`);
+				else if (afc_server.cert)
+					system(`curl -s -X POST ${afc_server.url} -H \'accept: \*\/\*\' --cert \'${afc_server.cert}\' -H \'Content-Type: application/json\' -d \'${data}\' --output /tmp/afc-response.json`);
+
+				let afc_response = (readfile("/tmp/afc-response.json"));
+				if (afc_response)
+					return afc_response;
+				else
+					return;
+			}
+		}
 	},
 	bss_add: function(name, obj) {
 		bss_event("add", name);

feeds/ipq807x_v5.4/ipq50xx/base-files/etc/hotplug.d/firmware/10-ath11k-caldata

@@ -251,6 +251,44 @@ ath11k-macs)
 		;;
 	esac
 	;;
+ath11k/IPQ5018/hw1.0/board.bin)
+	case "$board" in
+	cig,wf186w|\
+	cig,wf186h|\
+	sonicfi,rap630c-311g|\
+	sonicfi,rap630w-311g)
+		country=`cat /etc/ucentral/country`
+		if [ "$country" == "AU" ]; then
+			ln -s /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.AU /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin
+		elif [ "$country" == "CA" ]; then
+			ln -s /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin
+		elif [ "$country" == "SG" ]; then
+			ln -s /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.SG /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin
+		else
+			ln -s /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin
+		fi
+		;;
+	esac
+	;;
+ath11k/qcn6122/hw1.0/board.bin)
+	case "$board" in
+	cig,wf186w|\
+	cig,wf186h|\
+	sonicfi,rap630c-311g|\
+	sonicfi,rap630w-311g)
+		country=`cat /etc/ucentral/country`
+		if [ "$country" == "AU" ]; then
+			ln -s /lib/firmware/ath11k/qcn6122/hw1.0/board.bin.AU /lib/firmware/ath11k/qcn6122/hw1.0/board.bin
+		elif [ "$country" == "CA" ]; then
+			ln -s /lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA /lib/firmware/ath11k/qcn6122/hw1.0/board.bin
+		elif [ "$country" == "SG" ]; then
+			ln -s /lib/firmware/ath11k/qcn6122/hw1.0/board.bin.SG /lib/firmware/ath11k/qcn6122/hw1.0/board.bin
+		else
+			ln -s /lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US /lib/firmware/ath11k/qcn6122/hw1.0/board.bin
+		fi
+		;;
+	esac
+	;;
 *)
 	exit 1
 	;;

feeds/ipq807x_v5.4/ipq50xx/base-files/lib/upgrade/platform.sh

@@ -107,29 +107,42 @@ platform_do_upgrade() {
 
 	board=$(board_name)
 	case $board in
-	glinet,b3000|\
 	edgecore,oap101|\
 	edgecore,oap101-6e|\
 	edgecore,oap101e|\
 	edgecore,oap101e-6e|\
 	edgecore,eap104)
+		if [ "$(find_mtd_chardev rootfs)" ]; then
+			CI_UBIPART="rootfs"
+		else
+			if grep -q rootfs1 /proc/cmdline; then
+				CI_UBIPART="rootfs2"
+				CI_FWSETENV="active 2"
+			else
+				CI_UBIPART="rootfs1"
+				CI_FWSETENV="active 1"
+			fi
+		fi
+		nand_upgrade_tar "$1"
+		;;
+	glinet,b3000)
 		CI_UBIPART="rootfs1"
 		[ "$(find_mtd_chardev rootfs)" ] && CI_UBIPART="rootfs"
 		nand_upgrade_tar "$1"
 		;;
-        hfcl,ion4x_w|\
+	hfcl,ion4x_w|\
 	hfcl,ion4xi_w)
-                wp_part=$(fw_printenv primary | cut  -d = -f2)
+		wp_part=$(fw_printenv primary | cut  -d = -f2)
-                echo "Current Primary is $wp_part"
+		echo "Current Primary is $wp_part"
-                if [[ $wp_part == 1 ]]; then
+		if [[ $wp_part == 1 ]]; then
-                        CI_UBIPART="rootfs"
+				CI_UBIPART="rootfs"
-                        CI_FWSETENV="primary 0"
+				CI_FWSETENV="primary 0"
-                else
+		else
-                        CI_UBIPART="rootfs_1"
+				CI_UBIPART="rootfs_1"
-                        CI_FWSETENV="primary 1"
+				CI_FWSETENV="primary 1"
-                fi
+		fi
-                nand_upgrade_tar "$1"
+		nand_upgrade_tar "$1"
-                ;;
+		;;
 	cig,wf186w|\
 	cig,wf186h|\
 	emplus,wap385c|\

feeds/ipq807x_v5.4/qca-ssdk/patches/500-define-mib-loop-cnt-to-gobal.patch

@@ -0,0 +1,61 @@
+--- a/include/init/ssdk_plat.h
++++ b/include/init/ssdk_plat.h
+@@ -330,6 +330,7 @@ struct qca_phy_priv {
+ 	struct mii_bus *miibus;
+ /*qca808x_end*/
+ 	u64 *mib_counters;
++	a_uint32_t mib_loop_cnt;
+ 	/* dump buf */
+ 	a_uint8_t  buf[2048];
+ 	a_uint32_t link_polling_required;
+--- a/src/ref/ref_mib.c
++++ b/src/ref/ref_mib.c
+@@ -479,39 +479,37 @@ qca_ar8327_sw_get_port_mib(struct switch
+ #endif
+
+ int
+-_qca_ar8327_sw_capture_port_tx_counter(struct qca_phy_priv *priv, int port)
++_qca_ar8327_sw_capture_port_tx_counter(a_uint32_t dev_id, int port)
+ {
+     fal_mib_info_t  mib_Info;
+
+     memset(&mib_Info, 0, sizeof(fal_mib_info_t));
+-    fal_get_tx_mib_info(priv->device_id, port, &mib_Info);
++    fal_get_tx_mib_info(dev_id, port, &mib_Info);
+
+     return 0;
+ }
+
+ int
+-_qca_ar8327_sw_capture_port_rx_counter(struct qca_phy_priv *priv, int port)
++_qca_ar8327_sw_capture_port_rx_counter(a_uint32_t dev_id, int port)
+ {
+     fal_mib_info_t  mib_Info;
+
+     memset(&mib_Info, 0, sizeof(fal_mib_info_t));
+-    fal_get_rx_mib_info(priv->device_id, port, &mib_Info);
++    fal_get_rx_mib_info(dev_id, port, &mib_Info);
+     return 0;
+ }
+
+ void
+ qca_ar8327_sw_mib_task(struct qca_phy_priv *priv)
+ {
+-	static int loop = 0;
+-
+ 	mutex_lock(&priv->reg_mutex);
+-	if ((loop % 2) == 0)
+-		_qca_ar8327_sw_capture_port_rx_counter(priv, loop/2);
++	if ((priv->mib_loop_cnt % 2) == 0)
++		_qca_ar8327_sw_capture_port_rx_counter(priv->device_id, priv->mib_loop_cnt/2);
+ 	else
+-		_qca_ar8327_sw_capture_port_tx_counter(priv, loop/2);
++		_qca_ar8327_sw_capture_port_tx_counter(priv->device_id, priv->mib_loop_cnt/2);
+
+-	if(++loop == (2 * (priv->ports))) {
+-		loop = 0;
++	if(++priv->mib_loop_cnt == (2 * (priv->ports))) {
++		priv->mib_loop_cnt = 0;
+ 	}
+
+ 	mutex_unlock(&priv->reg_mutex);

feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-edgecore-eap111.dts

@@ -200,7 +200,7 @@
 			phy-mode = "sgmii";
 			full-duplex;
 			pause;
-			airoha,surge = <1>;
+			airoha,surge = <0>;
 			airoha,polarity = <2>;
 		};
 

feeds/mediatek-sdk/mediatek/mt7981/base-files/etc/hotplug.d/iface/99-mtk-sr-scene-cond

@@ -34,13 +34,11 @@ case "$board" in
 
         if [ -f "$phy0_file" ]; then
             check_phy0=$(cat $phy0_file)
-            echo "check_phy0 = $check_phy0"
             [ "$check_phy0" == 0 ] && echo 1 > $phy0_file
         fi
 
         if [ -f "$phy1_file" ]; then
             check_phy1=$(cat $phy1_file)
-            echo "check_phy1 = $check_phy1"
             [ "$check_phy1" == 0 ] && echo 1 > $phy1_file
         fi
 

feeds/morse/utils/morse_mesh11sd/patches/002-remove-mesh-ifname-setting.patch

@@ -1,107 +0,0 @@
-# Description: The Mesh11sd daemon expects the mesh interface name to follow the format 'mesh<index>'. 
-# If it doesn't find this format, it attempts to set it in the UCI wireless configuration. 
-# However, when operating in other modes such as AP, STA, or Ad-Hoc, the script was patched to remove 
-# the mesh interface name from UCI. This process can lead to a race condition between the UI and Mesh11sd,
-# resulting in stale interface name values.
-# This patch resolves the issue by removing the setting of the interface name from the script, as it is 
-# now managed through the UI, ensuring consistency and eliminating the race condition.
-
---- a/src/mesh11sd
-+++ b/src/mesh11sd
-@@ -387,45 +387,45 @@ elif [ "$1" = "daemon" ]; then
- 
- 		if [ $mode -eq 5 ]; then
- 			# startup=4, statusmode=0, enabled=1
-+			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
- 			startup=0
- 			statusmode=0
- 			mode=1
--			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
- 
- 		elif [ $mode -eq 4 ]; then
- 			# startup=4, statusmode=0, enabled=0
-+			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 			startup=0
- 			statusmode=2
- 			mode=0
--			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 
- 		elif [ $mode -eq 3 ]; then
- 			# startup=0, statusmode=2, enabled=1
-+			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
- 			startup=0
- 			statusmode=0
- 			mode=1
--			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
- 
- 		elif [ $mode -eq 2 ]; then
- 			# startup=0, statusmode=2, enabled=0
-+			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 			startup=0
- 			statusmode=2
- 			mode=0
--			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 
- 		elif [ $mode -eq 1 ]; then
- 			# startup=0, statusmode=0, enabled=1
-+			syslogmessage="mesh11sd v$version has started, mesh management mode $mode"
- 			startup=0
- 			statusmode=0
- 			mode=1
--			syslogmessage="mesh11sd v$version has started, mesh management mode $mode"
- 
- 		elif [ $mode -eq 0 ]; then
- 			# startup=0, statusmode=0, enabled=0
-+			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 			startup=0
- 			statusmode=2
- 			mode=0
--			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 		fi
- 
- 		if [ $mode -ne $lastmode ]; then
-@@ -441,26 +441,6 @@ elif [ "$1" = "daemon" ]; then
- 			meshconfigs=$(uci show wireless 2> /dev/null | grep "mode='mesh'" | awk -F ".mode='mesh'" '{printf "%s " $1}')
- 
- 			if [ ! -z "$meshconfigs" ]; then
--				for meshconfig in $meshconfigs; do
--					ifname=$(uci get $meshconfig.ifname 2> /dev/null)
--
--					if [ -z "$ifname" ] || [ "$ifname" != "mesh$meshindex" ]; then
--						# No interface name in config, so add one
--						ucibatch="set $meshconfig.ifname='mesh$meshindex'"
--						echo "$ucibatch" | uci batch
--						changed=1
--						syslogmessage="Setting mesh interface name to [ mesh$meshindex ]"
--						write_to_syslog
--					fi
--					meshindex=$(($meshindex+1))
--				done
--
--				if [ "$changed" -eq 1 ]; then
--					changed=0
--					restart_mesh
--					continue
--				fi
--
- 				# get a list of interfaces
- 				get_mesh_iflist
- 
-@@ -482,13 +462,13 @@ elif [ "$1" = "daemon" ]; then
- 						# this is not a mesh interface
- 						continue
- 					else
--						# Check if this interface has a uci ifname
--						uciname=$(uci show wireless | grep "ifname='$iface'" | awk -F "." '{printf "wireless.%s" $2}')
-+						# Check if this interface mode is 'mesh'
-+						uciname=$(uci show wireless | grep "mode='mesh'" | awk -F "." '{printf "wireless.%s" $2}')
- 
- 						if [ -z "$uciname" ]; then
--							# Error - No interface name in config, we should have added one
-+							# Error - No interface with mode as mesh
- 							debugtype="err"
--							syslogmessage="Error getting mesh interface name"
-+							syslogmessage="Error getting mesh interface section"
- 							write_to_syslog
- 							continue
- 						fi

feeds/morse/utils/morse_mesh11sd/patches/002-remove-mesh-ifname-upon-disable.patch

@@ -0,0 +1,63 @@
+# Description: The Mesh11sd daemon sets the interface name 'mesh<index>' to the mesh interface.
+# However, even after disabling the mesh mode, this interface name persists, leading to confusion
+# when operating in other modes like AP/STA/Ad-Hoc, where the interface name continues to display as 'mesh<idx>'.
+# This patch addresses the issue by removing the 'mesh<idx>' interface name from the configuration when the device
+# is no longer in mesh mode. As this modification is not present in the upstream version, it is necessary to apply
+# this local patch to resolve the inconsistency
+
+diff --git a/src/mesh11sd b/src/mesh11sd
+index 85041d3..5f50e97 100755
+--- a/src/mesh11sd
++++ b/src/mesh11sd
+@@ -387,45 +387,45 @@ elif [ "$1" = "daemon" ]; then
+ 
+ 		if [ $mode -eq 5 ]; then
+ 			# startup=4, statusmode=0, enabled=1
++			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 			startup=0
+ 			statusmode=0
+ 			mode=1
+-			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 
+ 		elif [ $mode -eq 4 ]; then
+ 			# startup=4, statusmode=0, enabled=0
++			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 			startup=0
+ 			statusmode=2
+ 			mode=0
+-			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 
+ 		elif [ $mode -eq 3 ]; then
+ 			# startup=0, statusmode=2, enabled=1
++			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 			startup=0
+ 			statusmode=0
+ 			mode=1
+-			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 
+ 		elif [ $mode -eq 2 ]; then
+ 			# startup=0, statusmode=2, enabled=0
++			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 			startup=0
+ 			statusmode=2
+ 			mode=0
+-			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 
+ 		elif [ $mode -eq 1 ]; then
+ 			# startup=0, statusmode=0, enabled=1
++			syslogmessage="mesh11sd v$version has started, mesh management mode $mode"
+ 			startup=0
+ 			statusmode=0
+ 			mode=1
+-			syslogmessage="mesh11sd v$version has started, mesh management mode $mode"
+ 
+ 		elif [ $mode -eq 0 ]; then
+ 			# startup=0, statusmode=0, enabled=0
++			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 			startup=0
+ 			statusmode=2
+ 			mode=0
+-			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 		fi
+ 
+ 		if [ $mode -ne $lastmode ]; then

feeds/morse/utils/morse_mesh11sd/patches/003-accton_fix_ifname_confliction.patch

@@ -0,0 +1,39 @@
+--- a/src/mesh11sd	2024-09-06 17:13:52.075070001 +0800
++++ b/src/mesh11sd	2024-09-06 17:47:36.326914438 +0800
+@@ -434,7 +434,6 @@
+ 		fi
+ 
+ 		lastmode=$mode
+-		meshindex=0
+ 
+ 		if [ "$enabled" = 1 ]; then
+ 			#get list of mesh configs
+@@ -443,16 +442,19 @@
+ 			if [ ! -z "$meshconfigs" ]; then
+ 				for meshconfig in $meshconfigs; do
+ 					ifname=$(uci get $meshconfig.ifname 2> /dev/null)
+-
+-					if [ -z "$ifname" ] || [ "$ifname" != "mesh$meshindex" ]; then
+-						# No interface name in config, so add one
+-						ucibatch="set $meshconfig.ifname='mesh$meshindex'"
+-						echo "$ucibatch" | uci batch
+-						changed=1
+-						syslogmessage="Setting mesh interface name to [ mesh$meshindex ]"
+-						write_to_syslog
++					device=$(uci -q get $meshconfig.device)
++					device_type=$(uci -q get wireless.$device.type)
++					new_ifname="halow_mesh"
++					if [ "$device_type" == "morse" ]; then
++						if [ -z "$ifname" ] || [ "$ifname" != "$new_ifname" ]; then
++							# No interface name in config, so add one
++							ucibatch="set $meshconfig.ifname='$new_ifname'"
++							echo "$ucibatch" | uci batch
++							changed=1
++							syslogmessage="Setting mesh interface name to [ $new_ifname ]"
++							write_to_syslog
++						fi
+ 					fi
+-					meshindex=$(($meshindex+1))
+ 				done
+ 
+ 				if [ "$changed" -eq 1 ]; then

feeds/morse/utils/wpa_supplicant_s1g/Config.in

@@ -2,7 +2,7 @@ if PACKAGE_wpa_supplicant_s1g
 
 	config MORSE_WPA_SUPPLICANT_S1G_MESH_NETWORKING
 		bool
-		default n
+		default y
 		prompt "Enable mesh networking support"
 
 	config MORSE_WPA_SUPPLICANT_S1G_EAP

feeds/qca-wifi-7/ath12k-wifi/Makefile

@@ -43,6 +43,11 @@ $(call Package/ath12k-wifi-default)
     TITLE:=board-2.bin for EAP105
 endef
 
+define Package/ath12k-wifi-emplus-wap7635
+$(call Package/ath12k-wifi-default)
+    TITLE:=board-2.bin for WAP7635
+endef
+
 define Package/ath12k-wifi-sonicfi-rap7110c-341x
 $(call Package/ath12k-wifi-default)
     TITLE:=board-2.bin for RAP7710c_341x
@@ -96,8 +101,8 @@ endef
 define Package/ath12k-wifi-cig-wf189/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.wf189.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.wf189-us.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.US
-	$(INSTALL_DATA) ./board-2.bin.wf189.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.wf189-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
 endef
 
 define Package/ath12k-wifi-edgecore-eap105/install
@@ -107,11 +112,22 @@ define Package/ath12k-wifi-edgecore-eap105/install
 	$(INSTALL_DATA) ./board-2.bin.eap105.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
 endef
 
+define Package/ath12k-wifi-emplus-wap7635/install
+	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
+	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
+	$(INSTALL_DATA) ./board-2.bin.wap7635.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.wap7635.QCN6274 $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+endef
+
 define Package/ath12k-wifi-sonicfi-rap7110c-341x/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x-us.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.US
-	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x-au.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.AU
+	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x-au.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.AU
+	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x-sg.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.SG
+	$(INSTALL_DATA) ./board-2.bin.rap7110c_341x-sg.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.SG
 endef
 
 define Package/ath12k-wifi-sonicfi-rap750e-h/install
@@ -135,8 +151,12 @@ endef
 define Package/ath12k-wifi-sonicfi-rap750w-311a/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN6432/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.rap750w_311a.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.rap750w_311a-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
-	$(INSTALL_DATA) ./board-2.bin.rap750w_311a.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.rap750w_311a-us.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.rap750w_311a-au.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.AU
+	$(INSTALL_DATA) ./board-2.bin.rap750w_311a-au.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.AU
+	$(INSTALL_DATA) ./board-2.bin.rap750w_311a-sg.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.SG
+	$(INSTALL_DATA) ./board-2.bin.rap750w_311a-sg.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.SG
 #	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/regdb.bin
 	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
 endef
@@ -144,8 +164,8 @@ endef
 define Package/ath12k-wifi-cig-wf189w/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN6432/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.189w.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.189w-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
-	$(INSTALL_DATA) ./board-2.bin.189w.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.189w-us.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.US
 	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
 endef
 
@@ -153,8 +173,8 @@ endef
 define Package/ath12k-wifi-cig-wf189h/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN6432/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.189h.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.189h-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
-	$(INSTALL_DATA) ./board-2.bin.189h.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.189h-us.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.US
 	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
 endef
 
@@ -182,12 +202,13 @@ endef
 define Package/ath12k-wifi-cig-wf672/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.wf672.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.wf672-us.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.US
-	$(INSTALL_DATA) ./board-2.bin.wf672.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.wf672-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
 endef
 
 $(eval $(call BuildPackage,ath12k-wifi-cig-wf189))
 $(eval $(call BuildPackage,ath12k-wifi-edgecore-eap105))
+$(eval $(call BuildPackage,ath12k-wifi-emplus-wap7635))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap7110c-341x))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap750e-h))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap750e-s))

feeds/qca-wifi-7/ath12k-wifi/board-2-rap7110c_341x-IPQ5332.json

@@ -1,20 +0,0 @@
-[
-    {
-        "board": [
-            {
-                "names": [
-                    "bus=ahb,qmi-chip-id=0,qmi-board-id=18"
-                ],
-                "data": "rap7110c_341x-IPQ5332.bin"
-            }
-        ],
-        "regdb": [
-            {
-                "names": [
-                    "bus=ahb,qmi-chip-id=0,qmi-board-id=255"
-                ],
-                "data": "ipq5332.regdb"
-            }
-        ]
-    }
-]

feeds/qca-wifi-7/ath12k-wifi/board-2-rap7110c_341x-QCN92XX.json

@@ -1,20 +0,0 @@
-[
-    {
-        "board": [
-            {
-                "names": [
-                    "bus=pci,qmi-chip-id=0,qmi-board-id=4117"
-                ],
-                "data": "rap7110c_341x-QCN92xx.bin"
-            }
-        ],
-        "regdb": [
-            {
-                "names": [
-                    "bus=pci,qmi-chip-id=0,qmi-board-id=255"
-                ],
-                "data": "qcn92xx.regdb"
-            }
-        ]
-    }
-]

feeds/qca-wifi-7/hostapd/files/afc_location.uc

@@ -4,19 +4,19 @@ let fs = require("fs");
 let ubus = require('ubus').connect();
 
 let gps_info = ubus.call('gps', 'info');
-let latitude = gps_info.latitude ?? 0;
+let latitude = gps_info.latitude || 0;
-let longitude = gps_info.longitude ?? 0;
+let longitude = gps_info.longitude || 0;
 
 // afc-location.json file content
 let afc_location = {};
 afc_location.location_type = "ellipse";
 afc_location.location = longitude + ":" + latitude ;
-afc_location.height = gps_info.elevation ?? 0;
+afc_location.height = gps_info.elevation || 0;
 afc_location.height_type = "AMSL";
-afc_location.major_axis = gps_info.major_axis ?? 0;
+afc_location.major_axis = int(gps_info.major_axis) || 1;
-afc_location.minor_axis = gps_info.minor_axis ?? 0;
+afc_location.minor_axis = int(gps_info.minor_axis) || 1;
-afc_location.orientation = gps_info.major_orientation ?? 0;
+afc_location.orientation = gps_info.major_orientation || 0;
-afc_location.vertical_tolerance = gps_info.vdop ?? 0;
+afc_location.vertical_tolerance = int(gps_info.vdop) || 1;
 
 let afc_location_json = fs.open("/etc/ucentral/afc-location.json", "w");
 afc_location_json.write(afc_location);

feeds/qca-wifi-7/hostapd/files/hostapd.uc

@@ -1,7 +1,8 @@
 let libubus = require("ubus");
-import { open, readfile } from "fs";
+import { open, readfile, writefile } from "fs";
 import { wdev_remove, is_equal, vlist_new, phy_is_fullmac, phy_open, wdev_set_radio_mask } from "common";
 
+let uci = require('uci').cursor();
 let ubus = libubus.connect(null, 60);
 
 hostapd.data.config = {};
@@ -1006,7 +1007,6 @@ let main_obj = {
 hostapd.data.ubus = ubus;
 hostapd.data.obj = ubus.publish("hostapd", main_obj);
 
-
 let auth_obj = {};
 hostapd.data.auth_obj = ubus.publish("hostapd-auth", auth_obj);
 
@@ -1026,10 +1026,24 @@ return {
 		hostapd.ubus.disconnect();
 	},
 	afc_request: function(iface, data) {
-		let ret = ubus.call("afc", "request", { data });
+		let wireless_config = uci.get_all('wireless');
-		if (type(ret) != "object")
+		for (let l, afc_server in wireless_config) {
-			return;
+			if (afc_server['.type'] == 'afc-server' && afc_server.url && data) {
-		return ret.data;
+				hostapd.printf(`Sending AFC request: ${data}`);
+				writefile("/tmp/afc-request.json", data);
+
+				if (afc_server.access_token)
+					system(`curl -s -X POST ${afc_server.url} -H \'accept: \*\/\*\' -H \'Authorization: Bearer ${afc_server.access_token}\' -H \'Content-Type: application/json\' -d \'${data}\' --output /tmp/afc-response.json`);
+				else if (afc_server.cert)
+					system(`curl -s -X POST ${afc_server.url} -H \'accept: \*\/\*\' --cert \'${afc_server.cert}\' -H \'Content-Type: application/json\' -d \'${data}\' --output /tmp/afc-response.json`);
+
+				let afc_response = (readfile("/tmp/afc-response.json"));
+				if (afc_response)
+					return afc_response;
+				else
+					return;
+			}
+		}
 	},
 	bss_create: function(phy, name, obj) {
 		phy = hostapd.data.config[phy];

feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/01_leds

@@ -7,6 +7,11 @@ board_config_update
 board=$(board_name)
 
 case "$board" in
+emplus,wap7635)
+	ucidef_set_led_default "ledb" "LEDB" "sys:blue" "on"
+	ucidef_set_led_default "ledg" "LEDG" "sys:green" "off"
+	ucidef_set_led_default "ledr" "LEDR" "sys:red" "off"
+	;;
 sercomm,ap72tip-v4|\
 sercomm,ap72tip)
 	ucidef_set_led_default "power" "POWER" "blue:status" "on"

feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network

@@ -13,7 +13,6 @@ ipq53xx_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "eth1 eth2 eth3 eth4 eth5" "eth0"
 		;;
 	cig,wf189|\
-	cig,wf672|\
 	edgecore,eap105|\
 	sercomm,ap72tip|\
 	sonicfi,rap750w-311a)
@@ -32,6 +31,10 @@ ipq53xx_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "eth1" "eth0"
 		ucidef_add_switch "switch1" "0u@eth1" "3:lan" "2:lan"
 		;;
+	cig,wf672)
+		ucidef_set_interface_wan "eth0 eth1"
+		;;
+	emplus,wap7635|\
 	sercomm,ap72tip-v4)
 		ucidef_set_interface_wan "eth0"
 		;;	
@@ -104,6 +107,7 @@ qcom_setup_macs()
                 ucidef_set_wireless_macaddr_base 2g $(macaddr_add "$wan_mac" 2)
                 ucidef_set_wireless_macaddr_base 5g $(macaddr_add "$wan_mac" 3)
                 ;;
+        emplus,wap7635|\
         sercomm,ap72tip-v4)
                 wan_mac=$(cat /sys/class/net/eth0/address)
                 ucidef_set_wireless_macaddr_base 2g $(macaddr_add "$wan_mac" 1)

feeds/qca-wifi-7/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata

@@ -64,6 +64,7 @@ ath12k/IPQ5332/hw1.0/caldata.bin)
 	cig,wf189h|\
 	cig,wf189|\
 	edgecore,eap105|\
+	emplus,wap7635|\
 	sercomm,ap72tip-v4|\
 	sercomm,ap72tip|\
 	zyxel,nwa130be)
@@ -86,6 +87,7 @@ ath12k/QCN92XX/hw1.0/cal-pci-0001:01:00.0.bin)
 	case "$board" in
 	cig,wf189|\
 	edgecore,eap105|\
+	emplus,wap7635|\
 	sercomm,ap72tip-v4|\
 	sercomm,ap72tip|\
 	zyxel,nwa130be)
@@ -124,6 +126,63 @@ ath12k/QCN6432/hw1.0/cal-ahb-soc@0:wifi2@c0000000.bin)
 		;;
 	esac
 	;;
+ath12k/IPQ5332/hw1.0/board-2.bin)
+	case "$board" in
+	cig,wf189|\
+	cig,wf189h|\
+	cig,wf189w|\
+	cig,wf672|\
+	sonicfi,rap7110c-341x|\
+	sonicfi,rap750w-311a)
+		country=`cat /etc/ucentral/country`
+		if [ "$country" == "CA" ]; then
+			ln -s /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.CA /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+		elif [ "$country" == "AU" ]; then
+			ln -s /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.AU /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+		elif [ "$country" == "SG" ]; then
+			ln -s /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.SG /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+		else
+			ln -s /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+		fi
+		;;
+	esac
+	;;
+ath12k/QCN6432/hw1.0/board-2.bin)
+	case "$board" in
+	cig,wf189h|\
+	cig,wf189w|\
+	sonicfi,rap750w-311a)
+		country=`cat /etc/ucentral/country`
+		if [ "$country" == "CA" ]; then
+			ln -s /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.CA /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+		elif [ "$country" == "AU" ]; then
+			ln -s /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.AU /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+		elif [ "$country" == "SG" ]; then
+			ln -s /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.SG /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+		else
+			ln -s /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.US /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+		fi
+		;;
+	esac
+	;;
+ath12k/QCN92XX/hw1.0/board-2.bin)
+	case "$board" in
+	cig,wf189|\
+	cig,wf672|\
+	sonicfi,rap7110c-341x)
+		country=`cat /etc/ucentral/country`
+		if [ "$country" == "CA" ]; then
+			ln -s /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.CA /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+		elif [ "$country" == "AU" ]; then
+			ln -s /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.AU /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+		elif [ "$country" == "SG" ]; then
+			ln -s /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.SG /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+		else
+			ln -s /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.US /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+		fi
+		;;
+	esac
+	;;
 *)
 	exit 1
 	;;

feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh

@@ -136,7 +136,8 @@ platform_do_upgrade() {
 	sercomm,ap72tip|\
 	cig,wf189w|\
 	cig,wf189h|\
-	cig,wf189)
+	cig,wf189|\
+	emplus,wap7635)
 		if [ -f /proc/boot_info/bootconfig0/rootfs/upgradepartition ]; then
 			CI_UBIPART="$(cat /proc/boot_info/bootconfig0/rootfs/upgradepartition)"
 			CI_BOOTCFG=1

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-emplus-wap7635.dts

@@ -0,0 +1,413 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/*
+ * IPQ5332 RDP468 board device tree source
+ *
+ * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+#include "ipq5332.dtsi"
+#include "ipq5332-default-memory.dtsi"
+
+/ {
+	model = "Emplus WAP7635";
+	compatible = "emplus,wap7635", "qcom,ipq5332-ap-mi01.6", "qcom,ipq5332";
+
+	aliases {
+		serial0 = &blsp1_uart0; /*console*/
+		ethernet0 = "/soc/dp1";
+
+        led-boot = &led_power_green;
+        led-failsafe = &led_power_red;
+        led-running = &led_power_green;
+        led-upgrade = &led_power_green;
+	};
+
+	chosen {
+		stdout-path = "serial0";
+	};
+
+	soc@0 {
+		mdio:mdio@90000 {
+			pinctrl-0 = <&mdio1_pins>;
+			pinctrl-names = "default";
+			phy-reset-gpio = <&tlmm 51 GPIO_ACTIVE_LOW>;
+			phyaddr_fixup = <0xC90F018>;
+			uniphyaddr_fixup = <0xC90F014>;
+			mdio_clk_fixup; /* MDIO clock sequence fix up flag */
+			status = "okay";
+
+			phy0: ethernet-phy@0 {
+				reg = <24>;
+			};
+		};
+
+		ess-instance {
+			/*num_devices = <0x1>;*/
+			ess-switch@3a000000 {
+				switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
+				switch_lan_bmp = <0x2>; /* lan port bitmap */
+				switch_wan_bmp = <0>; /* wan port bitmap */
+				switch_mac_mode = <0xf>; /* mac mode for uniphy instance0*/
+				switch_mac_mode1 = <0xd>; /* mac mode for uniphy instance1*/
+				switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/
+
+				qcom,port_phyinfo {
+					port@0 {
+						port_id = <1>;
+						phy_address = <24>;
+						mdiobus = <&mdio>;
+						ethernet-phy-ieee802.3-c45;
+					};
+				};
+			};
+		};
+
+		dp1 {
+			device_type = "network";
+			compatible = "qcom,nss-dp";
+			qcom,id = <1>;
+			reg = <0x3a500000 0x4000>;
+			qcom,mactype = <1>;
+			local-mac-address = [000000000000];
+			mdio-bus = <&mdio>;
+			qcom,phy-mdio-addr = <24>;
+			qcom,link-poll = <1>;
+			phy-mode = "sgmii";
+			/* phy-mode = "usxgmii"; */
+		};
+
+		/* EDMA host driver configuration for the board */
+		edma@3ab00000 {
+			qcom,txdesc-ring-start = <4>;		/* Tx desc ring start ID */
+			qcom,txdesc-rings = <12>;			/* Total number of Tx desc rings to be provisioned */
+			qcom,mht-txdesc-rings = <8>;		/* Extra Tx desc rings to be provisioned for MHT SW ports */
+			qcom,txcmpl-ring-start = <4>;		/* Tx complete ring start ID */
+			qcom,txcmpl-rings = <12>;			/* Total number of Tx complete rings to be provisioned */
+			qcom,mht-txcmpl-rings = <8>;		/* Extra Tx complete rings to be provisioned for mht sw ports. */
+			qcom,rxfill-ring-start = <4>;		/* Rx fill ring start ID */
+			qcom,rxfill-rings = <4>;			/* Total number of Rx fill rings to be provisioned */
+			qcom,rxdesc-ring-start = <12>;		/* Rx desc ring start ID */
+			qcom,rxdesc-rings = <4>;			/* Total number of Rx desc rings to be provisioned */
+			qcom,rx-page-mode = <0>;			/* Rx fill ring page mode */
+			qcom,tx-map-priority-level = <1>;	/* Tx priority level per port */
+			qcom,rx-map-priority-level = <1>;	/* Rx priority level per core */
+			qcom,ppeds-num = <2>;				/* Number of PPEDS nodes */
+
+			/* PPE-DS node format: <Rx-fill Tx-cmpl Rx Tx Queue-base Queue-count> */
+			qcom,ppeds-map = <1 1 1 1 32 8>,		/* PPEDS Node#0 ring and queue map */
+							 <2 2 2 2 40 8>;		/* PPEDS Node#1 ring and queue map */
+			qcom,txdesc-map = <8 9 10 11>,			/* Port0 per-core Tx ring map */
+							  <12 13 14 15>,		/* MHT-Port1 per-core Tx ring map */
+							  <4 5 6 7>,			/* MHT-Port2 per-core Tx ring map/packets from  vp*/
+							  <16 17 18 19>,		/* MHT-Port3 per-core Tx ring map */
+							  <20 21 22 23>;		/* MHT-Port4 per-core Tx ring map */
+			qcom,txdesc-fc-grp-map = <1 2 3 4 5>;	/* Per GMAC flow control group map */
+			qcom,rxfill-map = <4 5 6 7>;			/* Per-core Rx fill ring map */
+			qcom,rxdesc-map = <12 13 14 15>;		/* Per-core Rx desc ring map */
+			qcom,rx-queue-start = <0>;				/* Rx queue start */
+			qcom,rx-ring-queue-map = <0 8 16 24>,	/* Priority 0 queues per-core Rx ring map */
+									 <1 9 17 25>,	/* Priority 1 queues per-core Rx ring map */
+									 <2 10 18 26>,	/* Priority 2 queues per-core Rx ring map */
+									 <3 11 19 27>,	/* Priority 3 queues per-core Rx ring map */
+									 <4 12 20 28>,	/* Priority 4 queues per-core Rx ring map */
+									 <5 13 21 29>,	/* Priority 5 queues per-core Rx ring map */
+									 <6 14 22 30>,	/* Priority 6 queues per-core Rx ring map */
+									 <7 15 23 31>;	/* Priority 7 queues per-core Rx ring map */
+			interrupts = <0 163 4>,					/* Tx complete ring id #4 IRQ info */
+						 <0 164 4>,					/* Tx complete ring id #5 IRQ info */
+						 <0 165 4>,					/* Tx complete ring id #6 IRQ info */
+						 <0 166 4>,					/* Tx complete ring id #7 IRQ info */
+						 <0 167 4>,					/* Tx complete ring id #8 IRQ info */
+						 <0 168 4>,					/* Tx complete ring id #9 IRQ info */
+						 <0 169 4>,					/* Tx complete ring id #10 IRQ info */
+						 <0 170 4>,					/* Tx complete ring id #11 IRQ info */
+						 <0 171 4>,					/* Tx complete ring id #12 IRQ info */
+						 <0 172 4>,					/* Tx complete ring id #13 IRQ info */
+						 <0 173 4>,					/* Tx complete ring id #14 IRQ info */
+						 <0 174 4>,					/* Tx complete ring id #15 IRQ info */
+						 <0 139 4>,					/* Rx desc ring id #12 IRQ info */
+						 <0 140 4>,					/* Rx desc ring id #13 IRQ info */
+						 <0 141 4>,					/* Rx desc ring id #14 IRQ info */
+						 <0 142 4>,					/* Rx desc ring id #15 IRQ info */
+						 <0 191 4>,					/* Misc error IRQ info */
+						 <0 155 4>,					/* RxFill ring id #4 IRQ info */
+						 <0 156 4>,					/* RxFill ring id #5 IRQ info */
+						 <0 157 4>,					/* RxFill ring id #6 IRQ info */
+						 <0 158 4>,					/* RxFill ring id #7 IRQ info */
+						 <0 160 4>,					/* PPEDS Node #1(TxComp ring id #1) TxComplete IRQ info */
+						 <0 128 4>,					/* PPEDS Node #1(Rx Desc ring id #1) Rx Desc IRQ info */
+						 <0 152 4>,					/* PPEDS Node #1(RxFill Desc ring id #1) Rx Fill IRQ info */
+						 <0 161 4>,					/* PPEDS Node #2(TxComp ring id #2) TxComplete IRQ info */
+						 <0 129 4>,					/* PPEDS Node #2(Rx Desc ring id #2) Rx Desc IRQ info */
+						 <0 153 4>,					/* PPEDS Node #2(RxFill Desc ring id #2) Rx Fill IRQ info */
+						 <0 175 4>,					/* MHT port Tx complete ring id #16 IRQ info */
+						 <0 176 4>,					/* MHT port Tx complete ring id #17 IRQ info */
+						 <0 177 4>,					/* MHT port Tx complete ring id #18 IRQ info */
+						 <0 178 4>,					/* MHT port Tx complete ring id #19 IRQ info */
+						 <0 179 4>,					/* MHT port Tx complete ring id #20 IRQ info */
+						 <0 180 4>,					/* MHT port Tx complete ring id #21 IRQ info */
+						 <0 181 4>,					/* MHT port Tx complete ring id #22 IRQ info */
+						 <0 182 4>;					/* MHT port Tx complete ring id #23 IRQ info */
+		};
+
+		leds {
+			compatible = "gpio-leds";
+
+			led_power_blue: led@34 {
+				label = "sys:blue";
+				gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>;
+				default-state = "off";
+			};
+			led_power_green: led@35 {
+				label = "sys:green";
+				gpios = <&tlmm 35 GPIO_ACTIVE_HIGH>;
+				default-state = "off";
+			};
+			led_power_red: led@37 {
+				label = "sys:red";
+				gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>;
+				default-state = "off";
+			};
+		};
+
+		gpio_keys {
+			compatible = "gpio-keys";
+			pinctrl-0 = <&button_pins>;
+			pinctrl-names = "default";
+			button@1 {
+				label = "reset";
+				linux,code = <KEY_RESTART>;
+				gpios = <&tlmm 24 GPIO_ACTIVE_LOW>;
+				linux,input-type = <1>;
+				debounce-interval = <60>;
+			};
+		};
+
+		wsi: wsi {
+			id = <0>;
+			num_chip = <2>;
+			status = "okay";
+			chip_info = <0 1 1>,
+						<1 1 0>;
+		};
+	};
+};
+
+&wifi0 {
+	led-gpio = <&tlmm 36 GPIO_ACTIVE_HIGH>;
+	qcom,rproc = <&q6_wcss_pd1>;
+	qcom,rproc_rpd = <&q6v5_wcss>;
+	qcom,multipd_arch;
+	qcom,userpd-subsys-name = "q6v5_wcss_userpd1";
+	memory-region = <&q6_region>;
+	qcom,wsi = <&wsi>;
+	qcom,wsi_index = <0>;
+	qcom,board_id = <0x16>;
+	status = "okay";
+};
+
+&mhi_region1 {
+	status = "okay";
+};
+
+&qcn9224_pcie1 {
+	status = "okay";
+};
+
+/* QCN9224 5G+6G */
+&wifi4 {
+	hremote_node = <&qcn9224_pcie1>;
+	board_id = <0x1019>;
+	node_id = <0x1>;
+	status = "okay";
+};
+
+&blsp1_uart0 {
+	pinctrl-0 = <&serial_0_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&blsp1_uart1 {
+	pinctrl-0 = <&serial_1_pins>;
+	pinctrl-names = "default";
+	status = "disabled";
+};
+
+&sdhc {
+	bus-width = <4>;
+	max-frequency = <192000000>;
+	mmc-ddr-1_8v;
+	mmc-hs200-1_8v;
+	non-removable;
+	pinctrl-0 = <&sdc_default_state>;
+	pinctrl-names = "default";
+	status = "disabled";
+};
+
+&sleep_clk {
+	clock-frequency = <32000>;
+};
+
+&xo {
+	clock-frequency = <24000000>;
+};
+
+&qpic_bam {
+	status = "okay";
+};
+
+&qpic_nand {
+	pinctrl-0 = <&qspi_default_state>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	nandcs@0 {
+		reg = <0>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		nand-ecc-strength = <8>;
+		nand-ecc-step-size = <512>;
+		nand-bus-width = <8>;
+	};
+};
+
+&pcie1_phy_x2 {
+	status = "okay";
+};
+
+&pcie1 {
+	pinctrl-0 = <&pcie1_default_state>;
+	pinctrl-names = "default";
+	perst-gpios = <&tlmm 45 GPIO_ACTIVE_LOW>;
+	status = "okay";
+
+	pcie1_rp {
+		reg = <0 0 0 0 0>;
+
+		qcom,mhi@1 {
+			reg = <0 0 0 0 0>;
+			boot-args = <0x2 0x4 0x34 0x3 0x0 0x0     /* MX Rail, GPIO52, Drive strength 0x3 */
+						 0x4 0x4 0x18 0x3 0x0 0x0     /* RFA1p2 Rail, GPIO24, Drive strength 0x3 */
+						 0x0 0x4 0x0 0x0 0x0 0x0>;    /* End of arguments */
+			memory-region = <&qcn9224_pcie1>;
+			qcom,wsi = <&wsi>;
+			qcom,wsi_index = <1>;
+			qcom,board_id = <0x1019>;
+		};
+	};
+};
+
+/* PINCTRL */
+
+&tlmm {
+	sdc_default_state: sdc-default-state {
+		clk-pins {
+			pins = "gpio13";
+			function = "sdc_clk";
+			drive-strength = <8>;
+			bias-disable;
+		};
+
+		cmd-pins {
+			pins = "gpio12";
+			function = "sdc_cmd";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+
+		data-pins {
+			pins = "gpio8", "gpio9", "gpio10", "gpio11";
+			function = "sdc_data";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+	};
+
+	spi_0_data_clk_pins: spi-0-data-clk-state {
+		pins = "gpio14", "gpio15", "gpio16";
+		function = "blsp0_spi";
+		drive-strength = <2>;
+		bias-pull-down;
+	};
+
+	spi_0_cs_pins: spi-0-cs-state {
+		pins = "gpio17";
+		function = "blsp0_spi";
+		drive-strength = <2>;
+		bias-pull-up;
+	};
+
+	qspi_default_state: qspi-default-state {
+		qspi_clock {
+			pins = "gpio13";
+			function = "qspi_clk";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		qspi_cs {
+			pins = "gpio12";
+			function = "qspi_cs";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+
+		qspi_data {
+			pins = "gpio8", "gpio9", "gpio10", "gpio11";
+			function = "qspi_data";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+	};
+
+	serial_1_pins: serial1-pinmux { /*ble*/
+		pins = "gpio33", "gpio35";
+		function = "blsp1_uart2";
+		drive-strength = <8>;
+		bias-pull-up;
+	};
+
+	button_pins: button-state {
+		pins = "gpio24";
+		function = "gpio";
+		drive-strength = <8>;
+		bias-pull-up;
+	};
+
+	pcie1_default_state: pcie1-default-state {
+		pins = "gpio45";
+		function = "gpio";
+		drive-strength = <8>;
+		bias-pull-up;
+		output-low;
+	};
+};
+
+&license_manager {
+	status = "okay";
+};
+
+&usb3 {
+	qcom,multiplexed-phy;
+	status = "disabled";
+};
+
+&hs_m31phy_0 {
+	status = "okay";
+};
+
+&hs_m31phy_0 {
+	status = "okay";
+};
+
+&ssuniphy_0 {
+	status = "okay";
+};

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sonicfi-rap7110c-341x.dts

@@ -31,6 +31,20 @@
 		stdout-path = "serial0";
 	};
 
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		ramoops@49c00000 {
+			compatible = "ramoops";
+			reg = <0x0 0x49c00000 0x0 0x100000>;
+			record-size = <0x20000>;
+			console-size = <0x20000>;
+			pmsg-size = <0x20000>;
+		};
+	};
+
 	soc@0 {
 		mdio:mdio@90000 {
 			pinctrl-0 = <&mdio1_pins>;

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sonicfi-rap750e-h.dts

@@ -190,6 +190,14 @@
 		/delete-node/ wcnss@4a900000;
 		/delete-node/ q6_caldb_region@4ce00000;
 
+		ramoops@49c00000 {
+			compatible = "ramoops";
+			reg = <0x0 0x49c00000 0x0 0x100000>;
+			record-size = <0x20000>;
+			console-size = <0x20000>;
+			pmsg-size = <0x20000>;
+		};
+
 		q6_mem_regions: q6_mem_regions@4A900000  {
 		        no-map;
 		        reg = <0x0 0x4A900000 0x0 0x5100000>;

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sonicfi-rap750e-s.dts

@@ -190,6 +190,14 @@
 		/delete-node/ wcnss@4a900000;
 		/delete-node/ q6_caldb_region@4ce00000;
 
+		ramoops@49c00000 {
+			compatible = "ramoops";
+			reg = <0x0 0x49c00000 0x0 0x100000>;
+			record-size = <0x20000>;
+			console-size = <0x20000>;
+			pmsg-size = <0x20000>;
+		};
+
 		q6_mem_regions: q6_mem_regions@4A900000  {
 		        no-map;
 		        reg = <0x0 0x4A900000 0x0 0x5100000>;

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sonicfi-rap750w-311a.dts

@@ -190,6 +190,14 @@
 		/delete-node/ wcnss@4a900000;
 		/delete-node/ q6_caldb_region@4ce00000;
 
+		ramoops@49c00000 {
+			compatible = "ramoops";
+			reg = <0x0 0x49c00000 0x0 0x100000>;
+			record-size = <0x20000>;
+			console-size = <0x20000>;
+			pmsg-size = <0x20000>;
+		};
+
 		q6_mem_regions: q6_mem_regions@4A900000  {
 		        no-map;
 		        reg = <0x0 0x4A900000 0x0 0x5100000>;

feeds/qca-wifi-7/ipq53xx/image/ipq53xx.mk

@@ -52,6 +52,19 @@ define Device/edgecore_eap105
 endef
 TARGET_DEVICES += edgecore_eap105
 
+define Device/emplus_wap7635
+  DEVICE_TITLE := EMPLUS WAP7635
+  DEVICE_DTS := ipq5332-emplus-wap7635
+  DEVICE_DTS_DIR := ../dts
+  DEVICE_DTS_CONFIG := config@mi01.6
+  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
+  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
+  IMAGE/nand-factory.ubi := append-ubi
+  DEVICE_PACKAGES := ath12k-wifi-emplus-wap7635 ath12k-firmware-qcn92xx ath12k-firmware-ipq5332
+endef
+TARGET_DEVICES += emplus_wap7635
+
 define Device/sonicfi_rap7110c_341x
   DEVICE_TITLE := SONICFI RAP7110C-341X
   DEVICE_DTS := ipq5332-sonicfi-rap7110c-341x

feeds/qca-wifi-7/qca-ssdk-qca/Makefile

@@ -100,6 +100,7 @@ endif
 ifdef CONFIG_TARGET_PROFILE
 TARGET_PROFILE=$(subst ",,$(CONFIG_TARGET_PROFILE))
 PATCH_PROFILE_NAME=patches-$(subst DEVICE_,,$(TARGET_PROFILE))
+FILES_PROFILE_NAME=files-$(subst DEVICE_,,$(TARGET_PROFILE))
 endif
 
 QCASSDK_CONFIG_OPTS+= TOOL_PATH=$(TOOLCHAIN_BIN_PATH) \
@@ -202,6 +203,15 @@ define patch_profile
 	$(call PatchDir/Default,$(PKG_BUILD_DIR),./$(PATCH_PROFILE_NAME))
 endef
 
+define files_profile
+
+	if [ -d "./$(FILES_PROFILE_NAME)" ]; then \
+		$(CP) ./$(FILES_PROFILE_NAME)/* ./files/ ; \
+	fi
+endef
+
 Hooks/Prepare/Post += patch_profile
+Hooks/Prepare/Post += files_profile
+
 $(eval $(call KernelPackage,qca-ssdk-qca-nohnat))
 $(eval $(call KernelPackage,qca-ssdk-qca-hnat))

feeds/qca-wifi-7/qca-ssdk-qca/files-zyxel_nwa130be/qca-ssdk

@@ -0,0 +1,317 @@
+#!/bin/sh /etc/rc.common
+# Copyright (c) 2018, 2021, The Linux Foundation. All rights reserved.
+# Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+
+START=16
+
+#!/bin/sh
+ruletype="ip4 ip6"
+side="wan lan"
+qwan="1 3 2 0 5 7 6 4"
+qlan="0 1 2 3 4 5 6 7"
+
+function create_war_acl_rules(){
+	for lw in $side
+	do
+		#echo $lw
+		if [ "$lw" == "wan" ];then
+			listid=254
+			queue=$qwan
+			portmap=0x20
+		else
+			listid=255
+			queue=$qlan
+			portmap=0x1e
+		fi
+		#echo $queue
+		#echo "creating list $listid"
+		ssdk_sh acl list create $listid 255
+		ruleid=0
+		for rt in $ruletype
+		do
+			for qid in $queue
+			do
+				cmd="ssdk_sh acl rule add $listid $ruleid  1 n 0 0"
+				#echo $cmd
+				if [ "$rt" == "ip4" ];then
+					cmd="$cmd ip4 n n n n n n n n n n n n n n n n n n n n n n n n n n n n n"
+					#echo $cmd
+				else
+					cmd="$cmd ip6 n n n n n n n n n n n n n n n n n n n n n n n n n n n n n n n"
+					#echo $cmd
+				fi
+				if [ $ruleid -le 3 ];then
+					#non-zero dscp
+					cmd="$cmd y 0x0 0xff"
+				elif [ $ruleid -le 7 ];then
+					#zero dscp
+					cmd="$cmd n"
+				elif [ $ruleid -le 11 ];then
+					#non-zero dscp
+					cmd="$cmd y 0x0 0xff"
+				else
+					#zero dscp
+					cmd="$cmd n"
+				fi
+				p=$((ruleid/2))
+				cmd="$cmd y mask $((ruleid%2)) 0x1 y mask $((p%2)) 0x1 n n n n n n n n n n n n n n n y n n n n n n n y $qid n n 0 0 n n n n n n n n n n n n n n n n n n n n 0"
+				#echo $cmd
+				$cmd
+				ruleid=`expr $ruleid + 1`
+			done
+		done
+		ssdk_sh acl list bind $listid 0 1 $portmap
+	done
+}
+
+function create_war_cosmap(){
+	ssdk_sh cosmap pri2q set 0 0
+	ssdk_sh cosmap pri2q set 1 0
+	ssdk_sh cosmap pri2q set 2 0
+	ssdk_sh cosmap pri2q set 3 0
+	ssdk_sh cosmap pri2q set 4 1
+	ssdk_sh cosmap pri2q set 5 1
+	ssdk_sh cosmap pri2q set 6 1
+	ssdk_sh cosmap pri2q set 7 1
+	ssdk_sh cosmap pri2ehq set 0 0
+	ssdk_sh cosmap pri2ehq set 1 0
+	ssdk_sh cosmap pri2ehq set 2 0
+	ssdk_sh cosmap pri2ehq set 3 0
+	ssdk_sh cosmap pri2ehq set 4 1
+	ssdk_sh cosmap pri2ehq set 5 1
+	ssdk_sh cosmap pri2ehq set 6 1
+	ssdk_sh cosmap pri2ehq set 7 1
+}
+
+function create_acl_byp_egstp_rules(){
+	chip_ver=$1
+	cmd="ssdk_sh servcode config set 1 n 0 0xfffefc7f 0xffbdff 0 0 0 0 0 0"
+	if [ "$chip_ver" == "0x2000" ] || [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
+		cmd="$cmd 0"
+	fi
+	#echo $cmd
+	$cmd
+
+	ssdk_sh acl list create 56 48
+	#action bypass eg stp check
+	action="y n n n n n n n n n n 0 0 n n n n n n n n n n n n n y n n n n n n n n n n n n y n n n n n n n n n n n n n n n n n n"
+	if [ "$chip_ver" == "0x2000" ]; then
+		action="$action n n 0"
+	elif [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
+		action="$action n n n 0"
+	else
+		action="$action 0"
+	fi
+
+	for ruleid in $( seq 0 2 )
+	do
+		if [ "$ruleid" == "0" ];then
+			cmd="ssdk_sh acl rule add 56 0 1 n 0 0 mac n n n n n y 01-80-c2-00-00-00 ff-ff-ff-ff-ff-ff n n n n n n n n n n n n n n n n n n n n n n n"
+		elif [ "$ruleid" == "1" ];then
+			cmd="ssdk_sh acl rule add 56 1 1 n 0 0 mac n n n n n n n yes 0x8809 0xffff n n n n n n n n n n n n n n n n n n n n n"
+		else
+			cmd="ssdk_sh acl rule add 56 2 1 n 0 0 mac n n n n n n n yes 0x888e 0xffff n n n n n n n n n n n n n n n n n n n n n"
+		fi
+		if [ "$chip_ver" == "0x2000" ] || [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
+			cmd="$cmd n $action"
+		else
+			cmd="$cmd $action"
+		fi
+		#echo $cmd
+		$cmd
+	done
+	ssdk_sh acl list bind 56 0 2 1
+}
+
+function delete_war_acl_rules(){
+	for lw in $side
+	do
+		#echo $lw
+		if [ "$lw" == "wan" ];then
+			listid=254
+			queue=$qwan
+			portmap=0x20
+		else
+			listid=255
+			queue=$qlan
+			portmap=0x1e
+		fi
+		ssdk_sh acl list unbind $listid 0 1 $portmap
+		for rt in $ruletype
+		do
+			for qid in $queue
+			do
+				cmd="ssdk_sh acl rule del $listid 0 1"
+				echo $cmd
+				$cmd
+			done
+		done
+		#echo "deleting list $listid"
+		ssdk_sh acl list destroy $listid
+	done
+}
+
+function delete_war_cosmap(){
+	ssdk_sh cosmap pri2q set 0 0
+	ssdk_sh cosmap pri2q set 1 0
+	ssdk_sh cosmap pri2q set 2 1
+	ssdk_sh cosmap pri2q set 3 1
+	ssdk_sh cosmap pri2q set 4 2
+	ssdk_sh cosmap pri2q set 5 2
+	ssdk_sh cosmap pri2q set 6 3
+	ssdk_sh cosmap pri2q set 7 3
+	ssdk_sh cosmap pri2ehq set 0 1
+	ssdk_sh cosmap pri2ehq set 1 0
+	ssdk_sh cosmap pri2ehq set 2 2
+	ssdk_sh cosmap pri2ehq set 3 2
+	ssdk_sh cosmap pri2ehq set 4 3
+	ssdk_sh cosmap pri2ehq set 5 3
+	ssdk_sh cosmap pri2ehq set 6 4
+	ssdk_sh cosmap pri2ehq set 7 5
+}
+
+function delete_acl_byp_egstp_rules(){
+	chip_ver=$1
+	cmd="ssdk_sh servcode config set 1 n 0 0xfffefcff 0xffbfff 0 0 0 0 0 0"
+	if [ "$chip_ver" == "0x2000" ] || [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
+		cmd="$cmd 0"
+	fi
+	#echo $cmd
+	$cmd
+	ssdk_sh acl list unbind 56 0 2 1
+	ssdk_sh acl rule del 56 0 1
+	ssdk_sh acl rule del 56 1 1
+	ssdk_sh acl rule del 56 2 1
+	ssdk_sh acl list destroy 56
+}
+
+function edma_war_config_add(){
+	create_war_cosmap
+	ssdk_sh acl status set enable
+	create_war_acl_rules
+}
+
+function edma_war_config_del(){
+	delete_war_acl_rules
+	delete_war_cosmap
+}
+
+function ipq50xx_serdes_monitor () {
+	#if qca808x phy exist, need to monitor the serdes to avoid the effect for WIFI
+	port_id=2
+	old_linkstatus="DISABLE"
+	phy_id_info=`ssdk_sh port phyid get $port_id | grep Org | awk -F '!' '{print $2}'`
+	if [ "$phy_id_info" = "[Org ID]:0x004d[Rev ID]:0xd101" ]; then
+		ssdk_sh debug phy set 29 0xb 0x300d
+		ssdk_sh debug uniphy set 0 0x7ac 0x300d 4
+
+		while true
+		do
+			cur_linkstatus=`ssdk_sh port linkstatus get $port_id | grep Status | awk -F ':' '{print $2}'`
+			#when qca808x phy link status is from down to up, serdes tx would be enabled
+			if [ "$cur_linkstatus" = "ENABLE" ] && [ "$old_linkstatus" = "DISABLE" ]; then
+				ssdk_sh debug phy set 29 0xb 0xb00d
+				ssdk_sh debug uniphy set 0 0x7ac 0xb00d 4
+			fi
+			#when qca808x phy link status is from up to down, serdes tx would be disabled
+			if [ "$cur_linkstatus" = "DISABLE" ] && [ "$old_linkstatus" = "ENABLE" ]; then
+				ssdk_sh debug phy set 29 0xb 0x300d
+				ssdk_sh debug uniphy set 0 0x7ac 0x300d 4
+			fi
+			old_linkstatus=$cur_linkstatus
+		done
+	fi
+}
+
+function ipq53xx_phy_amplitude_set () {
+	#for qca808x phy sgmii, set half amplitude with src_half_swing register
+	port_id=2
+	phy_id_info=`ssdk_sh port phyid get $port_id | grep Org | awk -F '!' '{print $2}'`
+	if [ "$phy_id_info" = "[Org ID]:0x004d[Rev ID]:0xd180" ]; then
+		ssdk_sh debug phy set 5 0x40010087 0x208a
+		ssdk_sh debug phy set 6 0x40010087 0x208a
+		#Set the Reg0x67 bits[7:5]=3’b000 and bit4=1’b1
+		ampl_val=$(eval "ssdk_sh debug phy get 5 0x40010067 | grep SSDK | grep -oE '0x[0-9a-fA-F]+' | sed 's/\(0x..\)./\11/'")
+		ssdk_sh debug phy set 5 0x40010067 $ampl_val
+		ampl_val=$(eval "ssdk_sh debug phy get 6 0x40010067 | grep SSDK | grep -oE '0x[0-9a-fA-F]+' | sed 's/\(0x..\)./\11/'")
+		ssdk_sh debug phy set 6 0x40010067 $ampl_val
+	fi
+}
+
+function ipq53xx_uniphy_amplitude_set () {
+	#for ipq50xx sgmii, set half amplitude with tx_emp_lvl/margin_index and tx_margin
+	ssdk_sh debug uniphy set 0 0x7ac 0xb10d 4
+	ssdk_sh debug uniphy set 0 0x24 0 4
+	ssdk_sh debug uniphy set 1 0x7ac 0xb10d 4
+	ssdk_sh debug uniphy set 1 0x24 0 4
+}
+
+ssdk_dependency() {
+	counter=0
+	[ -e /lib/modules/$(uname -r)/qca-ssdk.ko ] && [ ! -d /sys/module/qca_ssdk ] && {
+		insmod qca-ssdk.ko
+	}
+	while [ ! -d /sys/ssdk ] && [ "$counter" -le 5 ]
+	do
+		sleep 1
+		counter=$((counter+1))
+	done
+}
+
+start() {
+	ssdk_dependency
+	chip_ver=`ssdk_sh debug reg get 0 4 | grep Data | tr -d 'SSDK Init OK![Data]:'`
+	#The following commands should be uncommented to enable EDMA WAR
+	if [ "$chip_ver" = "0x1401" ]; then
+		#edma_war_config_add
+		echo ''
+	fi
+	#The following commands should be uncommented to add acl egress stp bypass rules
+	if [ "$chip_ver" = "0x1500" ] || [ "$chip_ver" = "0x1501" ] || [ "$chip_ver" = "0x2000" ] || [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
+		#create_acl_byp_egstp_rules $chip_ver
+		echo ''
+	fi
+	#The following commands should be uncommented to enable WAR for ipq50xx
+	chip_type_info=`cat tmp/sysinfo/model`
+	result=$(echo $chip_type_info | grep "IPQ5018")
+	if [ "$result" != "" ]; then
+		#ipq50xx_serdes_monitor &
+		#ipq50xx_uniphy_amplitude_set
+		#ipq50xx_phy_amplitude_set
+		echo ''
+	fi
+	if [ "$chip_ver" = "0x2001" ]; then
+		ipq53xx_uniphy_amplitude_set
+		ipq53xx_phy_amplitude_set
+		echo ''
+	fi
+	echo starting
+}
+
+stop() {
+	chip_ver=`ssdk_sh debug reg get 0 4 | grep Data | tr -d 'SSDK Init OK![Data]:'`
+	#The following commands should be uncommented to disable EDMA WAR
+	if [ "$chip_ver" = "0x1401" ]; then
+		#edma_war_config_del
+		echo ''
+	fi
+	#The following commands should be uncommented to delete acl egress stp bypass rules
+	if [ "$chip_ver" = "0x1500" ] || [ "$chip_ver" = "0x1501" ] || [ "$chip_ver" = "0x2000" ] || [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
+		#delete_acl_byp_egstp_rules $chip_ver
+		echo ''
+	fi
+	echo stoping
+}

feeds/tip/certificates/files/etc/init.d/early_boot

@@ -20,6 +20,7 @@ copy_certificates() {
 	[ -z "$country" ] && country=US
 	echo "options cfg80211 ieee80211_regdom="$country > /etc/modules.conf 
 	echo -n $country > /etc/ucentral/country
+	sync
 	exit 0
 }
 

feeds/tip/certificates/files/usr/bin/mount_certs

@@ -6,13 +6,16 @@ check_certificates() {
 
 check_certificates
 
-bootconfig_lookup() {
+tar_part_lookup() {
-	case "$(fw_printenv -n cert_part)" in
+	part="$(fw_printenv -n cert_part)"
-	0)	echo "0:BOOTCONFIG"
+	if [ "$part" -eq 0 ]; then
-		;;
+		echo "$2"
-	1)	echo "0:BOOTCONFIG1"
+		part=1
-		;;
+	else
-	esac
+		echo "$1"
+		part=0
+	fi
+	fw_setenv cert_part $part
 }
 
 . /lib/functions.sh
@@ -26,19 +29,62 @@ cig,wf672)
 	mmc_dev=$(echo $(find_mmc_part "cert") | sed 's/^.\{5\}//')
 	[ -n "$mmc_dev" ] && mount -t ext4 /dev/$mmc_dev /certificates
 	;;
-sonicfi,rap7*)
+sonicfi,rap*)
 	if [ "$(board_name)" = "sonicfi,rap7110c-341x" ]; then
 		mmc_dev=$(echo $(find_mmc_part "certificates") | sed 's/^.\{5\}//')
 		[ -n "$mmc_dev" ] && mount -t ext4 /dev/$mmc_dev /certificates
 	else
 		mtd=$(find_mtd_index certificates)
-		[ -n "$mtd" ] && mount -t ext4 /dev/mtdblock$mtd /certificates
+		if [ "$(head -c 4 /dev/mtd$mtd)" == "hsqs" ]; then
+			mount -t squashfs /dev/mtdblock$mtd /certificates
+			touch /tmp/squashfs
+		else
+			[ -n "$mtd" ] && mount -t ext4 /dev/mtdblock$mtd /certificates
+		fi
 	fi
 	if [ ! -f /certificates/cert.pem ] || [ ! -f /certificates/key.pem ]; then
-		bootconfig=$(bootconfig_lookup)
+		#part=$(tar_part_lookup "0:BOOTCONFIG" "0:BOOTCONFIG1")
-		if [ -n "$bootconfig" ]; then
+		part=$(tar_part_lookup "devinfo" "certificates")
-			mmc_dev=$(echo $(find_mmc_part "$bootconfig") | sed 's/^.\{5\}//')
+		if [ -n "part" ]; then
-			[ -n "$mmc_dev" ] && tar xf /dev/$mmc_dev -C /certificates
+			if [ "$(board_name)" = "sonicfi,rap7110c-341x" ]; then
+				mmc_dev=$(echo $(find_mmc_part "$part") | sed 's/^.\{5\}//')
+				[ -n "$mmc_dev" ] && tar xf /dev/$mmc_dev -C /certificates
+			else
+				mtd=$(find_mtd_index $part)
+				[ -n "$mtd" ] && tar xf /dev/mtdblock$mtd -C /certificates
+			fi
+		fi
+	fi
+	;;
+udaya,a5-id2|\
+yuncore,ax820)
+	mtd=$(find_mtd_index certificates)
+	if [ "$(head -c 4 /dev/mtd$mtd)" == "hsqs" ]; then
+		mount -t squashfs /dev/mtdblock$mtd /mnt
+		cp /mnt/* /certificates
+		umount /mnt
+	fi
+	part=$(tar_part_lookup "insta1" "insta2")
+	if [ -n "insta" ]; then
+		mtd=$(find_mtd_index $part)
+		[ -n "$mtd" ] && tar xf /dev/mtdblock$mtd -C /certificates
+	fi
+	;;
+sonicfi,rap9*)
+echo "@@@ mount certificates with rapXXX" > /dev/console
+	mtd=$(find_mtd_index certificates)
+	if [ "$(head -c 4 /dev/mtd$mtd)" == "hsqs" ]; then
+		mount -t squashfs /dev/mtdblock$mtd /mnt
+		cp /mnt/* /certificates
+		touch /tmp/squashfs
+		rm -f /certificates/ucentral.defaults
+		umount /mnt
+	fi
+	if [ ! -f /certificates/cert.pem ] || [ ! -f /certificates/key.pem ]; then
+		part=$(tar_part_lookup "devinfo" "certificates")
+		if [ -n "$part" ]; then
+			mtd=$(find_mtd_index $part)
+			[ -n "$mtd" ] && tar xf /dev/mtdblock$mtd -C /certificates
 		fi
 	fi
 	;;

feeds/tip/certificates/files/usr/bin/store_certs

@@ -1,25 +1,44 @@
 #!/bin/sh
 
-bootconfig_lookup() {
+tar_part_lookup() {
-	bootconfig="$(fw_printenv -n cert_part)"
+	part="$(fw_printenv -n cert_part)"
-	case "$(fw_printenv -n cert_part)" in
+	if [ "$part" -eq 0 ]; then
-	0)	echo "0:BOOTCONFIG1"
+		echo "$2"
-		bootconfig=1
+		part=1
-		;;
+	else
-	*)	echo "0:BOOTCONFIG"
+		echo "$1"
-		bootconfig=0
+		part=0
-		;;
+	fi
-	esac
+	fw_setenv cert_part $part
-	fw_setenv cert_part $bootconfig
 }
 
 . /lib/functions.sh
 case "$(board_name)" in
 sonicfi,rap7110c-341x)
 	cd /certificates
-	tar cf /tmp/certs.tar
+	tar cf /tmp/certs.tar .
-	bootconfig=$(bootconfig_lookup)
+	part=$(tar_part_lookup "0:BOOTCONFIG" "0:BOOTCONFIG1")
-	mmc_dev=$(echo $(find_mmc_part $bootconfig) | sed 's/^.\{5\}//')
+	mmc_dev=$(echo $(find_mmc_part $part) | sed 's/^.\{5\}//')
-	dd if=/tmp/certs.tar of=/dev/$bootconfig
+	dd if=/tmp/certs.tar of=/dev/$mmc_dev
+	;;
+udaya,a5-id2|\
+yuncore,ax820)
+	cd /certificates
+	tar cf /tmp/certs.tar .
+	part=$(tar_part_lookup "insta1" "insta2")
+	mtd=$(find_mtd_index $part)
+	dd if=/tmp/certs.tar of=/dev/mtdblock$mtd
+	;;
+sonicfi,rap6*)
+	if [ "$(fw_printenv -n store_certs_disabled)" != "1" ]; then
+		cd /certificates
+		tar cf /tmp/certs.tar .
+		part=$(tar_part_lookup "devinfo" "certificates")
+		mtd=$(find_mtd_index $part)
+		block_size=$(cat /sys/class/mtd/mtd$mtd/size)
+		dd if=/tmp/certs.tar of=/tmp/certs_pad.tar bs=$block_size conv=sync
+		mtd write /tmp/certs_pad.tar /dev/mtd$mtd
+		rm -f /tmp/certs.tar /tmp/certs_pad.tar
+	fi
 	;;
 esac

feeds/tip/cloud_discovery/files/etc/init.d/cloud_discover

@@ -22,6 +22,19 @@ start_service() {
 	[ "$valid" == "true" ] || 
 		/usr/share/ucentral/ucentral.uc /etc/ucentral/ucentral.cfg.0000000001 > /dev/null
 
+	est_client check
+	[ $? -eq 1 ] && {
+		logger ERROR
+		logger ERROR
+		logger ERROR
+		logger The certificate used has a CN that does not match the serial of the device
+		echo The certificate used has a CN that does not match the serial of the device
+		logger ERROR
+		logger ERROR
+		logger ERROR
+		return
+	}
+
 	procd_open_instance
 	procd_set_param command "$PROG"
 	procd_set_param respawn

feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery

@@ -15,9 +15,14 @@ const ONLINE = 2;
 const OFFLINE = 3;
 const ORPHAN = 4;
 
+const DISCOVER_DHCP = "DHCP";
+const DISCOVER_FLASH = "FLASH";
+const DISCOVER_LOOKUP = "OpenLAN";
+
 let ubus = libubus.connect();
 let uci = libuci.cursor();
 let state = DISCOVER;
+let discovery_method = "";
 let validate_time;
 let offline_time;
 let orphan_time;
@@ -27,6 +32,8 @@ let timeouts = {
 	'validate': 120,
 	'orphan': 2 * 60 * 60,
 	interval: 10000,
+	expiry_interval: 60 * 60 * 1000,
+	expiry_threshold: 1 * 365 * 24 * 60 * 60,
 };
 
 ulog_open(ULOG_SYSLOG | ULOG_STDIO, LOG_DAEMON, "cloud_discover");
@@ -35,6 +42,22 @@ ulog(LOG_INFO, 'Start\n');
 
 uloop.init();
 
+let cds_server = 'discovery.open-lan.org';
+
+function detect_certificate_type() {
+	let pipe = fs.popen(`openssl x509 -in /etc/ucentral/cert.pem -noout -issuer`);
+	let issuer = pipe.read("all");
+	pipe.close();
+
+	if (!match(issuer, /Telecom Infra Project Issuing CA/)) {
+		ulog(LOG_INFO, 'Certificate type is "Demo" \n');
+		cds_server = 'discovery-qa.open-lan.org';
+		timeouts.expiry_threshold = 3 * 24 * 60 * 60;
+	} else {
+		ulog(LOG_INFO, 'Certificate type is "TIP"\n');
+	}
+}
+
 function readjsonfile(path) {
 	let file = fs.readfile(path);
 	if (file)
@@ -76,6 +99,14 @@ function gateway_load() {
 	return readjsonfile('/etc/ucentral/gateway.json');
 }
 
+function discovery_state_write() {
+	let discovery_state = {
+		"type": discovery_method,
+		"updated": time()
+	};
+	fs.writefile('/etc/ucentral/discovery.state.json', discovery_state);
+}
+
 function gateway_write(data) {
 	let gateway = gateway_load();
 	gateway ??= {};
@@ -89,8 +120,10 @@ function gateway_write(data) {
 		if (new[key] != gateway[key])
 			changed = true;
 	}
-	if (changed)
+	if (changed) {
 		fs.writefile('/etc/ucentral/gateway.json', new);
+		system('sync');
+	}
 	return changed;
 }
 
@@ -127,6 +160,7 @@ function set_state(set) {
 		if (prev == VALIDATING) {
 			ulog(LOG_INFO, 'Setting cloud controller to validated\n');
 			gateway_write({ valid: true });
+			discovery_state_write();
 		}
 		break;
 
@@ -161,7 +195,7 @@ function redirector_lookup() {
 	let serial = uci.get('system', '@system[-1]', 'mac');
 
 	fs.unlink(path);
-	system(`curl -k --cert /etc/ucentral/operational.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/operational.ca https://openlan.keys.tip.build/v1/devices/${serial} --output /tmp/ucentral.redirector`);
+	system(`curl -k --cert /etc/ucentral/operational.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/operational.ca https://${cds_server}/v1/devices/${serial} --output /tmp/ucentral.redirector`);
 	if (!fs.stat(path))
 		return;
 	let redir = readjsonfile(path);
@@ -224,15 +258,18 @@ function interval_handler() {
 		if (!time_is_valid())
 			return;
 
+		discovery_method = DISCOVER_DHCP;
 		if (discover_dhcp())
 			return;
 
 		if (system('/usr/bin/est_client enroll'))
 			return;
 
+		discovery_method = DISCOVER_FLASH;
 		if (!discover_flash())
 			return;
 
+		discovery_method = DISCOVER_LOOKUP;
 		redirector_lookup();
 		break;
 
@@ -252,6 +289,36 @@ function interval_handler() {
 	}
 }
 
+function trigger_reenroll() {
+	ulog(LOG_INFO, 'triggering reenroll\n');
+
+	if (system('/usr/bin/est_client reenroll')) {
+		ulog(LOG_INFO, 'reenroll failed\n');
+		return;
+	}
+	
+	ulog(LOG_INFO, 'reenroll succeeded\n');
+	ulog(LOG_INFO, 'stopping client\n');
+	
+	system('/etc/init.d/ucentral stop');
+	set_state(DISCOVER);
+}
+
+function expiry_handler() {
+	let stat = fs.stat('/etc/ucentral/operational.ca');
+	if (!stat)
+		return;
+
+	let ret = system(`openssl x509 -checkend ${timeouts.expiry_threshold} -noout -in /certificates/operational.pem`);
+	if (!ret) {
+		ulog(LOG_INFO, 'checked certificate expiry - all ok\n');
+		return;
+	}
+
+	ulog(LOG_INFO, 'certificate will expire soon\n');
+	trigger_reenroll();
+}
+
 let ubus_methods = {
 	discover: {
 		call: function(req) {
@@ -326,8 +393,17 @@ let ubus_methods = {
 		},
 		args: {},
 	},
+	reenroll: {
+		call: function(req) {
+			trigger_reenroll();
+			return 0;
+		},
+		args: {},
+	},
 };
 
+detect_certificate_type();
+
 if (gateway_available()) {
 	let status = ubus.call('ucentral', 'status');
 	ulog(LOG_INFO, 'cloud is known\n');
@@ -344,6 +420,7 @@ if (gateway_available()) {
 timeouts_load();
 
 interval = uloop.interval(timeouts.interval, interval_handler);
+uloop.interval(timeouts.expiry_interval, expiry_handler);
 
 ubus.publish('cloud', ubus_methods);
 

feeds/tip/cloud_discovery/files/usr/bin/est_client

@@ -4,12 +4,26 @@
 
 import { ulog_open, ulog, ULOG_SYSLOG, ULOG_STDIO, LOG_DAEMON, LOG_INFO } from 'log';
 import * as fs from 'fs';
+import * as libuci from 'uci';
 
 let store_operational_pem = false;
 let store_operational_ca = false;
-let est_server = 'qaest.certificates.open-lan.org:8001';
+let est_server = 'est.certificates.open-lan.org';
 let cert_prefix = 'operational';
 
+function set_est_server() {
+	let pipe = fs.popen(`openssl x509 -in /etc/ucentral/cert.pem -noout -issuer`);
+	let issuer = pipe.read("all");
+	pipe.close();
+
+	if (!match(issuer, /Telecom Infra Project Issuing CA/)) {
+		ulog(LOG_INFO, 'Certificate type is "Demo" \n');
+		est_server = 'qaest.certificates.open-lan.org:8001';
+	} else {
+		ulog(LOG_INFO, 'Certificate type is "TIP"\n');
+	}
+}
+
 if (getenv('EST_SERVER'))
 	est_server = getenv('EST_SERVER');
 
@@ -78,6 +92,8 @@ function call_est_server(path, cert, target) {
 	if (generate_csr(cert))
 		return 1;
 
+	set_est_server();	
+
 	let ret = system('curl -m 10 -X POST https://' + est_server + '/.well-known/est/' + path + ' -d @/tmp/csr.nohdr.p10 -H "Content-Type: application/pkcs10" --cert ' + cert + ' --key /etc/ucentral/key.pem --cacert /etc/ucentral/insta.pem -o /tmp/operational.nohdr.p7');
 	if (ret) {
 		ulog(LOG_INFO, 'Failed to request operational certificate\n');
@@ -125,6 +141,9 @@ function load_operational_ca() {
 		ulog(LOG_INFO, 'Operational CA is present\n');
 		return 0;
 	}
+
+	set_est_server();	
+
 	let ret = system('curl -m 10 -X GET https://' + est_server + '/.well-known/est/cacerts --cert /etc/ucentral/' + cert_prefix + '.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/insta.pem -o /tmp/' + cert_prefix + '.ca.nohdr.p7');
 	if (!ret)
 		ret = p7_too_pem('/tmp/' + cert_prefix + '.ca.nohdr.p7', '/etc/ucentral/' + cert_prefix + '.ca');
@@ -139,6 +158,9 @@ function load_operational_ca() {
 }
 
 function fwtool() {
+	if (!fs.stat('/etc/ucentral/cert.pem'))
+		return 0;
+
 	let pipe = fs.popen(`openssl x509 -in /etc/ucentral/cert.pem -noout -issuer`);
 	let issuer = pipe.read("all");
 	pipe.close();
@@ -163,6 +185,20 @@ function fwtool() {
 	return 0;
 }
 
+function check_cert() {
+	if (!fs.stat('/etc/ucentral/cert.pem'))
+		return 0;
+	let pipe = fs.popen("openssl x509 -in /etc/ucentral/cert.pem  -noout -subject -nameopt multiline | grep commonName | awk '{ print $3 }'");
+	let cn = pipe.read("all");
+	pipe.close();
+	if (!cn)
+		return 0;
+	cn = lc(trim(cn));
+	let uci = libuci.cursor();
+	let serial = uci.get('ucentral', 'config', 'serial');
+	return cn != serial;
+}
+
 switch(ARGV[0]) {
 case 'enroll':
 	let ret = simpleenroll();
@@ -184,4 +220,7 @@ case 'reenroll':
 
 case 'fwtool':
 	exit(fwtool());
+
+case 'check':
+	exit(check_cert());
 }

feeds/tip/cloud_discovery/files/usr/share/ucentral/cloud_discovery.uc

@@ -5,7 +5,7 @@ import * as fs from 'fs';
 
 let cmd = ARGV[0];
 let ifname = getenv("interface");
-let opt224 = getenv("opt138");
+let opt138 = getenv("opt138");
 let opt224 = getenv("opt224");
 
 if (cmd != 'bound' && cmd != 'renew')

feeds/tip/tip-defaults/files/etc/ucentral/insta.pem

@@ -4,3 +4,6 @@ MIIFajCCA1KgAwIBAgICDnowDQYJKoZIhvcNAQELBQAwHzEdMBsGA1UEAwwUT3BlbkxBTiBEZW1vIFJv
 -----BEGIN CERTIFICATE-----
 MIIFIDCCAwigAwIBAgICDnkwDQYJKoZIhvcNAQELBQAwHzEdMBsGA1UEAwwUT3BlbkxBTiBEZW1vIFJvb3QgQ0EwHhcNMjUwMjIxMTUwMDAwWhcNMjYwMjIxMTUwMDAwWjAfMR0wGwYDVQQDDBRPcGVuTEFOIERlbW8gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMjExylKdJWoJu9mOHPJ6yZFXKe1lE467G65acpS2FKIWnPVFjNCmATMpkMOIFzEFwyFdbQjzOidtiL+73zlE52lOJpXCfOcxDFqDYDJJ8//J1/gQWsBaKpSvgLiHU/0awkQg+yJYZpj8YZa4NkFe+zTjQScSfOsqPPb3rZ7DOQ2BKAhjVShKmVbtNil0iO0zm8vE8DNkktTNMREp2pzb8MbCAgfOkwlrby6T+rV3TvmjThGdFUb5lWDFxWtlF8W0SUII9qj7p5TdGpryeLsO0nZTBtS4HxZNdvmKOHfgcRHmSZIJigB2NzKLNrXF9JBW0WnUSwZJZAG2C1RTx6lADILPueuusyfR/hZ3koKi4PHnSiTwQghzia9K9QjNHq5z9R9ZoCnhBg1VyU4LKmp862L0sIp2vgnOYunEIi9aCYBaDwo+0FuVjZuXyDIatwVuA7TN5IWPHA6XLdOt1mmkeYy1Ldr4XHjdondhtOyeei1UFXmyyLm2+kmRYfTm91TqYmNzRgbRV2NHO50AmsnBknX4Rv3gishGe0+dV5yFcUwZud0z2rSCkuoai5tKrPT+6Y6NqkT9u9HFifIBXnLwEzVUqHRtW6SuWj2DClVQIXIUZtFnhY4GuTuf6DlzgnXO58oDVCZmCW4ULIpbqGeRsvBHR8Sw5JXP/1+TMUYhE8TAgMBAAGjZjBkMB8GA1UdIwQYMBaAFDzIg8eyTI3xc4A2R60f8HanhBZDMB0GA1UdDgQWBBQ8yIPHskyN8XOANketH/B2p4QWQzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBATANBgkqhkiG9w0BAQsFAAOCAgEAkHZ5KR8IOrdfMFy+iOvauvZxfQ84LL6TpB2FQKDjneJUdd7c29UJJFNW/0mp4Gc6jKZab6J8Dx/pNnbH0RqFjGjeRGtJ4Sk0G7gf9zw1S7qut5WJDcisM9l/wXC+zy/KSKKPQmbt0grWOtU7+NNPh1YU76hIrInq/u2sVZyKH8SXQ957fbJk6BX6JTKyNEn05AB6rNSrbOWo8sy2MlcJ7bBsrWYI1t6GcWFh4b36bLu7/dKJWpyFNXXIkKJsgMEDpEQae56+fSSDo0KRNtYB82fNZDIQlGK81rGJWNzAahM+3GD1tgk/3ZVugfaJhcBpoHHKNOGqZAvtirLAIDocno7AzqoeIz974Rh2Olsl2/arApYPyyfi8PMYuFe/d4h+Wie8n+jh5n48lZ2Ve4PK+j+QHD6tTZS4f0bGnPL1puMxzQloltuQWgLDeVfEgrc3snLvjOg8aDzWm/es85lP8XcyW54U4t3JmrNUC2C7v+Uafx7cL7eDeunhs+BRhtGV+IUmjub2IrpqZp3zZqn+LVRdYJIy/qHhjS5+ImckXkFojOmeWhfmEmYSuNP8Oa6cGuXp829qnbxLh9Qzi3TfXV883KLse4kL5Zl7gBA/4hz2hVMyGJ8fY+VvzbaTuOXyvKJ+rGZCTcRSeotBLnIevVMiL7SqOEwN0j4Mfbznfq8=
 -----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFFTCCAv2gAwIBAgICAxIwDQYJKoZIhvcNAQELBQAwGjEYMBYGA1UEAwwPT3BlbkxBTiBSb290IENBMCAXDTI1MDUxNDA4NDcxMFoYDzIwNTUwNTE0MDg0NzEwWjAaMRgwFgYDVQQDDA9PcGVuTEFOIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDGibJ04A55kSURTBSKgcBmLnND2I5wws1taKqqU9aaRhB7NtvMHwh2voH9b1brUiulZaZwTN/9kzd4AnXeKQ+0u5tV7Ofk0fzF2MK47n17TS30Yenqc4NuQEKdpKK/pM3VvOEppR/bqtgyLtDmbDnmFOx+zTj/+smTgouwA+Iier0P4s5OohYxn/bjOqwQbHbU79VpGBIWv6/kt55AhH7zvsqqKHkrzTxnsRBv3SBIufrjJr9PIhZBLDrqr56P6KgAi0eoutNt2ToiJbE0WfjU7GI1RSiSN5bGj1zXhjNVzQWs1H9QzRf3c9pl3+haHQZ7FZ1UqiTRewmbNrQ6I9k81au3SttUlb87MyAuDSzatkiq7CjQ8VE1J6te6ZBt2zWpUhHsR/Lg7g3eOw5dL4oZJdK5GgGu/MUajLUXifIqM13Mvg0VTzDhN69VLXLSL0gPcicsQCwJuAza1IC/VqmBGx19fAkyJhOurCXWOgisi0g1+xzPKRphUNwMPUf8vBVOM/Vc6xDIvwVGE3+eWXyhixneFlSpAI03nWWjpwWXihTBoxbfRXO3Y/ilJqrgFN+U4PJcCPA+Wo7ThH0mgX6bOTPcgXMUzT3v3FF6Bx5/PNV3kYrw2yLzribUiS6AGvVGnW4hX2Z6OQvA/aHME8KF+6y6m4pC7FkUjVaRlzWu/wIDAQABo2MwYTAfBgNVHSMEGDAWgBSUaFuoOPk4QLByZP47kj4p1IbCJjAdBgNVHQ4EFgQUlGhbqDj5OECwcmT+O5I+KdSGwiYwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAB+/RUC2X6eVoPsFNMkaXO5Iib/ub0JoWhODQm8j2Mr5dpGXESSpXjfDcqDOLuJbWWoflXBLdr8BsVCBqOA9YgCX0H8Br7dUWmCScixxLW0he592/424EvdwifxcKHZLjv9CKV5Txhqnm2djc5RY/nTH5MYVrIh/If2TNO5ydDP6+vgy9GQ4en04VK7rz+PW17O8l7k9/lOmYptZmHgSDAPj/cT3PlG+McqaI5rMSHeEHlzH+PvgWjtSeEhF4FwFBXroDl4/yb4l2JB8bqAZ3vsOXSkigFcZh5MXPe+zuSSW+G8iLr4xoi0CFsP2DaHEyxgqP4B1FtE9nFPo6cvWbwqTVT7QSzqfH+jPJuQvpFXeRF5UFegNZTFT5/uFFPamihakFslEYxeJey1y+OJdLcP6ef87ruSt8amsq56OAETYpnW4JFowlEh0C+QwLGHGGY6WrOgHY/90hJmPgXBdBVg/IoOhzbvk5A+LqZDvxV2/rLNfClw8Kr3g5e8obcB6dWgMCy2z+us0H79ucnmhzQKsjpxM9T1ncHovAQfiD3jVqfHULY53avh0wIAjosoTGbe8dyx80quHe+16qWan7C9idXeAYYJXbZt5hs6hLw4I8M1LsjTg6vwsqiaHZpsmDyyQLdFjNJldG7aosfS9F+BIpuwijF+1dashL0CPsbIJ
+-----END CERTIFICATE-----

feeds/ucentral/ratelimit/files/usr/bin/ratelimit

@@ -350,7 +350,7 @@ function run_service() {
 				printf('-> reload\n');
 				let list = uctx.list();
 				for (let obj in list) {
-					if (!wildcard(obj, 'hostapd.wlan*'))
+					if (!wildcard(obj, 'hostapd.wlan*') && !wildcard(obj, 'hostapd.phy*'))
 						continue;
 					let iface = split(obj, '.')[1];
 					let device = get_device(devices, req.args.device);

feeds/ucentral/rrmd/files/etc/init.d/rrmd

@@ -6,6 +6,8 @@ STOP=01
 USE_PROCD=1
 
 start_service() {
+	[ -e "/tmp/rrm_timestamp" ] && rm -rf /tmp/rrm_timestamp
+	[ -e "/tmp/rrm_chan_switch" ] && rm -rf /tmp/rrm_chan_switch
 	rm -rf /tmp/threshold_breach_count*
 	rm -rf /tmp/fixed_channel*
 	rm -rf /tmp/chanutil_phy*

feeds/ucentral/rrmd/files/usr/share/rrmd/policy_chanutil.uc

@@ -24,6 +24,10 @@ function stats_info_write(path, value) {
 	file.close();
 }
 
+function record_rrm_timestamp() {
+    stats_info_write("/tmp/rrm_timestamp", time());
+}
+
 // total number of radios: default=2
 let num_radios = 2;
 let phy_count;
@@ -136,20 +140,122 @@ function channel_to_freq(band, channel) {
     return freq;
 }
 
-function center_freq_calc(band, freq, bandwidth) {
+// using mapping to get correct center channel, especially for 6G radio
-    if (bandwidth == 40)
+function get_center_channel(channel, band, bw) {
-        return +freq + 10;
+    let center_channel = channel;
-    if (bandwidth == 80)
+    let center_channel_map = {};
-        return +freq + 30;
-    if (bandwidth == 160)
-        return +freq + 70;
-    if (bandwidth == 320)
-        if (freq == 6115)
-            return +freq - 10;
-        else
-            return +freq + 150;
 
-    return +freq;
+    switch (band) {
+    case '5g':
+        if (bw == 40) {
+            center_channel_map = {
+                "36": 38, "40": 38,
+                "44": 46, "48": 46,
+                "52": 54, "56": 54,
+                "60": 62, "64": 62,
+                "100": 102, "104": 102,
+                "108": 110, "112": 110,
+                "116": 118, "120": 118,
+                "124": 126, "128": 126,
+                "132": 134, "136": 134,
+                "140": 142, "144": 142,
+                "149": 151, "153": 151,
+                "157": 159, "161": 159,
+                "165": 167
+            };
+        } else if (bw == 80) {
+            center_channel_map = {
+                "36": 42, "40": 42, "44": 42, "48": 42,
+                "52": 58, "56": 58, "60": 58, "64": 58,
+                "100": 106, "104": 106, "108": 106, "112": 106,
+                "116": 122, "120": 122, "124": 122, "128": 122,
+                "132": 138, "136": 138, "140": 138, "144": 138,
+                "149": 155, "153": 155, "157": 155, "161": 155,
+                "165": 171
+            };
+        } else if (bw == 160) {
+            center_channel_map = {
+                "36": 50, "40": 50, "44": 50, "48": 50,
+                "52": 50, "56": 50, "60": 50, "64": 50,
+                "100": 114, "104": 114, "108": 114, "112": 114,
+                "116": 114, "120": 114, "124": 114, "128": 114
+            };
+        }
+        break;
+    case '6g':
+        if (bw == 40) {
+            center_channel_map = {
+                "1": 3, "5": 3, "9": 11, "13": 11,
+                "17": 19, "21": 19, "25": 27, "29": 27,
+                "33": 35, "37": 35, "41": 43, "45": 43,
+                "49": 51, "53": 51, "57": 59, "61": 59,
+                "65": 67, "69": 67, "73": 75, "77": 75,
+                "81": 83, "85": 83, "89": 91, "93": 91,
+                "97": 99, "101": 99, "105": 107, "109": 107,
+                "113": 115, "117": 115, "121": 123, "125": 123,
+                "129": 131, "133": 131, "137": 139, "141": 139,
+                "145": 147, "149": 147, "153": 155, "157": 155,
+                "161": 163, "165": 163, "169": 171, "173": 171,
+                "177": 179, "181": 179, "185": 187, "189": 187,
+                "193": 195, "197": 195, "201": 203, "205": 203,
+                "209": 211, "213": 211, "217": 219, "221": 219,
+                "225": 227
+            };
+        } else if (bw == 80) {
+            center_channel_map = {
+                "1": 7, "5": 7, "9": 7, "13": 7,
+                "17": 23, "21": 23, "25": 23, "29": 23,
+                "33": 39, "37": 39, "41": 39, "45": 39,
+                "49": 55, "53": 55, "57": 55, "61": 55,
+                "65": 71, "69": 71, "73": 71, "77": 71,
+                "81": 87, "85": 87, "89": 87, "93": 87,
+                "97": 103, "101": 103, "105": 103, "109": 103,
+                "113": 119, "117": 119, "121": 119, "125": 119,
+                "129": 135, "133": 135, "137": 135, "141": 135,
+                "145": 151, "149": 151, "153": 151, "157": 151,
+                "161": 167, "165": 167, "169": 167, "173": 167,
+                "177": 183, "181": 183, "185": 183, "189": 183,
+                "193": 199, "197": 199, "201": 199, "205": 199,
+                "209": 215
+            };
+        } else if (bw == 160) {
+            center_channel_map = {
+                "1": 15, "5": 15, "9": 15, "13": 15,
+                "17": 15, "21": 15, "25": 15, "29": 15,
+                "33": 47, "37": 47, "41": 47, "45": 47,
+                "49": 47, "53": 47, "57": 47, "61": 47,
+                "65": 79, "69": 79, "73": 79, "77": 79,
+                "81": 79, "85": 79, "89": 79, "93": 79,
+                "97": 111, "101": 111, "105": 111, "109": 111,
+                "113": 111, "117": 111, "121": 111, "125": 111,
+                "129": 143, "133": 143, "137": 143, "141": 143,
+                "145": 143, "149": 143, "153": 143, "157": 143,
+                "161": 175, "165": 175, "169": 175, "173": 175,
+                "177": 175, "181": 175, "185": 175, "189": 175,
+                "193": 207
+            };
+        } else if (bw == 320) {
+            center_channel_map = {
+                "1": 31, "5": 31, "9": 31, "13": 31,
+                "17": 31, "21": 31, "25": 31, "29": 31,
+                "33": 63, "37": 63, "41": 63, "45": 63,
+                "49": 63, "53": 63, "57": 63, "61": 63,
+                "65": 63, "69": 63, "73": 63, "77": 63,
+                "81": 63, "85": 63, "89": 63, "93": 63,
+                "97": 127, "101": 127, "105": 127, "109": 127,
+                "113": 127, "117": 127, "121": 127, "125": 127,
+                "129": 127, "133": 127, "137": 127, "141": 127,
+                "145": 127, "149": 127, "153": 127, "157": 127,
+                "161": 191
+            };
+        }
+        break;
+    }
+
+    if (center_channel_map[channel])
+        center_channel = center_channel_map[channel];
+
+    return center_channel;
 }
 
 function interface_status_check(iface) {
@@ -201,6 +307,9 @@ function check_current_channel(iface) {
 function hostapd_switch_channel(msg) {
     ulog_info(`[%s] Start switch channel to %d \n`, msg.iface, msg.channel);
 
+    // Channel switch in progress, set flag = 1
+    stats_info_write("/tmp/rrm_chan_switch", 1);
+
     let chan_switch_status = 0;
     let sec_channel_offset = null;
 
@@ -208,7 +317,8 @@ function hostapd_switch_channel(msg) {
     let bandwidth = replace(msg.htmode, /[^0-9]/g, '');
 
     let target_freq = channel_to_freq(msg.band, msg.channel);
-    let center_freq = center_freq_calc(msg.band, target_freq, bandwidth);
+    let center_channel = get_center_channel(msg.channel, msg.band, bandwidth);
+    let center_freq = channel_to_freq(msg.band, center_channel);
     if (bandwidth > 20)
         sec_channel_offset = 1;
 
@@ -245,9 +355,20 @@ function switch_status_check(iface, dfs_enabled_5g_flag) {
         ulog_info(`[%s] 5G radio might need some time to be UP (DFS enabled) \n`, iface);
 
         let p = 0;
-        // Max 65 seconds wait for the DFS enabled interface to be UP
+        // Default max 70 seconds wait for the DFS enabled interface to be UP
         let timer = 70;
 
+        // get real timer from hostapd_cli command
+        let check_cac_time = sprintf('hostapd_cli -i %s status | grep \"cac_time_left_seconds\" | awk -F "=" \'{print $2}\'', iface);
+        let _cac_time = fs.popen(check_cac_time);
+        let cac_time = trim(_cac_time.read('all'));
+        _cac_time.close();
+
+        // if cac_time is a valid number, set timer to cac_time + 5 seconds
+        if (cac_time > 0 && match(cac_time, /^[0-9]+$/)) {
+            timer = int(cac_time) + 5;
+        }
+
         while (p < timer) {
             ulog_info(`[%s] Check#%d \n `, iface, p);
 
@@ -267,6 +388,9 @@ function switch_status_check(iface, dfs_enabled_5g_flag) {
         }
     }
 
+    // Channel switch done, set flag = 0
+    stats_info_write("/tmp/rrm_chan_switch", 0);
+
     let current_chan = check_current_channel(iface);
     return current_chan;
 }
@@ -436,7 +560,7 @@ function random_channel_selection(iface, band, htmode, chan_list_valid) {
     ulog_info(`[%s] Selected channel list from config (default channel list shall be used in case channels haven't been selected) = %s \n`, iface, (chan_list_valid || '[]'));
 
     if (band == '2g' && bw >= 40) {
-        ulog_info(`[%s] It is highly recommended to NOT use %dMHz bandwidth for 2.4G radio \n`, iface, bw);
+        ulog_info(`[%s] It is highly recommended to NOT use %dMHz bandwidth for 2.4G radio (RRM will not work properly) \n`, iface, bw);
     } else if (band == '5g' && bw > 160) {
         ulog_info(`[%s] %dMHz bandwidth not supported for 5G radio. Please use a bandwidth of 160MHz or lower\n`, iface, bw);
     }
@@ -568,9 +692,28 @@ function random_channel_selection(iface, band, htmode, chan_list_valid) {
     return random_channel;
 }
 
+function check_center_channel(chosen_random_channel, current_channel, band, htmode) {
+    let ret = false;
+    let bw = replace(htmode, /[^0-9]/g, '');
+
+    if (band != '2g' || bw != 20) {
+        // for 2G band or 20MHz bandwidth, center channel is the same as the channel
+        let chosen_random_channel_center = get_center_channel(chosen_random_channel, band, bw);
+        let current_channel_center = get_center_channel(current_channel, band, bw);
+
+        ulog_info(`Center channel of the chosen random channel (%d) = %d; Center channel of the current channel (%d) = %d \n`, chosen_random_channel, chosen_random_channel_center, current_channel, current_channel_center);
+
+        if (chosen_random_channel_center == current_channel_center)
+            ret = true;
+    }
+
+    return ret;
+}
+
 function algo_rcs(iface, current_channel, band, htmode, selected_channels) {
     let chosen_random_channel = 0;
     let res = 0;
+    let same_center_channel = false;
 
     // random_channel_selection script will help to select random channel
     chosen_random_channel = random_channel_selection(iface, band, htmode, selected_channels);
@@ -580,8 +723,15 @@ function algo_rcs(iface, current_channel, band, htmode, selected_channels) {
         ulog_info(`[%s] RCS assigned the same channel = %d; Skip channel switch \n`, iface, chosen_random_channel);
         res = 0;
     } else if (chosen_random_channel > 0) {
-        ulog_info(`[%s] RCS done ... random channel found = %d\n`, iface, chosen_random_channel);
+        // check if the random channel has the same center channel as the current channel
-        res = 1;
+        same_center_channel = check_center_channel(chosen_random_channel, current_channel, band, htmode);
+        if (same_center_channel) {
+            ulog_info(`[%s] RCS found channel %d with the same center channel as current channel %d; Skip channel switch \n`, iface, chosen_random_channel, current_channel);
+            res = 0;
+        } else {
+            ulog_info(`[%s] RCS done ... random channel found = %d\n`, iface, chosen_random_channel);
+            res = 1;
+        }
     } else {
         ulog_info(`[%s] RCS scan FAIL. Retry Channel optimization at next cycle \n`, iface);
         res = 0;
@@ -611,6 +761,8 @@ function channel_optimize() {
         return config.interval;
     }
 
+    record_rrm_timestamp();
+
     let current_rf_down = {};
 	let cool_down_f = {};
     let check_all_cool_down = 0;
@@ -924,7 +1076,7 @@ function channel_optimize() {
                             }
                         } else {
                             // revert back to the original channel
-                            ulog_info(`[%s] Channel %d has a cac_time longer than 60 seconds, RRM failed for this interval (you might want to avoid selecting this channel) \n`, radio_iface[l], init_payload.channel);
+                            ulog_info(`[%s] Channel %d may have a cac_time longer than 60 seconds, RRM failed for this interval (you might want to avoid selecting this channel) \n`, radio_iface[l], init_payload.channel);
                         }
                     } else if (selected_algo == "ACS") {
                         let random_wait_time = random_time_calc();
@@ -940,6 +1092,9 @@ function channel_optimize() {
                             check_all_threshold_breach >= 1: threshold breach count exceeded for one or more interfaces
                         */
 
+                        // Channel switch in progress, set flag = 1
+                        stats_info_write("/tmp/rrm_chan_switch", 1);
+
                         // flag to check if 5G radio was restarted
                         let radio_5g_restarted = 0;
 
@@ -1003,6 +1158,10 @@ function channel_optimize() {
                             sleep(30000);
                         }
                     }
+
+                    sleep(5000);
+                    // Channel switch done, set flag = 0
+                    stats_info_write("/tmp/rrm_chan_switch", 0);
                 } else {
                     if (threshold_breach_f[l] != 1) {
                         ulog_info(`[%s] Threshold breach count (=%d) < Allowed consecutive Channel Utilization threshold breach count (=%d), will be checked again in the next interval \n`, radio_iface[l], threshold_breach_count[l], config.consecutive_threshold_breach);
@@ -1016,6 +1175,7 @@ function channel_optimize() {
         }
     }
     ulog_info(`RRM with channel optimization finished; next RRM round starts in %d seconds \n`, config.interval/1000);
+    record_rrm_timestamp();
 
     return config.interval;
 }

feeds/ucentral/rtty/files/rtty.init

@@ -51,7 +51,7 @@ start_rtty() {
 	procd_set_param command $BIN -h $host -I "$id" -a
 	[ -n "$port" ] && procd_append_param command -p "$port"
 	[ -n "$description" ] && procd_append_param command -d "$description"
-	[ "$ssl" = "1" ] && procd_append_param command -s -c /etc/ucentral/cert.pem -k /etc/ucentral/key.pem
+	[ "$ssl" = "1" ] && procd_append_param command -s -c /etc/ucentral/operational.pem -k /etc/ucentral/key.pem
 	[ -n "$token" ] && procd_append_param command -t "$token"
 	[ "$verbose" = "1" ] && procd_append_param command -v
 	[ "$timeout" -eq "0" ] || procd_append_param command -e $timeout

feeds/ucentral/ucentral-client/Makefile

@@ -4,10 +4,9 @@ PKG_NAME:=ucentral-client
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-client.git
-PKG_MIRROR_HASH:=2e28e0aa61b74851c7daf3634ec34d303a603e881e6c5d1fd76c837dea527582
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2025-07-08
+PKG_SOURCE_DATE:=2025-08-11
-PKG_SOURCE_VERSION:=69829f63ea172ce9bd19b7b02073746fe9cf6a52
+PKG_SOURCE_VERSION:=549e84e5fea7230c5471d6a3dbddcc7d3152f665
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>

feeds/ucentral/ucentral-client/files/etc/config/ucentral

@@ -6,9 +6,9 @@ config ucentral config
 	option reporting	10
 
 config timeouts timeouts
-	option offline		120
+	option offline		14400
 	option validate		120
-	option orphan		120
+	option orphan		7200
 
 #config event
 #	option type  dhcp

feeds/ucentral/ucentral-schema/Makefile

@@ -4,10 +4,9 @@ PKG_NAME:=ucentral-schema
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git
-PKG_MIRROR_HASH:=1ad9f7b5d5d1145e3aed14937eef60d6794d821e0244cc8fa824400d3da47f5a
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2025-07-11
+PKG_SOURCE_DATE:=2025-08-04
-PKG_SOURCE_VERSION:=5276d0b8b6e83ab57354b0bcbb820de83a91ab88
+PKG_SOURCE_VERSION:=1c6b3095cb9e398fcbfcb2bf995365066eb76b21
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
 

feeds/ucentral/ucentral-schema/files/etc/board.d/04-regdm

@@ -22,6 +22,12 @@ cig,wf188n)
 cig,wf196)
         ucidef_set_wifi_country "US CA"
         ;;
+sonicfi,rap630c-311g|\
+sonicfi,rap630w-311g|\
+sonicfi,rap7110c-341x|\
+sonicfi,rap750w-311a)
+	ucidef_set_wifi_country "US AU CA SG"
+	;;
 esac
 
 board_config_flush

feeds/ucentral/ucentral-state/files/ucentral-state

@@ -20,9 +20,68 @@ let config;
 let offline_timer;
 let current_state;
 let online = false;
+let leds_off = false;
 
 function self_healing() {
+	let heal_wifi = false;
+	let health_stat = json(fs.readfile('/tmp/ucentral.health'));
+	let last_nw_restart_ts = int(fs.readfile('/tmp/ucentral.nw_restart_ts')) || 0;
+	let time_passed_since_nw_restart = time() - last_nw_restart_ts;
 
+	if (health_stat) {
+		if (health_stat.data.rrm_chanutil == false) {
+			// RRM with Channel utilization abnormal, restart rrmd
+			ulog(LOG_INFO, 'RRM with Channel utilization abnormal, restarting rrmd\n');
+			system('/etc/init.d/rrmd restart');
+		}
+
+		if (health_stat.sanity != 100) {
+			for (let iface in health_stat.data.interfaces) {
+				let iface_data = health_stat.data.interfaces[iface];
+				if (iface_data.ssids) {
+					// one of the VAPs have an issue: flag up!
+					heal_wifi = true;
+					ulog(LOG_INFO, 'Time passed since last network restart = %d seconds\n', time_passed_since_nw_restart);
+					break;
+				}
+			}
+		} else {
+			// all VAPs are healthy, no need to heal anything
+			return;
+		}
+	}
+
+	if (fs.stat('/tmp/rrm_timestamp')) {
+		let rrm_chan_switch_flag = int(fs.readfile('/tmp/rrm_chan_switch')) || 0;
+		let last_rrm_timestamp = int(fs.readfile('/tmp/rrm_timestamp'));
+		let time_passed_since_rrm = time() - last_rrm_timestamp;
+
+		if (rrm_chan_switch_flag == 1) {
+			// RRM chan switch in progress, do not restart network!
+			ulog(LOG_INFO, 'RRM channel switch in progress, cannot restart network \n');
+			heal_wifi = false;
+		}
+
+		if (time_passed_since_rrm < 180) {
+			// RRM in progress, do not restart network!
+			ulog(LOG_INFO, 'RRM with Channel utilization may still be in progress, cannot restart network \n');
+			heal_wifi = false;
+		}
+	}
+
+	// keep a gap of at least 5 minutes between network restarts
+	if (heal_wifi && time_passed_since_nw_restart > 300) {
+		ulog(LOG_INFO, 'Restarting network \n');
+		// update network restart timestamp
+		let f = fs.open("/tmp/ucentral.nw_restart_ts", "w");
+		if (f) {
+			f.write(time());
+			f.close();
+		}
+
+		// restart network
+		system('/etc/init.d/network restart');
+	}
 }
 
 let healthcheck;
@@ -42,7 +101,7 @@ healthcheck = {
 	},
 
 	spawn: function() {
-		ulog(LOG_INFO, 'healtcheck execute\n');
+		ulog(LOG_INFO, 'healthcheck execute\n');
 		healthcheck.pid = uloop.process('/usr/share/ucentral/health.uc', [], {}, healthcheck.complete);
 	},
 };
@@ -90,6 +149,13 @@ function online_handler() {
 
 function config_load() {
 	ulog(LOG_INFO, 'loading config\n');
+
+	uci.load('system');
+	let led_off_cfg = uci.get("system", "@system[0]", "leds_off");
+	if (led_off_cfg == 1) {
+		leds_off = true;
+	}
+
 	uci.load('state');
 	config = uci.get_all('state');
 
@@ -133,7 +199,7 @@ function led_find(alias) {
 function factory_reset_timeout() {
 	let led = led_find('led-running');
 	if (led)
-		led_write(led, 'trigger', 'default-on');
+		led_write(led, 'trigger', leds-off ? 'none' : 'default-on');
 }
 
 let blink_timer;
@@ -152,7 +218,7 @@ let state_handler = {
 	offline: function() {
 		online = false;
 		let led = led_find('led-running');
-		if (led)
+		if (!leds_off && led)
 			led_write(led, 'trigger', 'heartbeat');
 		if (config.ui.offline_trigger) {
 			if (offline_timer)
@@ -165,7 +231,7 @@ let state_handler = {
 	online: function() {
 		online = true;
 		let led = led_find('led-running');
-		if (led)
+		if (!leds_off && led)
 			led_write(led, 'trigger', 'default-on');
 		online_handler();
 		return 0;

patches/0090-netifd-add-gcmp-256-on-6GHz.patch

@@ -0,0 +1,68 @@
+From a2a7cdf9e292bac5b146738276a593d8e119fe8f Mon Sep 17 00:00:00 2001
+From: Marek Kwaczynski <marek@shasta.cloud>
+Date: Thu, 3 Jul 2025 15:55:43 +0000
+Subject: [PATCH] netifd: add gcmp-256 as a cipher suite when SAE is enabled on
+ HE/EHT
+
+Enabling gcmp-256 only on 6GHz radio.
+
+Fixes: WIFI-14594
+
+Signed-off-by: Marek Kwaczynski <marek@shasta.cloud>
+---
+ .../config/netifd/patches/200-gcmp-256.patch  | 43 +++++++++++++++++++
+ 1 file changed, 43 insertions(+)
+ create mode 100644 package/network/config/netifd/patches/200-gcmp-256.patch
+
+diff --git a/package/network/config/netifd/patches/200-gcmp-256.patch b/package/network/config/netifd/patches/200-gcmp-256.patch
+new file mode 100644
+index 0000000000..7ac6262e7f
+--- /dev/null
++++ b/package/network/config/netifd/patches/200-gcmp-256.patch
+@@ -0,0 +1,43 @@
++Index: netifd-2023-09-19-8587c074/scripts/netifd-wireless.sh
++===================================================================
++--- netifd-2023-09-19-8587c074.orig/scripts/netifd-wireless.sh
+++++ netifd-2023-09-19-8587c074/scripts/netifd-wireless.sh
++@@ -39,11 +39,10 @@ prepare_key_wep() {
++ }
++ 
++ _wdev_prepare_channel() {
++-	json_get_vars channel band hwmode
+++	json_get_vars channel band hwmode htmode
++ 
++ 	auto_channel=0
++ 	enable_ht=0
++-	htmode=
++ 	hwmode="${hwmode##11}"
++ 
++ 	case "$channel" in
++@@ -70,7 +69,14 @@ _wdev_prepare_channel() {
++ 
++ 	case "$band" in
++ 		2g) hwmode=g;;
++-		5g|6g) hwmode=a;;
+++		5g) hwmode=a;;
+++		6g)
+++			hwmode=a;
+++			case "$htmode" in
+++				HE*|EHT*) wpa3_cipher="GCMP-256 ";;
+++				*) wpa3_cipher="";;
+++			esac
+++		;;
++ 		60g) hwmode=ad;;
++ 		*)
++ 			case "$hwmode" in
++@@ -216,6 +222,9 @@ wireless_vif_parse_encryption() {
++ 		wpa_cipher="GCMP"
++ 	else
++ 		wpa_cipher="CCMP"
+++		case "$encryption" in
+++			sae*|wpa3*|psk3*|owe) wpa_cipher="${wpa3_cipher}$wpa_cipher";;
+++		esac
++ 	fi
++ 
++ 	case "$encryption" in
+-- 
+2.43.0
+

patches/0095-toolchain-use-older-gcc11-for-legacy-targets.patch

@@ -0,0 +1,37 @@
+From 0b83834085bf536183b0683f4f86800dbe1e2d39 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Mon, 28 Jul 2025 07:49:07 +0200
+Subject: [PATCH] toolchain: use older gcc11 for legacy targets
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ toolchain/binutils/Config.version | 1 +
+ toolchain/gcc/Config.version      | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/toolchain/binutils/Config.version b/toolchain/binutils/Config.version
+index c9f8584480..5393d389a5 100644
+--- a/toolchain/binutils/Config.version
++++ b/toolchain/binutils/Config.version
+@@ -1,6 +1,7 @@
+ 
+ config BINUTILS_VERSION_2_37
+ 	bool
++	default y if TARGET_ipq40xx
+ 
+ config BINUTILS_VERSION_2_38
+ 	bool
+diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
+index 7126a0c883..b7de3d00e3 100644
+--- a/toolchain/gcc/Config.version
++++ b/toolchain/gcc/Config.version
+@@ -1,5 +1,6 @@
+ config GCC_VERSION_11
+ 	default y if GCC_USE_VERSION_11
++	default y if TARGET_ipq40xx
+ 	bool
+ 
+ config GCC_VERSION_13
+-- 
+2.34.1
+

patches/0096-base-files-boot-add-sync-after-uci-defaults.patch

@@ -0,0 +1,33 @@
+From 309a419087da906a2f3b0f39763f021e9729dd85 Mon Sep 17 00:00:00 2001
+From: Paul White <paul@shasta.cloud>
+Date: Mon, 4 Aug 2025 04:14:23 +0000
+Subject: [PATCH] base-files: boot: add sync after uci-defaults
+
+A scenario was seen where UCI config was not flushed to disk before
+an AP power-cycle after uci-defaults was completed.  Since these
+scripts are deleted after being ran once, there is no way to recover
+without a factory reset.
+
+Adding this sync operation proved to help avoid this situation from
+happening
+
+Signed-off-by: Paul White <paul@shasta.cloud>
+---
+ package/base-files/files/etc/init.d/boot | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
+index 15756669a9..c8a803e32c 100755
+--- a/package/base-files/files/etc/init.d/boot
++++ b/package/base-files/files/etc/init.d/boot
+@@ -15,6 +15,7 @@ uci_apply_defaults() {
+ 		( . "./$(basename $file)" ) && rm -f "$file"
+ 	done
+ 	uci commit
++	sync
+ }
+ 
+ boot() {
+-- 
+2.43.0
+

patches/0096-uboot-envtools-add-udaya-id5.patch

@@ -0,0 +1,25 @@
+From d366477af72e725524b47f2fffe8a8c1d500060d Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Thu, 31 Jul 2025 14:45:12 +0200
+Subject: [PATCH] uboot-envtools: add udaya-id5
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ package/boot/uboot-envtools/files/ipq40xx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-envtools/files/ipq40xx
+index 8d993fae36..78299195bd 100644
+--- a/package/boot/uboot-envtools/files/ipq40xx
++++ b/package/boot/uboot-envtools/files/ipq40xx
+@@ -42,6 +42,7 @@ luma,wrtq-329acn|\
+ netgear,wac510|\
+ openmesh,a42|\
+ openmesh,a62|\
++udaya,a5-id2|\
+ pakedge,wr-1|\
+ plasmacloud,pa1200|\
+ plasmacloud,pa2200)
+-- 
+2.34.1
+

patches/0097-yuncore_ax820-add-insta1-2-partitions.patch

@@ -0,0 +1,36 @@
+From 3ceb72aaffa13375c049d161702e9d9f55da38c8 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Mon, 4 Aug 2025 08:34:50 +0200
+Subject: [PATCH] yuncore_ax820: add insta1/2 partitions
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ target/linux/ramips/dts/mt7621_yuncore_ax820.dts | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/target/linux/ramips/dts/mt7621_yuncore_ax820.dts b/target/linux/ramips/dts/mt7621_yuncore_ax820.dts
+index b2f55b9be0..cc1b59340b 100644
+--- a/target/linux/ramips/dts/mt7621_yuncore_ax820.dts
++++ b/target/linux/ramips/dts/mt7621_yuncore_ax820.dts
+@@ -120,7 +120,17 @@
+ 			partition@90000 {
+ 				compatible = "denx,uimage";
+ 				label = "firmware";
+-				reg = <0x90000 0xf60000>;
++				reg = <0x90000 0xf40000>;
++			};
++
++			partition@fd0000 {
++				label = "insta1";
++				reg = <0xfd0000 0x10000>;
++			};
++
++			partition@fe0000 {
++				label = "insta2";
++				reg = <0xfe0000 0x10000>;
+ 			};
+ 
+ 			partition@ff0000 {
+-- 
+2.34.1
+

patches/0099-elfutils-fix-build-with-GCC11.patch

@@ -0,0 +1,26 @@
+From b82a8514a3f52b91ec84f703ef92740dda19d5d9 Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Thu, 14 Aug 2025 10:29:29 +0200
+Subject: [PATCH] elfutils: fix build with GCC11
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ package/libs/elfutils/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package/libs/elfutils/Makefile b/package/libs/elfutils/Makefile
+index f7364c36be..76112c89ff 100644
+--- a/package/libs/elfutils/Makefile
++++ b/package/libs/elfutils/Makefile
+@@ -87,7 +87,7 @@ TARGET_CFLAGS += \
+ 	-Wno-unused-result \
+ 	-Wno-format-nonliteral
+ 
+-ifneq ($(CONFIG_GCC_USE_VERSION_11),y)
++ifneq ($(CONFIG_GCC_VERSION_11),y)
+ TARGET_CFLAGS += \
+ 	-Wno-error=use-after-free
+ endif
+-- 
+2.34.1
+

patches/0099-wireless-regdb-fix-channel-14-in-JP.patch

@@ -0,0 +1,39 @@
+From d0a0f0304f292a40f2fcdd20b320089627b0f05f Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Thu, 7 Aug 2025 14:50:51 +0200
+Subject: [PATCH] wireless-regdb: fix channel 14 in JP
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ .../patches/200-jp-no-channel-14.patch        | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+ create mode 100644 package/firmware/wireless-regdb/patches/200-jp-no-channel-14.patch
+
+diff --git a/package/firmware/wireless-regdb/patches/200-jp-no-channel-14.patch b/package/firmware/wireless-regdb/patches/200-jp-no-channel-14.patch
+new file mode 100644
+index 0000000000..ea1411cfdd
+--- /dev/null
++++ b/package/firmware/wireless-regdb/patches/200-jp-no-channel-14.patch
+@@ -0,0 +1,19 @@
++--- a/db.txt
+++++ b/db.txt
++@@ -16,8 +16,6 @@ country 00:
++ 	(2402 - 2472 @ 40), (20)
++ 	# Channel 12 - 13.
++ 	(2457 - 2482 @ 20), (20), NO-IR, AUTO-BW
++-	# Channel 14. Only JP enables this and for 802.11b only
++-	(2474 - 2494 @ 20), (20), NO-IR, NO-OFDM
++ 	# Channel 36 - 48
++ 	(5170 - 5250 @ 80), (20), AUTO-BW
++ 	# Channel 52 - 64
++@@ -945,7 +943,6 @@ country JO: DFS-JP
++ # https://www.soumu.go.jp/main_content/000833682.pdf
++ country JP: DFS-JP
++ 	(2402 - 2482 @ 40), (20)
++-	(2474 - 2494 @ 20), (20), NO-OFDM
++ 	(4910 - 4990 @ 40), (23)
++ 	(5170 - 5250 @ 80), (20), AUTO-BW
++ 	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+-- 
+2.34.1
+