.github/workflows: add EMPLUS WAP385C & WAP386V2 support

Signed-off-by: Jesse Wu <Jesse.Wu@emplustech.com>

.github/workflows/build-dev.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ 'cig_wf189h', 'cig_wf189w', 'cig_wf660a', 'cig_wf672', 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf189', 'cig_wf196', 'cig_wf196', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'sonicfi_rap630w-312g', 'sonicfi_rap63xc-211g', 'sonicfi_rap630c-311g', 'sonicfi_rap630w-311g', 'sonicfi_rap630w-211g', 'sonicfi_rap650c', 'sonicfi_rap7110c-341x', 'sonicfi_rap750e-h', 'sonicfi_rap750e-s', 'sonicfi_rap750w-311a', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_eap112', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap103', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'senao_iap4300m', 'senao_iap2300m', 'senao_jeap6500', 'udaya_a6-id2', 'udaya_a6-od2', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655', 'emplus_wap588m', 'zyxel_nwa130be', 'sercomm_ap72tip-v4' ]
+        target: [ 'cig_wf189h', 'cig_wf189w', 'cig_wf672', 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf189', 'cig_wf196', 'cig_wf196', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'sonicfi_rap630w-312g', 'sonicfi_rap63xc-211g', 'sonicfi_rap630c-311g', 'sonicfi_rap630w-311g', 'sonicfi_rap630w-211g', 'sonicfi_rap650c', 'sonicfi_rap7110c-341x', 'sonicfi_rap750e-h', 'sonicfi_rap750e-s', 'sonicfi_rap750w-311a', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_eap112', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap103', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'senao_iap4300m', 'senao_iap2300m', 'senao_jeap6500', 'udaya_a6-id2', 'udaya_a6-od2', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655', 'emplus_wap385c', 'emplus_wap386v2', 'emplus_wap588m', 'zyxel_nwa130be', 'sercomm_ap72tip-v4' ]
     steps:
     - uses: actions/checkout@v3
 

feeds/ipq807x_v5.4/hostapd/files/mpskd

@@ -144,7 +144,7 @@ function netifd_reload() {
 
 			push(ssid.interfaces, iface.ifname);
 			ssid.bands[band] = iface.ifname;
-			ssid.mpsk = ssid?.mpsk ? true : config.multi_psk;
+			ssid.mpsk = config.multi_psk;
 			for (let sta in iface.stations) {
 				let stacfg = sta.config;
 
@@ -308,18 +308,18 @@ function sta_auth_cache(ifname, addr, idx, phrase) {
 function auth_cb(msg) {
 	let data = msg.data;
 
+	if (!is_ssid_mpsk(data.iface))
+		return;
+
 	printf(`Event ${msg.type}: ${msg.data}\n`);
 	switch (msg.type) {
 	case 'sta_auth':
-		if (!is_ssid_mpsk(data.iface))
-			return;
-
 		return {
 			psk: sta_auth_psk(data.iface, data.sta),
 			force_psk: true,
 		};
 	case 'sta_connected':
-		if (data.psk_idx == null || !is_ssid_mpsk(data.iface))
+		if (data.psk_idx == null)
 			return;
 		return sta_auth_cache(data.iface, data.sta, data.psk_idx, data.psk);
 	case 'reload':

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

@@ -16,14 +16,14 @@ ath11k_generate_macs() {
 	echo -ne \\x${mac3//:/\\x} >> /lib/firmware/ath11k-macs
 }
 
-ath11k_generate_macs_rap650c() {
+ath11k_generate_macs_sonicfi() {
 	mac=$(fw_printenv -n BaseMacAddress)
 	[ -z "$mac" ] && return;
 
 	touch /lib/firmware/ath11k-macs
 	eth=$(macaddr_canonicalize $mac)
-	mac1=$(macaddr_add $eth 3)
-	mac2=$(macaddr_add $eth 2)
+	mac1=$(macaddr_add $eth 2)
+	mac2=$(macaddr_add $eth 3)
 	mac3=$(macaddr_add $eth 4)
 	echo -ne \\x${mac1//:/\\x} >> /lib/firmware/ath11k-macs
 	echo -ne \\x${mac2//:/\\x} >> /lib/firmware/ath11k-macs
@@ -112,8 +112,8 @@ ath11k-macs)
 	cig,wf196)
 		ath11k_generate_macs_wf196
 		;;
-	sonicfi,rap650c)
-		ath11k_generate_macs_rap650c
+	sonicfi*)
+		ath11k_generate_macs_sonicfi
 		;;
 	esac
 	;;

feeds/qca-wifi-7/cig-platform-pkg/cig-poe-judgment/Makefile

@@ -1,25 +0,0 @@
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=cig-poe-judgment
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/cig-poe-judgment
-  SUBMENU:=Other modules
-  TITLE:=CIG POE judgment
-  FILES:=$(PKG_BUILD_DIR)/cig_poe_judgment.ko
-  AUTOLOAD:=$(call AutoLoad,99,cig_poe_judgment)
-endef
-
-define KernelPackage/cig-poe-judgment/description
-  Find POE type
-endef
-
-define Build/Compile
-	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)" modules
-endef
-
-$(eval $(call KernelPackage,cig-poe-judgment))

feeds/qca-wifi-7/cig-platform-pkg/cig-poe-judgment/src/Makefile

@@ -1 +0,0 @@
-obj-m += cig_poe_judgment.o

feeds/qca-wifi-7/cig-platform-pkg/cig-poe-judgment/src/cig_poe_judgment.c

@@ -1,252 +0,0 @@
-#include <linux/module.h>
-#include <linux/device.h>
-#include <linux/proc_fs.h>
-#include <linux/kthread.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/irqreturn.h>
-#include <linux/of_gpio.h>
-#include <linux/err.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/of_irq.h>
-#include <linux/of_platform.h>
-#include <asm/uaccess.h>
-
-#define GPIO_MAX 		8 
-#define INT_MODE_MASK 		0xf0
-#define DETECT_MODE1	 	0x3
-#define DETECT_MODE2	 	0x4
-
-enum POE_TYPE {
-	POE_TYPE_AT = 1,
-	POE_TYPE_AF,
-	POE_TYPE_BT,
-	POE_TYPE_DC,
-	POE_TYPE_MAX
-};
-
-struct poe_irq_data
-{
-	struct device *dev;
-	int irq;
-	struct tasklet_struct tasklet;
-	int poe_type;
-};
-
-static void  *poe_gpio_base;
-static void  *pse_gpio_base;
-struct poe_irq_data *data = NULL;
-u32 mode;
-
-static const struct of_device_id my_of_ids[] = {
-	{.compatible = "poe-judge"},
-	{},
-};
-
-MODULE_DEVICE_TABLE(of,my_of_ids);
-
-static int poe_info_proc_show(struct seq_file *m, void *v)
-{
-	const char *type_str = "invalid";
-
-	switch (data->poe_type) {
-		case POE_TYPE_AT: 
-			type_str = "AT"; 
-			break;
-		case POE_TYPE_AF: 
-			type_str = "AF"; 
-			break;
-		case POE_TYPE_BT: 
-			type_str = "BT"; 
-			break;
-		case POE_TYPE_DC: 
-			type_str = "DC"; 
-			break;
-	}
-
-	seq_printf(m, "%s\n", type_str);
-
-	return 0;
-}
-
-static void poe_tasklet_func(unsigned long data)
-{
-	struct poe_irq_data *irq_data = (struct poe_irq_data *)data;
-
-	writel(0x3, pse_gpio_base+4);
-	irq_data->poe_type = POE_TYPE_BT;
-
-	return;
-}
-
-static irqreturn_t gpio_key1_irq_handler(int irq, void *dev_id)
-{
-	struct poe_irq_data *data = (struct poe_irq_data *)dev_id;
-
-	disable_irq_nosync(data->irq);
-	tasklet_schedule(&data->tasklet);
-
-	return IRQ_HANDLED;
-}
-
-static int poe_info_proc_open(struct inode *inode, struct file *file)
-{
-	return single_open(file, poe_info_proc_show, NULL);
-}
-
-static const struct proc_ops poe_info_proc_fops = {
-	.proc_open = poe_info_proc_open,
-	.proc_read = seq_read,
-	.proc_lseek = seq_lseek,
-	.proc_release = single_release,
-};
-
-static int gpio_key_probe(struct platform_device *dev)
-{
-	int ret = 0;
-	int irq = (-1);
-	int val = 0;
-	int gpio_id = 0;
-	int gpio[GPIO_MAX] = {0}, gpio_val[GPIO_MAX] = {0};
-	int num;
-	char name[16];
-	struct device_node *np = dev->dev.of_node;
-
-	if (of_property_read_u32(np, "detect-mode", &mode)) {
-		pr_err("Failed to read detect mode\n");
-		return -EINVAL;
-	}
-
-	data = devm_kzalloc(&dev->dev, sizeof(struct poe_irq_data), GFP_KERNEL);
-	if (!data)
-	{
-		return -ENOMEM;
-	}
-
-	if (mode & INT_MODE_MASK) {
-		poe_gpio_base = ioremap(0x1017004, 8);
-		pse_gpio_base = ioremap(0x1026000, 8);
-
-		writel(0x2c1, pse_gpio_base);
-		writel(0x0, pse_gpio_base+4);
-
-
-		data->dev = &dev->dev;
-		dev_set_drvdata(&dev->dev, data);
-
-		gpio_id = of_get_named_gpio(dev->dev.of_node, "detect_gpio", 0);
-		if (gpio_id < 0)
-		{
-			return -EINVAL;
-		}
-
-		tasklet_init(&data->tasklet, poe_tasklet_func, (unsigned long)data);
-
-		ret = devm_gpio_request_one(&dev->dev, gpio_id, GPIOF_IN, "poe_judge");
-		if(ret)
-		{
-			pr_err("GPIO23 request failed, ret:%d\n", ret);
-			return ret;
-		}
-
-		val = readl(poe_gpio_base);
-		if(val == 1)
-		{
-			pr_info("poe type is af or bt,close pse first\n");
-			data->poe_type = POE_TYPE_AF;
-		}
-		else
-		{
-			data->poe_type = POE_TYPE_AT;
-		}
-
-		irq = gpio_to_irq(gpio_id);
-		data->irq = irq;
-
-		ret = devm_request_any_context_irq(&dev->dev, data->irq, 
-				gpio_key1_irq_handler, 
-				IRQF_TRIGGER_FALLING, 
-				"poe_judge", data);
-		if (ret)
-		{
-			pr_err("Request irq fail %d\n", ret);
-			return ret;
-		}
-	} else {
-		if (mode == DETECT_MODE1 || mode == DETECT_MODE2) {
-			num = 3;
-		} else {
-			pr_err("Wrong poe detect mode\n");
-			return -ENOMEM;
-		}
-
-		for (int i = 0; i < num; i++) {
-			sprintf(name, "detect-gpio%d", i+1);
-			gpio[i] = of_get_named_gpio(np, name, 0); 	
-			ret = gpio_request(gpio[i], name);
-			if (ret) {
-				pr_err("Can not request gpio %d\n", i+1);
-				return ret;
-			}
-			gpio_direction_input(gpio[i]);
-			gpio_val[i] = gpio_get_value_cansleep(gpio[i]);
-		}
-		
-		if (mode == DETECT_MODE1){
-			if (gpio_val[0] > 0) {
-				data->poe_type = POE_TYPE_DC;
-			} else if (gpio_val[1] > 0){
-				if (gpio_val[2] == 0) {
-					data->poe_type = POE_TYPE_AT;
-				} else {
-					data->poe_type = POE_TYPE_AF;
-				}
-			}
-		}else if (mode == DETECT_MODE2){
-			switch (gpio_val[0] | (gpio_val[1] << 1) | (gpio_val[2] << 2)) {
-				case 3:
-					data->poe_type = POE_TYPE_AT;
-					break;
-				case 4:
-					data->poe_type = POE_TYPE_BT;
-					break;
-				case 7:
-					data->poe_type = POE_TYPE_AF;
-					break;
-			}
-		}
-
-	}
-
-	if (!proc_create("poe_info", 0444, NULL, &poe_info_proc_fops)) {
-		pr_err("Failed to create proc entry for poe_info\n");
-		return -ENOMEM;
-	}
-
-	return ret;
-}
-
-static int gpio_key_remove(struct platform_device *dev)
-{
-	remove_proc_entry("poe_info", NULL);
-
-	return 0;
-}
-
-static struct platform_driver poe_judge_driver =
-{
-	.driver = {
-		.name = "poe_judge",
-		.of_match_table = my_of_ids,
-		.owner = THIS_MODULE,
-	},
-	.probe = gpio_key_probe,
-	.remove = gpio_key_remove,
-};
-
-module_platform_driver(poe_judge_driver);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Poe type judgment driver");
-MODULE_AUTHOR("huangyunxiang<huangyunxiang@cigtech.com>");

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

@@ -777,16 +777,11 @@ hostapd_set_bss_options() {
 			set_default sae_require_mfp 1
 			[ "$ppsk" -eq 0 ] && set_default sae_pwe 2
 		;;
-		psk-sae|eap-eap2)
+		psk-sae|psk2-radius|eap-eap2)
 			set_default ieee80211w 1
 			set_default sae_require_mfp 1
 			[ "$ppsk" -eq 0 ] && set_default sae_pwe 2
 		;;
-                psk2-radius)
-			set_default ieee80211w 1
-			set_default sae_require_mfp 0
-			[ "$ppsk" -eq 0 ] && set_default sae_pwe 4
-                ;;
 	esac
 	[ -n "$sae_require_mfp" ] && append bss_conf "sae_require_mfp=$sae_require_mfp" "$N"
 	[ -n "$sae_pwe" ] && append bss_conf "sae_pwe=$sae_pwe" "$N"

feeds/qca-wifi-7/hostapd/files/mpskd

@@ -144,7 +144,7 @@ function netifd_reload() {
 
 			push(ssid.interfaces, iface.ifname);
 			ssid.bands[band] = iface.ifname;
-			ssid.mpsk = ssid?.mpsk ? true : config.multi_psk;
+			ssid.mpsk = config.multi_psk;
 			for (let sta in iface.stations) {
 				let stacfg = sta.config;
 
@@ -308,18 +308,18 @@ function sta_auth_cache(ifname, addr, idx, phrase) {
 function auth_cb(msg) {
 	let data = msg.data;
 
+	if (!is_ssid_mpsk(data.iface))
+		return;
+
 	printf(`Event ${msg.type}: ${msg.data}\n`);
 	switch (msg.type) {
 	case 'sta_auth':
-		if (!is_ssid_mpsk(data.iface))
-			return;
-
 		return {
 			psk: sta_auth_psk(data.iface, data.sta),
 			force_psk: true,
 		};
 	case 'sta_connected':
-		if (data.psk_idx == null || !is_ssid_mpsk(data.iface))
+		if (data.psk_idx == null)
 			return;
 		return sta_auth_cache(data.iface, data.sta, data.psk_idx, data.psk);
 	case 'reload':

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189.dts

@@ -236,15 +236,6 @@
 			};
 		};
 
-		poe {
-			compatible = "poe-judge";
-			detect-mode = <0x3>;
-			detect-gpio1 = <&tlmm 25 GPIO_ACTIVE_HIGH>;
-			detect-gpio2 = <&tlmm 43 GPIO_ACTIVE_HIGH>;
-			detect-gpio3 = <&tlmm 29 GPIO_ACTIVE_HIGH>;
-			status = "ok";
-                };
-
 		wsi: wsi {
 			id = <0>;
 			num_chip = <2>;

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189h.dts

@@ -298,13 +298,6 @@
 			};
 		};
 
-		poe {
-                        compatible = "poe-judge";
-			detect-mode = <0x11>;
-                        detect_gpio = <&tlmm 0x17 0>;
-                        status = "ok";
-                };
-
 		ess-instance {
 			num_devices = <0x2>;
 

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf189w.dts

@@ -298,13 +298,6 @@
 			};
 		};
 
-		poe {
-                        compatible = "poe-judge";
-			detect-mode = <0x11>;
-                        detect_gpio = <&tlmm 0x17 0>;
-                        status = "ok";
-                };
-
 		ess-instance {
 			num_devices = <0x2>;
 

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-cig-wf672.dts

@@ -234,15 +234,6 @@
 			};
 		};
 
-		poe {
-			compatible = "poe-judge";
-			detect-mode = <0x4>;
-			detect-gpio1 = <&extgpio 0 0>;
-			detect-gpio2 = <&extgpio 1 0>;
-			detect-gpio3 = <&extgpio 2 0>;
-			status = "ok";
-                };
-
 		wsi: wsi {
 			id = <0>;
 			num_chip = <2>;
@@ -547,6 +538,7 @@
 	pinctrl-0 = <&pwm_pins>;
 	pinctrl-names = "default";
 	dft-pwm-status = <0>, <0>, <1>, <0>;
+        poe_type_pin = <&extgpio 0 0 &extgpio 1 0 &extgpio 2 0>;
 	status = "okay";
 };
 

feeds/ucentral/ucentral-client/files/etc/init.d/cpm

@@ -1,14 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=90
-STOP=01
-
-boot() {
-    mkdir -p /tmp/cpm/ || { logger -t init "Failed to create /tmp/cpm"; exit 1; }
-    opkg list-installed > /tmp/packages.state || { logger -t init "Failed to list packages"; exit 1; }
-    if [ -x /usr/share/ucentral/package_list.uc ]; then
-        /usr/share/ucentral/package_list.uc || { logger -t init "Failed to execute package_list.uc"; exit 1; }
-    else
-        logger -t init "package_list.uc not found or not executable"
-    fi
-}

feeds/ucentral/ucentral-schema/Makefile

@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git
-PKG_MIRROR_HASH:=aac8731d564f4ccd85a366417b9a02c1d3de9b6533d1474b58768249c50707f1
+PKG_MIRROR_HASH:=c641622188b9b378550c21b1dcfa105b08a60e534d7d77ae63001d38a3e95cd8
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2025-06-27
-PKG_SOURCE_VERSION:=125a148764c9ef7a02086b6fadccd7b96bfdf591
+PKG_SOURCE_DATE:=2025-01-27
+PKG_SOURCE_VERSION:=ac3a1c7c25339de11e005dd4d1d4007a0c00c4b6
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
 

profiles/cig_wf189.yml

@@ -13,4 +13,3 @@ packages:
   - ipq53xx
   - ftm
   - qca-ssdk-shell
-  - kmod-cig-poe-judgment 

profiles/cig_wf189h.yml

@@ -12,4 +12,3 @@ include:
 packages:
   - ipq53xx
   - qca-ssdk-shell
-  - kmod-cig-poe-judgment 

profiles/cig_wf189w.yml

@@ -12,4 +12,3 @@ include:
 packages:
   - ipq53xx
   - qca-ssdk-shell
-  - kmod-cig-poe-judgment 

profiles/cig_wf672.yml

@@ -21,4 +21,3 @@ packages:
   - kmod-gpio-pca953x
   - kmod-hwmon-tmp103
   - kmod-iio-ilps22qs
-  - kmod-cig-poe-judgment