test

Program sometimes did not setup tc qdisc on some interfaces when creating SSID with dhcpinject enabled initially.

Added delayed startup.

Fixes: WIFI-14522
Signed-off-by: alex18_huang <alex18_huang@accton.com>

.github/workflows/build-dev.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ '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_rap7110c-341x', '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' ]
+        target: [ '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_rap7110c-341x', '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' ]
     steps:
     - uses: actions/checkout@v3
 

feeds/hostapd/hostapd/patches/zzzz-001-fix-assoc-reject-during-roaming.patch

@@ -0,0 +1,46 @@
+Index: hostapd-2023-09-08-e5ccbfc6/src/ap/wpa_auth_ft.c
+===================================================================
+--- hostapd-2023-09-08-e5ccbfc6.orig/src/ap/wpa_auth_ft.c
++++ hostapd-2023-09-08-e5ccbfc6/src/ap/wpa_auth_ft.c
+@@ -3293,6 +3297,8 @@ static int wpa_ft_process_auth_req(struc
+ 	size_t identity_len = 0, radius_cui_len = 0;
+ 	size_t pmk_r1_len, kdk_len, len;
+ 	int retval = WLAN_STATUS_UNSPECIFIED_FAILURE;
++	struct os_reltime now;
++	struct rsn_ftie *ftie;
+ 
+ 	*resp_ies = NULL;
+ 	*resp_ies_len = 0;
+@@ -3324,6 +3330,9 @@ static int wpa_ft_process_auth_req(struc
+ 		goto out;
+ 	}
+ 
++	ftie = (struct rsn_ftie *) parse.ftie;
++	os_memcpy(sm->SNonce, ftie->snonce, WPA_NONCE_LEN);
++
+ 	if (parse.r0kh_id == NULL) {
+ 		wpa_printf(MSG_DEBUG, "FT: Invalid FTIE - no R0KH-ID");
+ 		retval = WLAN_STATUS_INVALID_FTIE;
+@@ -3424,10 +3433,18 @@ pmk_r1_derived:
+ 	os_memcpy(sm->pmk_r1, pmk_r1, pmk_r1_len);
+ 	sm->pmk_r1_len = pmk_r1_len;
+ 
+-	if (random_get_bytes(sm->ANonce, WPA_NONCE_LEN)) {
+-		wpa_printf(MSG_DEBUG, "FT: Failed to get random data for "
+-			   "ANonce");
+-		goto out;
++	if (os_get_reltime(&now) < 0 ||
++	    os_reltime_expired(&now, &sm->ANonce_time, 1)) {
++		if (random_get_bytes(sm->ANonce, WPA_NONCE_LEN)) {
++			wpa_printf(MSG_DEBUG, "FT: Failed to get random data for "
++				   "ANonce");
++			return WLAN_STATUS_UNSPECIFIED_FAILURE;
++		}
++		sm->ANonce_time.sec = now.sec;
++		sm->ANonce_time.usec = now.usec;
++		wpa_printf(MSG_INFO, "FT: ANonce was randomized");
++	} else {
++		wpa_printf(MSG_INFO, "FT: ANonce has not expired");
+ 	}
+ 
+ 	/* Now that we know the correct PMK-R1 length and as such, the length

feeds/ipq807x_v5.4/hostapd/patches/t00-013-proxy-arp-fail-gracefully.patch

@@ -0,0 +1,27 @@
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -1527,19 +1527,15 @@ int hostapd_setup_bss(struct hostapd_dat
+ 		if (x_snoop_init(hapd)) {
+ 			wpa_printf(MSG_ERROR,
+ 				   "Generic snooping infrastructure initialization failed");
+-			return -1;
+-		}
+-
+-		if (dhcp_snoop_init(hapd)) {
++			conf->proxy_arp = 0;
++		} else if (dhcp_snoop_init(hapd)) {
+ 			wpa_printf(MSG_ERROR,
+ 				   "DHCP snooping initialization failed");
+-			return -1;
+-		}
+-
+-		if (ndisc_snoop_init(hapd)) {
++			conf->proxy_arp = 0;
++		} else if (ndisc_snoop_init(hapd)) {
+ 			wpa_printf(MSG_ERROR,
+ 				   "Neighbor Discovery snooping initialization failed");
+-			return -1;
++			conf->proxy_arp = 0;
+ 		}
+ 	}
+ 

feeds/ipq807x_v5.4/hostapd/patches/zzz-FT-Store-PMK-R0-PMK-R1-after-EAPOL-Key-msg-2-4-MIC-v.patch

@@ -0,0 +1,411 @@
+From: Jouni Malinen <quic_jouni@quicinc.com>
+Date: Tue, 14 Feb 2023 11:29:30 +0200
+Subject: [PATCH] FT: Store PMK-R0/PMK-R1 after EAPOL-Key msg 2/4 MIC
+ validation
+
+hostapd was previously storing the derived PMK-R0 and PMK-R1 as soon as
+these keys were derived. While that is fine for most purposes, it is
+unnecessary to do that so quickly and if anything were to fail before
+the supplicant is able to return a valid EAPOL-Key msg 2/4, there would
+not really be any real use for the derived keys.
+
+For the special case of FT-PSK and VLAN determination based on the
+wpa_psk file, the VLAN information is set in the per-STA data structures
+only after the EAPOL-Key msg 2/4 MIC has been verified. This ended up
+storing the PMK-R0/PMK-R1 entries without correct VLAN assignment and as
+such, any use of the FT protocol would not be able to transfer the VLAN
+information through RRB.
+
+Split local storing of the FT key hierarchy for the cases using the FT
+4-way handshake so that PMK-R0 and PMK-R1 are first derived and then
+stored as a separate step after having verified the MIC in the EAPOL-Key
+msg 2/4 (i.e., after having confirmed the per-STA passphrase/PSK was
+selected) and VLAN update. This fixes VLAN information for the
+wpa_psk_file cases with FT-PSK.
+
+Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
+---
+
+--- a/src/ap/wpa_auth.c
++++ b/src/ap/wpa_auth.c
+@@ -58,7 +58,9 @@ static int wpa_group_config_group_keys(s
+ 				       struct wpa_group *group);
+ static int wpa_derive_ptk(struct wpa_state_machine *sm, const u8 *snonce,
+ 			  const u8 *pmk, unsigned int pmk_len,
+-			  struct wpa_ptk *ptk, int force_sha256);
++			  struct wpa_ptk *ptk, int force_sha256,
++			  u8 *pmk_r0, u8 *pmk_r1, u8 *pmk_r0_name,
++			  size_t *key_len);
+ static void wpa_group_free(struct wpa_authenticator *wpa_auth,
+ 			   struct wpa_group *group);
+ static void wpa_group_get(struct wpa_authenticator *wpa_auth,
+@@ -940,6 +942,10 @@ static int wpa_try_alt_snonce(struct wpa
+ 	const u8 *pmk = NULL;
+ 	size_t pmk_len;
+ 	int vlan_id = 0;
++	u8 pmk_r0[PMK_LEN_MAX], pmk_r0_name[WPA_PMK_NAME_LEN];
++	u8 pmk_r1[PMK_LEN_MAX];
++	size_t key_len;
++	int ret = -1;
+ 
+ 	os_memset(&PTK, 0, sizeof(PTK));
+ 	for (;;) {
+@@ -961,8 +967,8 @@ static int wpa_try_alt_snonce(struct wpa
+ 			pmk_len = sm->pmk_len;
+ 		}
+ 
+-		if (wpa_derive_ptk(sm, sm->alt_SNonce, pmk, pmk_len, &PTK, 0) <
+-		    0)
++		if (wpa_derive_ptk(sm, sm->alt_SNonce, pmk, pmk_len, &PTK, 0,
++				   pmk_r0, pmk_r1, pmk_r0_name, &key_len) < 0)
+ 			break;
+ 
+ 		if (wpa_verify_key_mic(sm->wpa_key_mgmt, pmk_len, &PTK,
+@@ -983,7 +989,7 @@ static int wpa_try_alt_snonce(struct wpa
+ 	if (!ok) {
+ 		wpa_printf(MSG_DEBUG,
+ 			   "WPA: Earlier SNonce did not result in matching MIC");
+-		return -1;
++		goto fail;
+ 	}
+ 
+ 	wpa_printf(MSG_DEBUG,
+@@ -992,14 +998,26 @@ static int wpa_try_alt_snonce(struct wpa
+ 
+ 	if (vlan_id && wpa_key_mgmt_wpa_psk(sm->wpa_key_mgmt) &&
+ 	    wpa_auth_update_vlan(sm->wpa_auth, sm->addr, vlan_id) < 0)
+-		return -1;
++		goto fail;
++
++#ifdef CONFIG_IEEE80211R_AP
++	if (wpa_key_mgmt_ft(sm->wpa_key_mgmt) && !sm->ft_completed) {
++		wpa_printf(MSG_DEBUG, "FT: Store PMK-R0/PMK-R1");
++		wpa_auth_ft_store_keys(sm, pmk_r0, pmk_r1, pmk_r0_name,
++				       key_len);
++	}
++#endif /* CONFIG_IEEE80211R_AP */
+ 
+ 	os_memcpy(sm->SNonce, sm->alt_SNonce, WPA_NONCE_LEN);
+ 	os_memcpy(&sm->PTK, &PTK, sizeof(PTK));
+ 	forced_memzero(&PTK, sizeof(PTK));
+ 	sm->PTK_valid = true;
+ 
+-	return 0;
++	ret = 0;
++fail:
++	forced_memzero(pmk_r0, sizeof(pmk_r0));
++	forced_memzero(pmk_r1, sizeof(pmk_r1));
++	return ret;
+ }
+ 
+ 
+@@ -2283,7 +2301,9 @@ SM_STATE(WPA_PTK, PTKSTART)
+ 
+ static int wpa_derive_ptk(struct wpa_state_machine *sm, const u8 *snonce,
+ 			  const u8 *pmk, unsigned int pmk_len,
+-			  struct wpa_ptk *ptk, int force_sha256)
++			  struct wpa_ptk *ptk, int force_sha256,
++			  u8 *pmk_r0, u8 *pmk_r1, u8 *pmk_r0_name,
++			  size_t *key_len)
+ {
+ 	const u8 *z = NULL;
+ 	size_t z_len = 0, kdk_len;
+@@ -2311,7 +2331,8 @@ static int wpa_derive_ptk(struct wpa_sta
+ 						 sm->pairwise,
+ 						 kdk_len);
+ 		}
+-		return wpa_auth_derive_ptk_ft(sm, ptk);
++		return wpa_auth_derive_ptk_ft(sm, ptk, pmk_r0, pmk_r1,
++					      pmk_r0_name, key_len);
+ 	}
+ #endif /* CONFIG_IEEE80211R_AP */
+ 
+@@ -2934,6 +2955,9 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
+ 	struct wpa_eapol_ie_parse kde;
+ 	int vlan_id = 0;
+ 	int owe_ptk_workaround = !!wpa_auth->conf.owe_ptk_workaround;
++	u8 pmk_r0[PMK_LEN_MAX], pmk_r0_name[WPA_PMK_NAME_LEN];
++	u8 pmk_r1[PMK_LEN_MAX];
++	size_t key_len;
+ 
+ 	SM_ENTRY_MA(WPA_PTK, PTKCALCNEGOTIATING, wpa_ptk);
+ 	sm->EAPOLKeyReceived = false;
+@@ -2972,7 +2996,8 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
+ 		}
+ 
+ 		if (wpa_derive_ptk(sm, sm->SNonce, pmk, pmk_len, &PTK,
+-				   owe_ptk_workaround == 2) < 0)
++				   owe_ptk_workaround == 2, pmk_r0, pmk_r1,
++				   pmk_r0_name, &key_len) < 0)
+ 			break;
+ 
+ 		if (mic_len &&
+@@ -3021,7 +3046,7 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
+ 						 sm->last_rx_eapol_key,
+ 						 sm->last_rx_eapol_key_len);
+ 		sm->waiting_radius_psk = 1;
+-		return;
++		goto out;
+ 	}
+ 
+ 	if (!ok) {
+@@ -3029,7 +3054,7 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
+ 				"invalid MIC in msg 2/4 of 4-Way Handshake");
+ 		if (psk_found)
+ 			wpa_auth_psk_failure_report(sm->wpa_auth, sm->addr);
+-		return;
++		goto out;
+ 	}
+ 
+ 	/*
+@@ -3043,12 +3068,12 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
+ 	key_data_length = WPA_GET_BE16(mic + mic_len);
+ 	if (key_data_length > sm->last_rx_eapol_key_len - sizeof(*hdr) -
+ 	    sizeof(*key) - mic_len - 2)
+-		return;
++		goto out;
+ 
+ 	if (wpa_parse_kde_ies(key_data, key_data_length, &kde) < 0) {
+ 		wpa_auth_vlogger(wpa_auth, sm->addr, LOGGER_INFO,
+ 				 "received EAPOL-Key msg 2/4 with invalid Key Data contents");
+-		return;
++		goto out;
+ 	}
+ 	if (kde.rsn_ie) {
+ 		eapol_key_ie = kde.rsn_ie;
+@@ -3075,7 +3100,7 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
+ 		/* MLME-DEAUTHENTICATE.request */
+ 		wpa_sta_disconnect(wpa_auth, sm->addr,
+ 				   WLAN_REASON_PREV_AUTH_NOT_VALID);
+-		return;
++		goto out;
+ 	}
+ 	if ((!sm->rsnxe && kde.rsnxe) ||
+ 	    (sm->rsnxe && !kde.rsnxe) ||
+@@ -3091,7 +3116,7 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
+ 		/* MLME-DEAUTHENTICATE.request */
+ 		wpa_sta_disconnect(wpa_auth, sm->addr,
+ 				   WLAN_REASON_PREV_AUTH_NOT_VALID);
+-		return;
++		goto out;
+ 	}
+ #ifdef CONFIG_OCV
+ 	if (wpa_auth_uses_ocv(sm)) {
+@@ -3103,14 +3128,14 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
+ 		if (wpa_channel_info(wpa_auth, &ci) != 0) {
+ 			wpa_auth_logger(wpa_auth, sm->addr, LOGGER_INFO,
+ 					"Failed to get channel info to validate received OCI in EAPOL-Key 2/4");
+-			return;
++			goto out;
+ 		}
+ 
+ 		if (get_sta_tx_parameters(sm,
+ 					  channel_width_to_int(ci.chanwidth),
+ 					  ci.seg1_idx, &tx_chanwidth,
+ 					  &tx_seg1_idx) < 0)
+-			return;
++			goto out;
+ 
+ 		res = ocv_verify_tx_params(kde.oci, kde.oci_len, &ci,
+ 					   tx_chanwidth, tx_seg1_idx);
+@@ -3127,7 +3152,7 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
+ 					OCV_FAILURE "addr=" MACSTR
+ 					" frame=eapol-key-m2 error=%s",
+ 					MAC2STR(sm->addr), ocv_errorstr);
+-			return;
++			goto out;
+ 		}
+ 	}
+ #endif /* CONFIG_OCV */
+@@ -3135,7 +3160,7 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
+ 	if (ft && ft_check_msg_2_of_4(wpa_auth, sm, &kde) < 0) {
+ 		wpa_sta_disconnect(wpa_auth, sm->addr,
+ 				   WLAN_REASON_PREV_AUTH_NOT_VALID);
+-		return;
++		goto out;
+ 	}
+ #endif /* CONFIG_IEEE80211R_AP */
+ #ifdef CONFIG_P2P
+@@ -3171,7 +3196,7 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
+ 				   "DPP: Peer indicated it supports PFS and local configuration allows this, but PFS was not negotiated for the association");
+ 			wpa_sta_disconnect(wpa_auth, sm->addr,
+ 					   WLAN_REASON_PREV_AUTH_NOT_VALID);
+-			return;
++			goto out;
+ 		}
+ 	}
+ #endif /* CONFIG_DPP2 */
+@@ -3191,7 +3216,7 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
+ 				    sm->sup_pmk_r1_name, WPA_PMK_NAME_LEN);
+ 			wpa_hexdump(MSG_DEBUG, "FT: Derived PMKR1Name",
+ 				    sm->pmk_r1_name, WPA_PMK_NAME_LEN);
+-			return;
++			goto out;
+ 		}
+ 	}
+ #endif /* CONFIG_IEEE80211R_AP */
+@@ -3200,7 +3225,7 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
+ 	    wpa_auth_update_vlan(wpa_auth, sm->addr, vlan_id) < 0) {
+ 		wpa_sta_disconnect(wpa_auth, sm->addr,
+ 				   WLAN_REASON_PREV_AUTH_NOT_VALID);
+-		return;
++		goto out;
+ 	}
+ 
+ 	sm->pending_1_of_4_timeout = 0;
+@@ -3216,9 +3241,20 @@ SM_STATE(WPA_PTK, PTKCALCNEGOTIATING)
+ 
+ 	sm->MICVerified = true;
+ 
++#ifdef CONFIG_IEEE80211R_AP
++	if (wpa_key_mgmt_ft(sm->wpa_key_mgmt) && !sm->ft_completed) {
++		wpa_printf(MSG_DEBUG, "FT: Store PMK-R0/PMK-R1");
++		wpa_auth_ft_store_keys(sm, pmk_r0, pmk_r1, pmk_r0_name,
++				       key_len);
++	}
++#endif /* CONFIG_IEEE80211R_AP */
++
+ 	os_memcpy(&sm->PTK, &PTK, sizeof(PTK));
+ 	forced_memzero(&PTK, sizeof(PTK));
+ 	sm->PTK_valid = true;
++out:
++	forced_memzero(pmk_r0, sizeof(pmk_r0));
++	forced_memzero(pmk_r1, sizeof(pmk_r1));
+ }
+ 
+ 
+--- a/src/ap/wpa_auth_ft.c
++++ b/src/ap/wpa_auth_ft.c
+@@ -2175,13 +2175,13 @@ int wpa_ft_store_pmk_fils(struct wpa_sta
+ }
+ 
+ 
+-int wpa_auth_derive_ptk_ft(struct wpa_state_machine *sm, struct wpa_ptk *ptk)
++int wpa_auth_derive_ptk_ft(struct wpa_state_machine *sm, struct wpa_ptk *ptk,
++			   u8 *pmk_r0, u8 *pmk_r1, u8 *pmk_r0_name,
++			   size_t *key_len)
+ {
+-	u8 pmk_r0[PMK_LEN_MAX], pmk_r0_name[WPA_PMK_NAME_LEN];
+ 	size_t pmk_r0_len = wpa_key_mgmt_sha384(sm->wpa_key_mgmt) ?
+ 		SHA384_MAC_LEN : PMK_LEN;
+ 	size_t pmk_r1_len = pmk_r0_len;
+-	u8 pmk_r1[PMK_LEN_MAX];
+ 	u8 ptk_name[WPA_PMK_NAME_LEN];
+ 	const u8 *mdid = sm->wpa_auth->conf.mobility_domain;
+ 	const u8 *r0kh = sm->wpa_auth->conf.r0_key_holder;
+@@ -2189,13 +2189,6 @@ int wpa_auth_derive_ptk_ft(struct wpa_st
+ 	const u8 *r1kh = sm->wpa_auth->conf.r1_key_holder;
+ 	const u8 *ssid = sm->wpa_auth->conf.ssid;
+ 	size_t ssid_len = sm->wpa_auth->conf.ssid_len;
+-	int psk_local = sm->wpa_auth->conf.ft_psk_generate_local;
+-	int expires_in = sm->wpa_auth->conf.r0_key_lifetime;
+-	struct vlan_description vlan;
+-	struct rate_description rate;
+-	const u8 *identity, *radius_cui;
+-	size_t identity_len, radius_cui_len;
+-	int session_timeout;
+ 	const u8 *mpmk;
+ 	size_t mpmk_len;
+ 
+@@ -2211,10 +2204,41 @@ int wpa_auth_derive_ptk_ft(struct wpa_st
+ 		return -1;
+ 	}
+ 
++	*key_len = pmk_r0_len;
++	if (wpa_derive_pmk_r0(mpmk, mpmk_len, ssid, ssid_len, mdid,
++			      r0kh, r0kh_len, sm->addr,
++			      pmk_r0, pmk_r0_name,
++			      pmk_r0_len == SHA384_MAC_LEN) < 0 ||
++	    wpa_derive_pmk_r1(pmk_r0, pmk_r0_len, pmk_r0_name, r1kh, sm->addr,
++			      pmk_r1, sm->pmk_r1_name) < 0)
++		return -1;
++
++	return wpa_pmk_r1_to_ptk(pmk_r1, pmk_r1_len, sm->SNonce, sm->ANonce,
++				 sm->addr, sm->wpa_auth->addr, sm->pmk_r1_name,
++				 ptk, ptk_name, sm->wpa_key_mgmt, sm->pairwise,
++				 0);
++}
++
++
++void wpa_auth_ft_store_keys(struct wpa_state_machine *sm, const u8 *pmk_r0,
++			    const u8 *pmk_r1, const u8 *pmk_r0_name,
++			    size_t key_len)
++{
++	int psk_local = sm->wpa_auth->conf.ft_psk_generate_local;
++	int expires_in = sm->wpa_auth->conf.r0_key_lifetime;
++	struct vlan_description vlan;
++	struct rate_description rate;
++	const u8 *identity, *radius_cui;
++	size_t identity_len, radius_cui_len;
++	int session_timeout;
++
++	if (psk_local && wpa_key_mgmt_ft_psk(sm->wpa_key_mgmt))
++		return;
++
+ 	if (wpa_ft_get_vlan(sm->wpa_auth, sm->addr, &vlan) < 0) {
+ 		wpa_printf(MSG_DEBUG, "FT: vlan not available for STA " MACSTR,
+ 			   MAC2STR(sm->addr));
+-		return -1;
++		return;
+ 	}
+ 
+ 	wpa_ft_get_rate_limit(sm->wpa_auth, sm->addr, &rate);
+@@ -2224,32 +2248,16 @@ int wpa_auth_derive_ptk_ft(struct wpa_st
+ 					       &radius_cui);
+ 	session_timeout = wpa_ft_get_session_timeout(sm->wpa_auth, sm->addr);
+ 
+-	if (wpa_derive_pmk_r0(mpmk, mpmk_len, ssid, ssid_len, mdid,
+-			      r0kh, r0kh_len, sm->addr,
+-			      pmk_r0, pmk_r0_name,
+-			      wpa_key_mgmt_sha384(sm->wpa_key_mgmt)) < 0)
+-		return -1;
+-	if (!psk_local || !wpa_key_mgmt_ft_psk(sm->wpa_key_mgmt))
+-		wpa_ft_store_pmk_r0(sm->wpa_auth, sm->addr, pmk_r0, pmk_r0_len,
+-				    pmk_r0_name,
+-				    sm->pairwise, &vlan, expires_in,
+-				    session_timeout, identity, identity_len,
+-				    radius_cui, radius_cui_len, &rate);
+-
+-	if (wpa_derive_pmk_r1(pmk_r0, pmk_r0_len, pmk_r0_name, r1kh, sm->addr,
+-			      pmk_r1, sm->pmk_r1_name) < 0)
+-		return -1;
+-	if (!psk_local || !wpa_key_mgmt_ft_psk(sm->wpa_key_mgmt))
+-		wpa_ft_store_pmk_r1(sm->wpa_auth, sm->addr, pmk_r1, pmk_r1_len,
+-				    sm->pmk_r1_name, sm->pairwise, &vlan,
+-				    expires_in, session_timeout, identity,
+-				    identity_len, radius_cui, radius_cui_len,
+-				    &rate);
+-
+-	return wpa_pmk_r1_to_ptk(pmk_r1, pmk_r1_len, sm->SNonce, sm->ANonce,
+-				 sm->addr, sm->wpa_auth->addr, sm->pmk_r1_name,
+-				 ptk, ptk_name, sm->wpa_key_mgmt, sm->pairwise,
+-				 0);
++	wpa_ft_store_pmk_r0(sm->wpa_auth, sm->addr, pmk_r0, key_len,
++			    pmk_r0_name,
++			    sm->pairwise, &vlan, expires_in,
++			    session_timeout, identity, identity_len,
++			    radius_cui, radius_cui_len, &rate);
++
++	wpa_ft_store_pmk_r1(sm->wpa_auth, sm->addr, pmk_r1, key_len,
++			    sm->pmk_r1_name, sm->pairwise, &vlan,
++			    expires_in, session_timeout, identity,
++			    identity_len, radius_cui, radius_cui_len, &rate);
+ }
+ 
+ 
+--- a/src/ap/wpa_auth_i.h
++++ b/src/ap/wpa_auth_i.h
+@@ -302,7 +302,12 @@ int wpa_write_ftie(struct wpa_auth_confi
+ 		   const u8 *anonce, const u8 *snonce,
+ 		   u8 *buf, size_t len, const u8 *subelem,
+ 		   size_t subelem_len, int rsnxe_used);
+-int wpa_auth_derive_ptk_ft(struct wpa_state_machine *sm, struct wpa_ptk *ptk);
++int wpa_auth_derive_ptk_ft(struct wpa_state_machine *sm, struct wpa_ptk *ptk,
++			   u8 *pmk_r0, u8 *pmk_r1, u8 *pmk_r0_name,
++			   size_t *key_len);
++void wpa_auth_ft_store_keys(struct wpa_state_machine *sm, const u8 *pmk_r0,
++			    const u8 *pmk_r1, const u8 *pmk_r0_name,
++			    size_t key_len);
+ struct wpa_ft_pmk_cache * wpa_ft_pmk_cache_init(void);
+ void wpa_ft_pmk_cache_deinit(struct wpa_ft_pmk_cache *cache);
+ void wpa_ft_install_ptk(struct wpa_state_machine *sm, int retry);

feeds/ipq807x_v5.4/ipq50xx/base-files/etc/board.d/02_network

@@ -13,10 +13,10 @@ qcom_setup_interfaces()
 
 	case $board in
 	cig,wf186w)
-		ucidef_add_switch "switch0" "4:wan" "0:lan" "1:lan" "2:lan" "3:lan" "6@eth0"
+		ucidef_add_switch "switch0" "4:wan" "0:lan" "1:lan" "2:lan" "3:lan" "6u@eth0"
 		;;
 	cig,wf186h)
-		ucidef_add_switch "switch0" "4:wan" "1:lan" "2:lan" "6@eth0"
+		ucidef_add_switch "switch0" "4:wan" "1:lan" "2:lan" "6u@eth0"
 		;;
 	sonicfi,rap630c-311g|\
 	cybertan,eww631-a1)
@@ -25,7 +25,7 @@ qcom_setup_interfaces()
 		;;
 	sonicfi,rap630w-311g|\
 	cybertan,eww631-b1)
-		ucidef_add_switch "switch1" "5:wan" "2:lan" "3:lan" "4:lan" "6@eth0"
+		ucidef_add_switch "switch1" "5:wan" "2:lan" "3:lan" "4:lan" "6u@eth0"
 		;;
 	udaya,a6-id2)
 		ucidef_set_interface_wan "eth1"
@@ -46,7 +46,7 @@ qcom_setup_interfaces()
 	edgecore,eap104)
 		ucidef_set_interface_wan "eth0"
 		ucidef_add_switch "switch1" \
-			"6@eth1" "1:lan" "2:lan" "3:lan" "4:lan"
+			"6u@eth1" "1:lan" "2:lan" "3:lan" "4:lan"
 		;;
 	hfcl,ion4x_w|\
 	hfcl,ion4xi_w)
@@ -62,10 +62,10 @@ qcom_setup_interfaces()
 	sonicfi,rap630w-312g|\
 	yuncore,fap655)
 		ucidef_add_switch "switch1" \
-			"6@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
+			"6u@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
 		;;
 	glinet,b3000)
-		ucidef_add_switch "switch1" "6@eth1" "1:wan" "2:lan" "3:lan"
+		ucidef_add_switch "switch1" "6u@eth1" "1:wan" "2:lan" "3:lan"
 		;;
 	esac
 }

feeds/ipq807x_v5.4/mac80211/patches/pending/a-001-fix-roaming-between-phys.patch

@@ -0,0 +1,116 @@
+Index: backports-20210222_001-5.4.164-b157d2276/drivers/net/wireless/ath/ath11k/peer.c
+===================================================================
+--- backports-20210222_001-5.4.164-b157d2276.orig/drivers/net/wireless/ath/ath11k/peer.c
++++ backports-20210222_001-5.4.164-b157d2276/drivers/net/wireless/ath/ath11k/peer.c
+@@ -789,8 +789,6 @@ int ath11k_peer_delete(struct ath11k *ar
+ #endif
+ 	lockdep_assert_held(&ar->conf_mutex);
+ 
+-	reinit_completion(&ar->peer_delete_done);
+-
+ 	ath11k_nss_peer_delete(ar->ab, vdev_id, addr);
+ #ifdef CCPTCFG_ATH11K_NSS_SUPPORTPTCFG_ATH11K_NSS_SUPPORT
+ 	mutex_lock(&ar->ab->base_ast_lock);
+@@ -799,33 +797,60 @@ int ath11k_peer_delete(struct ath11k *ar
+ 	spin_lock_bh(&ar->ab->base_lock);
+ 
+ 	peer = ath11k_peer_find_by_addr(ar->ab, addr);
+-	if (peer) {
++	/* Check if the found peer is what we want to remove.
++	 * While the sta is transitioning to another band we may
++	 * have 2 peer with the same addr assigned to different
++	 * vdev_id. Make sure we are deleting the correct peer.
++	 */
++	if (peer && peer->vdev_id == vdev_id)
++		ath11k_peer_rhash_delete(ar->ab, peer);
++
++	/* Fallback to peer list search if the correct peer can't be found.
++	 * Skip the deletion of the peer from the rhash since it has already
++	 * been deleted in peer add.
++	 */
++	if (!peer)
++		peer = ath11k_peer_find(ar->ab, vdev_id, addr);
++
++
++	if (!peer) {
++		spin_unlock_bh(&ar->ab->base_lock);
++		mutex_unlock(&ar->ab->tbl_mtx_lock);
+ #ifdef CPTCFG_ATH11K_NSS_SUPPORT
+-		peer->delete_in_progress = true;
+-		if (peer->self_ast_entry) {
+-			ath11k_peer_del_ast(ar, peer->self_ast_entry);
+-			peer->self_ast_entry = NULL;
+-		}
++		mutex_unlock(&ar->ab->base_ast_lock);
++#endif
++		ath11k_warn(ar->ab,
++			    "failed to find peer vdev_id %d addr %pM in delete\n",
++			    vdev_id, addr);
++		return -EINVAL;
++        }
++
++#ifdef CPTCFG_ATH11K_NSS_SUPPORT
++	peer->delete_in_progress = true;
++	if (peer->self_ast_entry) {
++		ath11k_peer_del_ast(ar, peer->self_ast_entry);
++		peer->self_ast_entry = NULL;
++	}
+ 
+-		list_for_each_entry_safe(ast_entry, tmp_ast,
+-					 &peer->ast_entry_list, ase_list)
+-			if ((ast_entry->type == ATH11K_AST_TYPE_WDS) ||
+-			    (ast_entry->type == ATH11K_AST_TYPE_MEC)) {
+-				if (!list_empty(&ast_entry->wmi_list)) {
+-					ath11k_dbg(ar->ab, ATH11K_DBG_MAC,
+-						   "%s deleting unprocessed ast entry %pM of peer %pM from wmi list\n",
+-						    __func__, ast_entry->addr, addr);
+-					list_del_init(&ast_entry->wmi_list);
+-				}
++	list_for_each_entry_safe(ast_entry, tmp_ast,
++				 &peer->ast_entry_list, ase_list)
++		if ((ast_entry->type == ATH11K_AST_TYPE_WDS) ||
++		    (ast_entry->type == ATH11K_AST_TYPE_MEC)) {
++			if (!list_empty(&ast_entry->wmi_list)) {
++				ath11k_dbg(ar->ab, ATH11K_DBG_MAC,
++					   "%s deleting unprocessed ast entry %pM of peer %pM from wmi list\n",
++					    __func__, ast_entry->addr, addr);
++				list_del_init(&ast_entry->wmi_list);
+ 			}
++		}
+ #endif
+-		ath11k_peer_rhash_delete(ar->ab, peer);
+-	}
+ 	spin_unlock_bh(&ar->ab->base_lock);
+ 	mutex_unlock(&ar->ab->tbl_mtx_lock);
+ #ifdef CPTCFG_ATH11K_NSS_SUPPORT
+ 	mutex_unlock(&ar->ab->base_ast_lock);
+ #endif
++	reinit_completion(&ar->peer_delete_done);
++
+ 	ret = ath11k_wmi_send_peer_delete_cmd(ar, addr, vdev_id);
+ 	if (ret) {
+ 		ath11k_warn(ar->ab,
+@@ -866,14 +891,20 @@ int ath11k_peer_create(struct ath11k *ar
+ 			    "failed to create peer due to insufficient peer entry resource in firmware\n");
+ 		return -ENOBUFS;
+ 	}
+-
++	mutex_lock(&ar->ab->tbl_mtx_lock);
+ 	spin_lock_bh(&ar->ab->base_lock);
+ 	peer = ath11k_peer_find_by_addr(ar->ab, param->peer_addr);
+ 	if (peer) {
+-		spin_unlock_bh(&ar->ab->base_lock);
+-		return -EINVAL;
++		if (peer->vdev_id == param->vdev_id) {
++			spin_unlock_bh(&ar->ab->base_lock);
++			mutex_unlock(&ar->ab->tbl_mtx_lock);
++			return -EINVAL;
++		}
++		ath11k_peer_rhash_delete(ar->ab, peer);
+ 	}
++
+ 	spin_unlock_bh(&ar->ab->base_lock);
++	mutex_unlock(&ar->ab->tbl_mtx_lock);
+ 
+ 	ret = ath11k_wmi_send_peer_create_cmd(ar, param);
+ 	if (ret) {

feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981b-sonicfi-rap630w-211g.dts

@@ -9,6 +9,11 @@
 / {
 	aliases {
 		serial0 = &uart0;
+
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
@@ -39,31 +44,22 @@
 	leds {
 		compatible = "gpio-leds";
 
-		led_blue {
+		led_power: led_blue {
 			label = "sys:blue";
 			gpios = <&pio 23 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "timer";
-			active-delay = <500>;
-			inactive-delay = <500>;
-			default-state="on";
+			default-state="off";
 		};
 
 		led_green {
 			label = "sys:green";
 			gpios = <&pio 24 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "timer";
-			active-delay = <500>;
-			inactive-delay = <500>;
-			default-state="on";
+			default-state="off";
 		};
 
 		led_red {
 			label = "sys:red";
 			gpios = <&pio 25 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "timer";
-			active-delay = <500>;
-			inactive-delay = <500>;
-			default-state="on";
+			default-state="off";
 		};
 	};
 };
@@ -113,7 +109,7 @@
 
 							port@0 {
 									reg = <0>;
-									label = "lan1";
+									label = "lan3";
 							};
 
 							port@1 {
@@ -123,7 +119,7 @@
 
 							port@2 {
 									reg = <2>;
-									label = "lan3";
+									label = "lan1";
 							};
 
 							port@6 {

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

@@ -42,6 +42,15 @@ define Package/ath12k-firmware-ipq5332-peb/description
 Standard ath12k firmware for IPQ5332 + Pebble from QCA
 endef
 
+define Package/ath12k-firmware-ipq5332-peb-peb
+$(Package/ath12k-firmware-default)
+  TITLE:=ath12k firmware for IPQ5332 + Pebble + Pebble devices
+endef
+
+define Package/ath12k-firmware-ipq5332-peb-peb/description
+Standard ath12k firmware for IPQ5332 + Pebble + Pebble from QCA
+endef
+
 define Build/Compile
 
 endef
@@ -60,10 +69,23 @@ endef
 
 define Package/ath12k-firmware-ipq5332-peb/install
 	$(INSTALL_DIR) $(1)/lib/firmware/IPQ5332/
-	$(INSTALL_DATA) ./files/IPQ5332_peb/* \
+	$(INSTALL_DIR) $(1)/lib/firmware/qcn6432/
+	$(INSTALL_DATA) ./files/IPQ5332_peb/*.* \
 		$(1)/lib/firmware/IPQ5332/
+	$(INSTALL_DATA) ./files/IPQ5332_peb/qcn6432/* \
+		$(1)/lib/firmware/qcn6432/
+endef
+
+define Package/ath12k-firmware-ipq5332-peb-peb/install
+	$(INSTALL_DIR) $(1)/lib/firmware/IPQ5332/
+	$(INSTALL_DIR) $(1)/lib/firmware/qcn6432/
+	$(INSTALL_DATA) ./files/IPQ5332_peb_peb/*.* \
+		$(1)/lib/firmware/IPQ5332/
+	$(INSTALL_DATA) ./files/IPQ5332_peb_peb/qcn6432/* \
+		$(1)/lib/firmware/qcn6432/
 endef
 
 $(eval $(call BuildPackage,ath12k-firmware-qcn92xx))
 $(eval $(call BuildPackage,ath12k-firmware-ipq5332))
 $(eval $(call BuildPackage,ath12k-firmware-ipq5332-peb))
+$(eval $(call BuildPackage,ath12k-firmware-ipq5332-peb-peb))

feeds/qca-wifi-7/ath12k-firmware/files/IPQ5332_peb/qcn6432/fw_ini_cfg.bin

@@ -0,0 +1,16 @@
+//Number of VAPs
+{"Mode": 0,"num vap":17}    // Max VAP support is 17 per MAC
+{"Mode": 1,"num vap":17}    // Max VAP support is 17 per MAC
+{"Mode": 2,"num vap":17}    // Max VAP support is 17 per MAC
+
+//Number of clients
+{"Mode":0, "num clients":256}   // Max client support is 256 for both single MAC and dual MAC
+{"Mode":1, "num clients":256}   // Max client support is 256 per MAC
+{"Mode":2, "num clients":256}   // Max client support is 256 per MAC
+
+// Please do not reduce the default configuration while working in QWRAP Mode.
+
+//AFC Proxy ,Deployment type ,Power mode mask INI configuration
+{"afc_local_rsvd":0,"Deployment_Type":1,"Power_mode_mask":7}
+2<EFBFBD>=R<02>[I<>
+<EFBFBD>;<3B>b|G%<25><><19><05>ъ[<5B>nT

feeds/qca-wifi-7/ath12k-firmware/files/IPQ5332_peb/qcn6432/iu_fw.flist

@@ -0,0 +1,3 @@
+build/ms/bin/5332.wlan_fw2.mia_peb_eval/PIL_IMAGES/qcn6432/iu_fw.b00
+build/ms/bin/5332.wlan_fw2.mia_peb_eval/PIL_IMAGES/qcn6432/iu_fw.b01
+build/ms/bin/5332.wlan_fw2.mia_peb_eval/PIL_IMAGES/qcn6432/iu_fw.b02

feeds/qca-wifi-7/ath12k-firmware/files/IPQ5332_peb/qcn6432/qdss_trace_config.bin

@@ -0,0 +1,181 @@
+seq_start;
+seq_type:mem_req;
+sink:etr_ddr,0x1,0x400;
+seq_end;
+seq_start;
+seq_type:mac_event_trace;
+subsys_cfg_start:umac;
+cxc_eb0:0x2,0x42AAA8B3,0x64BFA3C0,0x00008000,0x0001C0FC;
+reo_eb0:0x4,0x61C81F4,0x0,0x0,0x0;
+tqm_eb0:0x5,0xCDB3C6C6,0x803007E0,0x0,0x0;
+tcl_eb0:0x6,0x25030034,0x3000,0x0,0x0;
+wbm_eb0:0x7,0x880004,0x380000,0x0,0x0;
+cxc_eb1:0x8,0x42AAA8B3,0x64BFA3C0,0x00008000,0x0001C0FC;
+tcl_eb1:0x9,0x25030034,0x3000,0x0,0x0;
+reo_eb1:0xA,0x61C81F4,0x0,0x0,0x0;
+tqm_eb1:0xB,0xCDB3C6C6,0x803007E0,0x0,0x0;
+wbm_eb1:0xC,0x880004,0x380000,0x0,0x0;
+mxi:0xD,0x122234,0x0,0x0,0x0;
+wsib:0xE,0x0,0x0,0x0,0x0;
+memw:0x0;
+subsys_cfg_end:umac;
+subsys_cfg_start:dmac;
+swevt:0x0,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000;
+txdma_eb0:0x1,0x200,0x0,0x0,0x0;
+txdma_eb1:0x2,0xD9220,0xAF0,0x0,0x0;
+txdma_eb2:0x3,0xD9220,0xAF0,0x0,0x0;
+rxdma_eb0:0x4,0x93297E3F,0xC00000,0x0,0x0;
+rxdma_eb1:0x5,0x707F,0x0,0x0,0x0;
+txole_eb0:0x6,0xFFFFFFFF,0x0,0x0,0x0;
+txole_eb1:0x7,0x781F0734,0x6,0x0,0x0;
+txole_eb2:0x8,0x781F0734,0x6,0x0,0x0;
+rxole_eb0:0x9,0xF,0x0,0x0,0x0;
+rxole_eb1:0xA,0x7F,0x0,0x0,0x0;
+rxole_eb2:0xB,0x7F,0x0,0x0,0x0;
+crypto:0xC,0xFF3FFF,0x0,0x0,0x0;
+mxi:0xD,0x122234,0x0,0x0,0x0;
+sfm_eb0:0xE,0x40000003,0x7F8,0x0,0x0;
+rxmon_eb0:0x14,0x22800010,0x40A00,0x0,0x0;
+rxmon_eb1:0x15,0x18005000,0x18,0x0,0x0;
+txmon_eb0:0x12,0x22800010,0x40A00,0x0,0x0;
+txmon_eb1:0x13,0x98005000,0x199,0x0,0x0;
+memw:0x0;
+subsys_cfg_end:dmac;
+subsys_cfg_start:pmac0;
+swevt:0x0,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000;
+hwsch:0x1,0x803FFFF7,0x30003,0x0,0x0;
+pdg:0x2,0xE430F87,0x622856E,0x0,0x0;
+txpcu_eb0:0x8,0xE87A047,0x132,0x0,0x0;
+rxpcu_eb0:0x9,0x10060217,0x1F24500,0x0,0x0;
+rri:0xa,0x0,0x0,0x0,0x0;
+ampi:0xb,0x69C07,0x0,0x0,0x0;
+mxi:0xd,0x122234,0x0,0x0,0x0;
+txpcu_eb1:0x10,0x0,0x0,0x0,0x0;
+sfm_eb1:0x12,0x40000003,0x7F8,0x0,0x0;
+rxpcu_eb1:0x13,0x0,0x0,0x0,0x0;
+hwmlo:0x1c,0x1C100004,0x7800,0x0,0x0;
+memw:0x0;
+subsys_cfg_end:pmac0;
+subsys_cfg_start:pmac1;
+swevt:0x0,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000;
+hwsch:0x1,0x803FFFF7,0x30003,0x0,0x0;
+pdg:0x2,0xE430F87,0x622856E,0x0,0x0;
+txpcu_eb0:0x8,0xE87A047,0x132,0x0,0x0;
+rxpcu_eb0:0x9,0x10060217,0x1F24500,0x0,0x0;
+rri:0xa,0x0,0x0,0x0,0x0;
+ampi:0xb,0x69C07,0x0,0x0,0x0;
+mxi:0xd,0x122234,0x0,0x0,0x0;
+txpcu_eb1:0x10,0x0,0x0,0x0,0x0;
+sfm_eb1:0x12,0x40000003,0x7F8,0x0,0x0;
+rxpcu_eb1:0x13,0x0,0x0,0x0,0x0;
+hwmlo:0x1c,0x1C100004,0x7800,0x0,0x0;
+memw:0x0;
+subsys_cfg_end:pmac1;
+seq_end;
+seq_start;
+seq_type:phy_event_trace;
+subsys_cfg_start:phya0;
+data_tlv:0;
+wsi:0x0,0x00000000,0x00000000;
+rfcntl:0x0,0x00000000,0x00000000;
+tpc:0x0,0x00000000,0x00000000;
+cal:0x0,0x00000000,0x00000000;
+impcorr:0x0,0x00000000,0x00000000;
+mpi:0x6,0x00000006,0x00000000;
+fft:0x0,0x00000000,0x00000000;
+txtd:0x0,0x00000000,0x00000000;
+pmi:0x9,0x0000000A,0x00000000;
+rxtd:0xa,0x0000000A,0x00000000;
+demfront:0x0,0x00000000,0x00000000;
+pcss:0xc,0x0000003E,0x00000000;
+txfd:0x0,0x00000000,0x00000000;
+robe:0x0,0x00000000,0x00000000;
+dmac_0_1:0x0,0x00000000,0x00000000;
+dmac_2_3:0x0,0x00000000,0x00000000;
+dmac_4_5:0x0,0x00000000,0x00000000;
+dmac_6:0x0,0x00000000,0x00000000;
+eos:0x0,0x00000000,0x00000000;
+subsys_cfg_end:phya0;
+//subsys_cfg_start:phya1;
+//data_tlv:1;
+//wsi:0x0,0x00000000,0x00000000;
+//rfcntl:0x0,0x00000000,0x00000000;
+//tpc:0x0,0x00000000,0x00000000;
+//cal:0x0,0x00000000,0x00000000;
+//impcorr:0x0,0x00000000,0x00000000;
+//mpi:0x6,0x00000006,0x00000000;
+//fft:0x0,0x00000000,0x00000000;
+//txtd:0x0,0x00000000,0x00000000;
+//pmi:0x9,0x0000000A,0x00000000;
+//rxtd:0xa,0x0000000A,0x00000000;
+//demfront:0x0,0x00000000,0x00000000;
+//pcss:0xc,0x0000003E,0x00000000;
+//txfd:0x0,0x00000000,0x00000000;
+//robe:0x0,0x00000000,0x00000000;
+//dmac_0_1:0x0,0x00000000,0x00000000;
+//dmac_2_3:0x0,0x00000000,0x00000000;
+//dmac_4_5:0x0,0x00000000,0x00000000;
+//dmac_6:0x0,0x00000000,0x00000000;
+//eos:0x0,0x00000000,0x00000000;
+//subsys_cfg_end:phya1;
+seq_end;
+//seq_start;
+//seq_type:noc_trace;
+//noc_id:umacnoc;
+//syncoutperiod:0x1F;
+//probe_id:0x0;
+//probe_type:0x2;
+//probe_andinv:0x0;
+//probe_portsel:0x1;
+//filter0_path:0x0;
+//filter0_path_mask:0x0;
+//filter0_addr_min_lo:0x0;
+//filter0_addr_min_hi:0x0;
+//filter0_addr_max_lo:0xFFFFFFFF;
+//filter0_addr_max_hi:0xF;
+//filter0_opcode:0x3;
+//filter0_status:0x3;
+//filter0_trtype:0x0;
+//filter0_extid:0x0;
+//filter0_extid_mask:0x0;
+//filter1_path:0x0;
+//filter1_path_mask:0x0;
+//filter1_addr_min_lo:0x0;
+//filter1_addr_min_hi:0x0;
+//filter1_addr_max_lo:0xFFFFFFFF;
+//filter1_addr_max_hi:0xF;
+//filter1_opcode:0x3;
+//filter1_status:0x3;
+//filter1_trtype:0x0;
+//filter1_extid:0x0;
+//filter1_extid_mask:0x0;
+//seq_end;
+//seq_start;
+//seq_type:mac_tlv_trace;
+//subsys_cfg_start:pmac0;
+//tlv_port:tqm_hwsch_tlv;
+//tlv_config:tlv_type,other_tlv,specific_tlv,data_tlv;
+//tlv_config:1,3,3,3;
+//memw:0x2,0x10220A0,0xFFFFFDFF,0x10220B0,0x7FFFFFFF;
+//subsys_cfg_end:pmac0;
+//seq_end;
+//seq_start;
+//seq_start;
+//seq_type:mac_tlv_trace;
+//subsys_cfg_start:pmac1;
+//tlv_port:tqm_hwsch_tlv;
+//tlv_config:tlv_type,other_tlv,specific_tlv,data_tlv;
+//tlv_config:1,3,3,3;
+//memw:0x2,0x10220A0,0xFFFFFDFF,0x10220B0,0x7FFFFFFF;
+//subsys_cfg_end:pmac1;
+//seq_end;
+//seq_start;
+//seq_type:mac_obo_trace;
+//subsys_cfg_start:pmac0;
+//tbus_port:pdg_testbus, 0x7;
+//memw:0x0;
+//subsys_cfg_end:pmac0;
+//seq_end;
+//seq_start;
+//seq_type:irq_trace;
+//seq_end;

feeds/qca-wifi-7/ath12k-firmware/files/IPQ5332_peb_peb/iu_fw.flist

@@ -0,0 +1,3 @@
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/iu_fw.b00
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/iu_fw.b01
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/iu_fw.b02

feeds/qca-wifi-7/ath12k-firmware/files/IPQ5332_peb_peb/q6_fw0.flist

@@ -0,0 +1,11 @@
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw0.b00
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw0.b01
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw0.b02
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw0.b03
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw0.b04
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw0.b05
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw0.b06
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw0.b07
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw0.b08
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw0.b09
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw0.b11

feeds/qca-wifi-7/ath12k-firmware/files/IPQ5332_peb_peb/q6_fw1.flist

@@ -0,0 +1,3 @@
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw1.b00
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw1.b01
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw1.b02

feeds/qca-wifi-7/ath12k-firmware/files/IPQ5332_peb_peb/q6_fw2.flist

@@ -0,0 +1,3 @@
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw2.b00
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw2.b01
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw2.b02

feeds/qca-wifi-7/ath12k-firmware/files/IPQ5332_peb_peb/q6_fw3.flist

@@ -0,0 +1,3 @@
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw3.b00
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw3.b01
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw3.b02

feeds/qca-wifi-7/ath12k-firmware/files/IPQ5332_peb_peb/q6_fw4.flist

@@ -0,0 +1,3 @@
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw4.b00
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw4.b01
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/q6_fw4.b02

feeds/qca-wifi-7/ath12k-firmware/files/IPQ5332_peb_peb/qcn6432/fw_ini_cfg.bin

@@ -0,0 +1,16 @@
+//Number of VAPs
+{"Mode": 0,"num vap":17}    // Max VAP support is 17 per MAC
+{"Mode": 1,"num vap":17}    // Max VAP support is 17 per MAC
+{"Mode": 2,"num vap":17}    // Max VAP support is 17 per MAC
+
+//Number of clients
+{"Mode":0, "num clients":256}   // Max client support is 256 for both single MAC and dual MAC
+{"Mode":1, "num clients":256}   // Max client support is 256 per MAC
+{"Mode":2, "num clients":256}   // Max client support is 256 per MAC
+
+// Please do not reduce the default configuration while working in QWRAP Mode.
+
+//AFC Proxy ,Deployment type ,Power mode mask INI configuration
+{"afc_local_rsvd":0,"Deployment_Type":1,"Power_mode_mask":7}
+2<EFBFBD>=R<02>[I<>
+<EFBFBD>;<3B>b|G%<25><><19><05>ъ[<5B>nT

feeds/qca-wifi-7/ath12k-firmware/files/IPQ5332_peb_peb/qcn6432/iu_fw.flist

@@ -0,0 +1,3 @@
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/qcn6432/iu_fw.b00
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/qcn6432/iu_fw.b01
+build/ms/bin/5332.wlan_fw2.mia_peb_peb_eval_cs/PIL_IMAGES/qcn6432/iu_fw.b02

feeds/qca-wifi-7/ath12k-firmware/files/IPQ5332_peb_peb/qcn6432/qdss_trace_config.bin

@@ -0,0 +1,181 @@
+seq_start;
+seq_type:mem_req;
+sink:etr_ddr,0x1,0x400;
+seq_end;
+seq_start;
+seq_type:mac_event_trace;
+subsys_cfg_start:umac;
+cxc_eb0:0x2,0x42AAA8B3,0x64BFA3C0,0x00008000,0x0001C0FC;
+reo_eb0:0x4,0x61C81F4,0x0,0x0,0x0;
+tqm_eb0:0x5,0xCDB3C6C6,0x803007E0,0x0,0x0;
+tcl_eb0:0x6,0x25030034,0x3000,0x0,0x0;
+wbm_eb0:0x7,0x880004,0x380000,0x0,0x0;
+cxc_eb1:0x8,0x42AAA8B3,0x64BFA3C0,0x00008000,0x0001C0FC;
+tcl_eb1:0x9,0x25030034,0x3000,0x0,0x0;
+reo_eb1:0xA,0x61C81F4,0x0,0x0,0x0;
+tqm_eb1:0xB,0xCDB3C6C6,0x803007E0,0x0,0x0;
+wbm_eb1:0xC,0x880004,0x380000,0x0,0x0;
+mxi:0xD,0x122234,0x0,0x0,0x0;
+wsib:0xE,0x0,0x0,0x0,0x0;
+memw:0x0;
+subsys_cfg_end:umac;
+subsys_cfg_start:dmac;
+swevt:0x0,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000;
+txdma_eb0:0x1,0x200,0x0,0x0,0x0;
+txdma_eb1:0x2,0xD9220,0xAF0,0x0,0x0;
+txdma_eb2:0x3,0xD9220,0xAF0,0x0,0x0;
+rxdma_eb0:0x4,0x93297E3F,0xC00000,0x0,0x0;
+rxdma_eb1:0x5,0x707F,0x0,0x0,0x0;
+txole_eb0:0x6,0xFFFFFFFF,0x0,0x0,0x0;
+txole_eb1:0x7,0x781F0734,0x6,0x0,0x0;
+txole_eb2:0x8,0x781F0734,0x6,0x0,0x0;
+rxole_eb0:0x9,0xF,0x0,0x0,0x0;
+rxole_eb1:0xA,0x7F,0x0,0x0,0x0;
+rxole_eb2:0xB,0x7F,0x0,0x0,0x0;
+crypto:0xC,0xFF3FFF,0x0,0x0,0x0;
+mxi:0xD,0x122234,0x0,0x0,0x0;
+sfm_eb0:0xE,0x40000003,0x7F8,0x0,0x0;
+rxmon_eb0:0x14,0x22800010,0x40A00,0x0,0x0;
+rxmon_eb1:0x15,0x18005000,0x18,0x0,0x0;
+txmon_eb0:0x12,0x22800010,0x40A00,0x0,0x0;
+txmon_eb1:0x13,0x98005000,0x199,0x0,0x0;
+memw:0x0;
+subsys_cfg_end:dmac;
+subsys_cfg_start:pmac0;
+swevt:0x0,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000;
+hwsch:0x1,0x803FFFF7,0x30003,0x0,0x0;
+pdg:0x2,0xE430F87,0x622856E,0x0,0x0;
+txpcu_eb0:0x8,0xE87A047,0x132,0x0,0x0;
+rxpcu_eb0:0x9,0x10060217,0x1F24500,0x0,0x0;
+rri:0xa,0x0,0x0,0x0,0x0;
+ampi:0xb,0x69C07,0x0,0x0,0x0;
+mxi:0xd,0x122234,0x0,0x0,0x0;
+txpcu_eb1:0x10,0x0,0x0,0x0,0x0;
+sfm_eb1:0x12,0x40000003,0x7F8,0x0,0x0;
+rxpcu_eb1:0x13,0x0,0x0,0x0,0x0;
+hwmlo:0x1c,0x1C100004,0x7800,0x0,0x0;
+memw:0x0;
+subsys_cfg_end:pmac0;
+subsys_cfg_start:pmac1;
+swevt:0x0,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000;
+hwsch:0x1,0x803FFFF7,0x30003,0x0,0x0;
+pdg:0x2,0xE430F87,0x622856E,0x0,0x0;
+txpcu_eb0:0x8,0xE87A047,0x132,0x0,0x0;
+rxpcu_eb0:0x9,0x10060217,0x1F24500,0x0,0x0;
+rri:0xa,0x0,0x0,0x0,0x0;
+ampi:0xb,0x69C07,0x0,0x0,0x0;
+mxi:0xd,0x122234,0x0,0x0,0x0;
+txpcu_eb1:0x10,0x0,0x0,0x0,0x0;
+sfm_eb1:0x12,0x40000003,0x7F8,0x0,0x0;
+rxpcu_eb1:0x13,0x0,0x0,0x0,0x0;
+hwmlo:0x1c,0x1C100004,0x7800,0x0,0x0;
+memw:0x0;
+subsys_cfg_end:pmac1;
+seq_end;
+seq_start;
+seq_type:phy_event_trace;
+subsys_cfg_start:phya0;
+data_tlv:0;
+wsi:0x0,0x00000000,0x00000000;
+rfcntl:0x0,0x00000000,0x00000000;
+tpc:0x0,0x00000000,0x00000000;
+cal:0x0,0x00000000,0x00000000;
+impcorr:0x0,0x00000000,0x00000000;
+mpi:0x6,0x00000006,0x00000000;
+fft:0x0,0x00000000,0x00000000;
+txtd:0x0,0x00000000,0x00000000;
+pmi:0x9,0x0000000A,0x00000000;
+rxtd:0xa,0x0000000A,0x00000000;
+demfront:0x0,0x00000000,0x00000000;
+pcss:0xc,0x0000003E,0x00000000;
+txfd:0x0,0x00000000,0x00000000;
+robe:0x0,0x00000000,0x00000000;
+dmac_0_1:0x0,0x00000000,0x00000000;
+dmac_2_3:0x0,0x00000000,0x00000000;
+dmac_4_5:0x0,0x00000000,0x00000000;
+dmac_6:0x0,0x00000000,0x00000000;
+eos:0x0,0x00000000,0x00000000;
+subsys_cfg_end:phya0;
+//subsys_cfg_start:phya1;
+//data_tlv:1;
+//wsi:0x0,0x00000000,0x00000000;
+//rfcntl:0x0,0x00000000,0x00000000;
+//tpc:0x0,0x00000000,0x00000000;
+//cal:0x0,0x00000000,0x00000000;
+//impcorr:0x0,0x00000000,0x00000000;
+//mpi:0x6,0x00000006,0x00000000;
+//fft:0x0,0x00000000,0x00000000;
+//txtd:0x0,0x00000000,0x00000000;
+//pmi:0x9,0x0000000A,0x00000000;
+//rxtd:0xa,0x0000000A,0x00000000;
+//demfront:0x0,0x00000000,0x00000000;
+//pcss:0xc,0x0000003E,0x00000000;
+//txfd:0x0,0x00000000,0x00000000;
+//robe:0x0,0x00000000,0x00000000;
+//dmac_0_1:0x0,0x00000000,0x00000000;
+//dmac_2_3:0x0,0x00000000,0x00000000;
+//dmac_4_5:0x0,0x00000000,0x00000000;
+//dmac_6:0x0,0x00000000,0x00000000;
+//eos:0x0,0x00000000,0x00000000;
+//subsys_cfg_end:phya1;
+seq_end;
+//seq_start;
+//seq_type:noc_trace;
+//noc_id:umacnoc;
+//syncoutperiod:0x1F;
+//probe_id:0x0;
+//probe_type:0x2;
+//probe_andinv:0x0;
+//probe_portsel:0x1;
+//filter0_path:0x0;
+//filter0_path_mask:0x0;
+//filter0_addr_min_lo:0x0;
+//filter0_addr_min_hi:0x0;
+//filter0_addr_max_lo:0xFFFFFFFF;
+//filter0_addr_max_hi:0xF;
+//filter0_opcode:0x3;
+//filter0_status:0x3;
+//filter0_trtype:0x0;
+//filter0_extid:0x0;
+//filter0_extid_mask:0x0;
+//filter1_path:0x0;
+//filter1_path_mask:0x0;
+//filter1_addr_min_lo:0x0;
+//filter1_addr_min_hi:0x0;
+//filter1_addr_max_lo:0xFFFFFFFF;
+//filter1_addr_max_hi:0xF;
+//filter1_opcode:0x3;
+//filter1_status:0x3;
+//filter1_trtype:0x0;
+//filter1_extid:0x0;
+//filter1_extid_mask:0x0;
+//seq_end;
+//seq_start;
+//seq_type:mac_tlv_trace;
+//subsys_cfg_start:pmac0;
+//tlv_port:tqm_hwsch_tlv;
+//tlv_config:tlv_type,other_tlv,specific_tlv,data_tlv;
+//tlv_config:1,3,3,3;
+//memw:0x2,0x10220A0,0xFFFFFDFF,0x10220B0,0x7FFFFFFF;
+//subsys_cfg_end:pmac0;
+//seq_end;
+//seq_start;
+//seq_start;
+//seq_type:mac_tlv_trace;
+//subsys_cfg_start:pmac1;
+//tlv_port:tqm_hwsch_tlv;
+//tlv_config:tlv_type,other_tlv,specific_tlv,data_tlv;
+//tlv_config:1,3,3,3;
+//memw:0x2,0x10220A0,0xFFFFFDFF,0x10220B0,0x7FFFFFFF;
+//subsys_cfg_end:pmac1;
+//seq_end;
+//seq_start;
+//seq_type:mac_obo_trace;
+//subsys_cfg_start:pmac0;
+//tbus_port:pdg_testbus, 0x7;
+//memw:0x0;
+//subsys_cfg_end:pmac0;
+//seq_end;
+//seq_start;
+//seq_type:irq_trace;
+//seq_end;

feeds/qca-wifi-7/ath12k-firmware/files/IPQ5332_peb_peb/qdss_trace_config.bin

@@ -0,0 +1,133 @@
+seq_start;
+seq_type:mem_req;
+sink:etr_ddr,0x1,0x400;
+seq_end;
+seq_start;
+seq_type:mac_event_trace;
+subsys_cfg_start:umac;
+cxc_eb0:0x2,0x42AAA8B3,0x64BFA3C0,0x00008000,0x0001C0FC;
+reo_eb0:0x4,0x61C81F4,0x0,0x0,0x0;
+tqm_eb0:0x5,0xCDB3C6C6,0x803007E0,0x0,0x0;
+tcl_eb0:0x6,0x25030034,0x3000,0x0,0x0;
+wbm_eb0:0x7,0x880004,0x380000,0x0,0x0;
+cxc_eb1:0x8,0x42AAA8B3,0x64BFA3C0,0x00008000,0x0001C0FC;
+tcl_eb1:0x9,0x25030034,0x3000,0x0,0x0;
+reo_eb1:0xA,0x61C81F4,0x0,0x0,0x0;
+tqm_eb1:0xB,0xCDB3C6C6,0x803007E0,0x0,0x0;
+wbm_eb1:0xC,0x880004,0x380000,0x0,0x0;
+wsib:0xE,0x0,0x0,0x0,0x0;
+memw:0x0;
+subsys_cfg_end:umac;
+subsys_cfg_start:dmac;
+swevt:0x0,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000;
+txdma_eb0:0x1,0x0,0x0,0x0,0x0;
+txdma_eb1:0x2,0x286C0,0x83C304,0x0,0x0;
+txdma_eb2:0x3,0x286C0,0x83C304,0x0,0x0;
+rxdma_eb0:0x4,0x93297E3F,0xC00000,0x0,0x0;
+rxdma_eb1:0x5,0x707F,0x0,0x0,0x0;
+txole_eb0:0x6,0xFFFFFFFF,0x0,0x0,0x0;
+txole_eb1:0x7,0x781F0734,0x6,0x0,0x0;
+txole_eb2:0x8,0x781F0734,0x6,0x0,0x0;
+rxole_eb0:0x9,0xF,0x0,0x0,0x0;
+rxole_eb1:0xA,0x7F,0x0,0x0,0x0;
+rxole_eb2:0xB,0x7F,0x0,0x0,0x0;
+crypto:0xC,0xFF3FFF,0x0,0x0,0x0;
+mxi:0xD,0x122234,0x0,0x0,0x0;
+sfm_eb0:0xE,0x40000003,0x7F8,0x0,0x0;
+rxmon_eb0:0x14,0x0,0x0,0x0,0x0;
+rxmon_eb1:0x15,0x0,0x0,0x0,0x0;
+txmon_eb0:0x12,0x0,0x0,0x0,0x0;
+txmon_eb1:0x13,0x0,0x0,0x0,0x0;
+memw:0x0;
+subsys_cfg_end:dmac;
+subsys_cfg_start:pmac0;
+swevt:0x0,0xFFFFFFFF,0xFFFFFFFF,0x00000000,0x00000000;
+hwsch:0x1,0x3FFFF7,0x30000,0x0,0x0;
+pdg:0x2,0xE430F87,0x622856E,0x0,0x0;
+txpcu_eb0:0x8,0xE87A047,0x112,0x0,0x0;
+rxpcu_eb0:0x9,0x10060217,0x1824500,0x0,0x0;
+rri:0xa,0x0,0x0,0x0,0x0;
+ampi:0xb,0x69C07,0x0,0x0,0x0;
+mxi:0xd,0x122234,0x0,0x0,0x0;
+txpcu_eb1:0x10,0x0,0x0,0x0,0x0;
+sfm_eb1:0x12,0x40000003,0x7F8,0x0,0x0;
+rxpcu_eb1:0x13,0x0,0x0,0x0,0x0;
+hwmlo:0x1c,0x1C100004,0x0,0x0,0x0;
+memw:0x0;
+subsys_cfg_end:pmac0;
+seq_end;
+seq_start;
+seq_type:phy_event_trace;
+subsys_cfg_start:phya0;
+data_tlv:0;
+wsi:0x0,0x00000000,0x00000000;
+rfcntl:0x0,0x00000000,0x00000000;
+tpc:0x0,0x00000000,0x00000000;
+cal:0x0,0x00000000,0x00000000;
+impcorr:0x0,0x00000000,0x00000000;
+mpi:0x6,0x00000006,0x00000000;
+fft:0x0,0x00000000,0x00000000;
+txtd:0x0,0x00000000,0x00000000;
+pmi:0x9,0x0000000A,0x00000000;
+rxtd:0xa,0x0000000A,0x00000000;
+demfront:0x0,0x00000000,0x00000000;
+pcss:0xc,0x0000003E,0x00000000;
+txfd:0x0,0x00000000,0x00000000;
+robe:0x0,0x00000000,0x00000000;
+dmac_0_1:0x0,0x00000000,0x00000000;
+dmac_2_3:0x0,0x00000000,0x00000000;
+dmac_4_5:0x0,0x00000000,0x00000000;
+dmac_6:0x0,0x00000000,0x00000000;
+eos:0x0,0x00000000,0x00000000;
+subsys_cfg_end:phya0;
+seq_end;
+//seq_start;
+//seq_type:noc_trace;
+//noc_id:umacnoc;
+//syncoutperiod:0x1F;
+//probe_id:0x0;
+//probe_type:0x2;
+//probe_andinv:0x0;
+//probe_portsel:0x1;
+//filter0_path:0x0;
+//filter0_path_mask:0x0;
+//filter0_addr_min_lo:0x0;
+//filter0_addr_min_hi:0x0;
+//filter0_addr_max_lo:0xFFFFFFFF;
+//filter0_addr_max_hi:0xF;
+//filter0_opcode:0x3;
+//filter0_status:0x3;
+//filter0_trtype:0x0;
+//filter0_extid:0x0;
+//filter0_extid_mask:0x0;
+//filter1_path:0x0;
+//filter1_path_mask:0x0;
+//filter1_addr_min_lo:0x0;
+//filter1_addr_min_hi:0x0;
+//filter1_addr_max_lo:0xFFFFFFFF;
+//filter1_addr_max_hi:0xF;
+//filter1_opcode:0x3;
+//filter1_status:0x3;
+//filter1_trtype:0x0;
+//filter1_extid:0x0;
+//filter1_extid_mask:0x0;
+//seq_end;
+//seq_start;
+//seq_type:mac_tlv_trace;
+//subsys_cfg_start:pmac0;
+//tlv_port:txpcu_ampi_tlv;
+//tlv_config:tlv_type,other_tlv,specific_tlv,data_tlv;
+//tlv_config:1,3,3,3;
+//memw:0x0;
+//subsys_cfg_end:pmac0;
+//seq_end;
+//seq_start;
+//seq_type:mac_obo_trace;
+//subsys_cfg_start:pmac0;
+//tbus_port:pdg_testbus, 0x7;
+//memw:0x0;
+//subsys_cfg_end:pmac0;
+//seq_end;
+//seq_start;
+//seq_type:irq_trace;
+//seq_end;

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

@@ -53,6 +53,11 @@ $(call Package/ath12k-wifi-default)
     TITLE:=board-2.bin for RAP750W_311a
 endef
 
+define Package/ath12k-wifi-cig-wf189w
+$(call Package/ath12k-wifi-default)
+    TITLE:=board-2.bin for WF189W
+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/
@@ -76,10 +81,23 @@ endef
 
 define Package/ath12k-wifi-sonicfi-rap750w-311a/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
-	$(INSTALL_DATA) ./ board-2.bin.rap750w_311a.IPQ5332$(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(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.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+#	$(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
+
+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.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
 endef
 
 $(eval $(call BuildPackage,ath12k-wifi-cig-wf189))
 $(eval $(call BuildPackage,ath12k-wifi-edgecore-eap105))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap7110c-341x))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap750w-311a))
+$(eval $(call BuildPackage,ath12k-wifi-cig-wf189w))

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

@@ -73,6 +73,10 @@ hostapd_append_wpa_key_mgmt() {
 		owe)
 			append wpa_key_mgmt "OWE"
 		;;
+		psk2-radius)
+			append wpa_key_mgmt "WPA-PSK"
+			[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-PSK"
+		;;
 	esac
 
 	[ "$fils" -gt 0 ] && {
@@ -663,7 +667,7 @@ 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
@@ -790,6 +794,10 @@ hostapd_set_bss_options() {
 			append bss_conf "wep_default_key=$wep_keyidx" "$N"
 			[ -n "$wep_rekey" ] && append bss_conf "wep_rekey_period=$wep_rekey" "$N"
 		;;
+		psk2-radius)
+			append bss_conf "wpa_psk_radius=3" "$N"
+			append_radius_server
+			vlan_possible=1
 	esac
 
 	case "$auth_type" in

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

@@ -14,6 +14,9 @@ sercomm,ap72tip)
 sonicfi,rap7110c-341x)
 	ucidef_set_led_default "power" "POWER" "pwm:blue" "on"
 	;;
+cig,wf189w)
+	ucidef_set_led_default "power" "POWER" "pwm:blue" "on"
+	;;
 esac
 
 board_config_flush

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

@@ -21,6 +21,9 @@ ipq53xx_setup_interfaces()
 	sonicfi,rap7110c-341x)
 		ucidef_set_interfaces_lan_wan "" "eth0"
 		;;
+	cig,wf189w)
+		ucidef_add_switch "switch1" "5u@eth0" "3:lan" "2:lan" "1:lan" "0u@eth1" "4:wan"
+		;;
 	esac
 }
 
@@ -28,6 +31,7 @@ qcom_setup_macs()
 {
         local board="$1"
         case $board in
+	cig,wf189w|\
         cig,wf189)
 		mtd=$(find_mtd_chardev "0:APPSBLENV")
 		[ -z "$mtd" ] && return;
@@ -46,7 +50,8 @@ qcom_setup_macs()
                 wan_mac=$(cat /sys/class/net/eth0/address)
                 lan_mac=$(macaddr_add "$wan_mac" 1)
 		;;
-        sonicfi,rap7110c-341x)
+        sonicfi,rap7110c-341x|\
+        sonicfi,rap750w-311a)
                 wan_mac=$(cat /sys/class/net/eth0/address)
                 ucidef_set_wireless_macaddr_base 2g $(macaddr_add "$wan_mac" 1)
                 ucidef_set_wireless_macaddr_base 5g $(macaddr_add "$wan_mac" 2)

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

@@ -27,15 +27,18 @@ board=$(board_name)
 case "$FIRMWARE" in
 ath12k/IPQ5332/hw1.0/caldata.bin)
 	case "$board" in
+	cig,wf189w|\
 	cig,wf189|\
 	edgecore,eap105|\
-	sonicfi,rap750w-311a|\
 	sercomm,ap72tip)
 		caldata_extract "0:ART" 0x1000 0x20000 
 		;;
 	sonicfi,rap7110c-341x)
 		caldata_extract_mmc "0:ART" 0x1000 0xF800
 		;;
+	sonicfi,rap750w-311a)
+		caldata_extract "0:ART" 0x1000 0xf800 
+		;;
 	esac
 	;;
 ath12k/QCN92XX/hw1.0/cal-pci-0001:01:00.0.bin)
@@ -50,6 +53,27 @@ ath12k/QCN92XX/hw1.0/cal-pci-0001:01:00.0.bin)
 		;;
 	esac
 	;;
+ath12k/QCN6432/hw1.0/caldata_1.bin)
+	case "$board" in
+	sonicfi,rap750w-311a)
+		caldata_extract "0:ART" 0x26800 0x18800
+		;;
+	esac
+	;;
+ath12k/QCN6432/hw1.0/cal-ahb-soc@0:wifi1@c0000000.bin)
+	case "$board" in
+	cig,wf189w)
+		caldata_extract "0:ART" 0x26800 0x20000
+		;;
+	esac
+	;;
+ath12k/QCN6432/hw1.0/cal-ahb-soc@0:wifi2@c0000000.bin)
+	case "$board" in
+	cig,wf189w)
+		caldata_extract "0:ART" 0x58800 0x20000
+		;;
+	esac
+	;;
 *)
 	exit 1
 	;;

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

@@ -35,35 +35,33 @@ do_flash_emmc() {
 	tar Oxf $tar_file ${board_dir}/$part | dd of=${emmcblock}
 }
 
+sonicfi_dualimage_check() {
+	local boot_part=""
+	boot_part=$(fw_printenv | grep bootfrom | awk -F'=' '{printf $2}')
+	[ -n "$boot_part" ] || boot_part="0"
+	echo "boot_part=$boot_part" > /dev/console
+
+	if [ "$boot_part" = "0" ]; then
+		block_kernel="0:HLOS_1"
+		block_rootfs="rootfs_1"
+		CI_UBIPART="rootfs_1"
+		fw_setenv bootfrom 1
+	elif [ "$boot_part" = "1" ]; then
+		block_kernel="0:HLOS"
+		block_rootfs="rootfs"
+		CI_UBIPART="rootfs"
+		fw_setenv bootfrom 0
+	else
+		echo "Invalid boot partition $boot_part! Skip upgrade....."
+		return
+	fi
+}
+
 emmc_do_upgrade() {
 	local tar_file="$1"
-	local block_kernel="0:HLOS"
-	local block_rootfs="rootfs"
 	local board_dir=$(tar tf $tar_file | grep -m 1 '^sysupgrade-.*/$')
 	board_dir=${board_dir%/}
-
-	board=$(board_name)
-	case $board in
-	sonicfi,rap7110c-341x)
-		local boot_part=""
-		boot_part=$(fw_printenv | grep bootfrom | awk -F'=' '{printf $2}')
-		[ -n "$boot_part" ] || boot_part="0"
-		echo "**** boot_part=$boot_part" > /dev/console
-
-		if [ "$boot_part" = "0" ]; then
-			block_kernel="0:HLOS_1"
-			block_rootfs="rootfs_1"
-			fw_setenv bootfrom 1
-		elif [ "$boot_part" = "1" ]; then
-			block_kernel="0:HLOS"
-			block_rootfs="rootfs"
-			fw_setenv bootfrom 0
-		else
-			echo "Invalid boot partition $boot_part! Skip upgrade....."
-			return
-		fi
-		;;
-	esac
+	echo "block_kernel=$block_kernel, block_rootfs=$block_rootfs" > /dev/console
 	do_flash_emmc $tar_file $block_kernel $board_dir kernel
 	do_flash_emmc $tar_file $block_rootfs $board_dir root
 
@@ -83,9 +81,12 @@ platform_do_upgrade() {
 	CI_UBIPART="rootfs"
 	CI_ROOTPART="ubi_rootfs"
 	CI_IPQ807X=1
+	block_kernel="0:HLOS"
+	block_rootfs="rootfs"
 
 	board=$(board_name)
 	case $board in
+	cig,wf189w|\
 	cig,wf189)
 		if [ -f /proc/boot_info/bootconfig0/rootfs/upgradepartition ]; then
 			CI_UBIPART="$(cat /proc/boot_info/bootconfig0/rootfs/upgradepartition)"
@@ -111,7 +112,12 @@ platform_do_upgrade() {
 		nand_upgrade_tar "$1"
 		;;
 	sonicfi,rap7110c-341x)
+		sonicfi_dualimage_check
 		emmc_do_upgrade $1 $1
-	;;
+		;;
+	sonicfi,rap750w-311a)
+		sonicfi_dualimage_check
+		nand_upgrade_tar "$1"
+		;;
 	esac
 }

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

@@ -39,6 +39,7 @@
 			phyaddr_fixup = <0xC90F018>;
 			uniphyaddr_fixup = <0xC90F014>;
 			mdio_clk_fixup; /* MDIO clock sequence fix up flag */
+			tip,clk_div = <0xff>; /* MDIO Frequency reduction*/
 
 			phy0: ethernet-phy@0 {
 				reg = <8>;

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

@@ -0,0 +1,787 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+/*
+ * IPQ5332 RDP446 board device tree source
+ *
+ * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+
+#include "ipq5332.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+#include "ipq5332-default-memory.dtsi"
+
+/ {
+	model = "CIG WF189W";
+	compatible = "cig,wf189w", "qcom,ipq5332-ap-mi04.1", "qcom,ipq5332-rdp446", "qcom,ipq5332";
+
+	/*     1G  Layout for IPQ5332 + QCN6432 + QCN6432
+	 * +==========+==============+========================+
+	 * |         |              |                         |
+	 * |  Region | Start Offset |          Size           |
+	 * |         |              |                         |
+	 * +---------+--------------+-------------------------+
+	 * |   Q6    |              |                         |
+	 * |  code/  |  0x4A900000  |          25MB           |
+	 * |  data   |              |                         |
+	 * +---------+--------------+-------------------------+
+	 * | IPQ5332 |              |                         |
+	 * |  data   |  0x4C200000  |          21MB           |
+	 * +---------+--------------+-------------------------+
+	 * | IPQ5332 |              |                         |
+	 * | M3 Dump |  0x4D700000  |           1MB           |
+	 * +---------+--------------+-------------------------+
+	 * | IPQ5332 |              |                         |
+	 * |  QDSS   |  0x4D800000  |           1MB           |
+	 * +---------+--------------+-------------------------+
+	 * | IPQ5332 |              |                         |
+	 * |  CALDB  |  0x4D900000  |           5MB           |
+	 * +---------+--------------+-------------------------+
+	 * |QCN6432_1|              |                         |
+	 * |  data   |  0x4DE00000  |          21MB           |
+	 * +---------+--------------+-------------------------+
+	 * |QCN6432_1|              |                         |
+	 * | M3 Dump |  0x4F300000  |           1MB           |
+	 * +---------+--------------+-------------------------+
+	 * |QCN6432_1|              |                         |
+	 * |  QDSS   |  0x4E400000  |           1MB           |
+	 * +---------+--------------+-------------------------+
+	 * |QCN6432_1|              |                         |
+	 * |  CALDB  |  0x4F500000  |           5MB           |
+	 * +---------+--------------+-------------------------+
+	 * |QCN6432_2|              |                         |
+	 * |  data   |  0x4FA00000  |          21MB           |
+	 * +---------+--------------+-------------------------+
+	 * |QCN6432_2|              |                         |
+	 * | M3 Dump |  0x50F00000  |           1MB           |
+	 * +---------+--------------+-------------------------+
+	 * |QCN6432_2|              |                         |
+	 * |  QDSS   |  0x51000000  |           1MB           |
+	 * +---------+--------------+-------------------------+
+	 * |QCN6432_2|              |                         |
+	 * |  CALDB  |  0x51100000  |           5MB           |
+	 * +---------+--------------+-------------------------+
+	 * |         |              |                         |
+	 * |   MLO   |  0x51600000  |          12MB           |
+	 * +==================================================+
+	 * |                                                  |
+	 * |                                                  |
+	 * |                                                  |
+	 * |             Rest of memory for Linux             |
+	 * |                                                  |
+	 * |                                                  |
+	 * |                                                  |
+	 * +==================================================+
+	 */
+
+	reserved-memory {
+
+		/delete-node/ m3_dump@4cc00000;
+		/delete-node/ q6_etr_dump@1;
+		/delete-node/ mlo_global_mem_0@0x4db00000;
+		/delete-node/ wcnss@4a900000;
+		/delete-node/ q6_caldb_region@4ce00000;
+
+		q6_mem_regions: q6_mem_regions@4A900000  {
+			reg = <0x0 0x4a900000 0x0 0x6D00000>;
+			no-map;
+		};
+
+		q6_code_data: q6_code_data@4A900000 {
+			reg = <0x0 0x4a900000 0x0 0x1900000>;
+			no-map;
+		};
+
+		q6_ipq5332_data: q6_ipq5332_data@4C200000 {
+			reg = <0x0 0x4C200000 0x0 0x1500000>;
+			no-map;
+		};
+
+		m3_dump: m3_dump@4D700000 {
+			reg = <0x0 0x4D700000 0x0 0x100000>;
+			no-map;
+		};
+
+		q6_etr_region: q6_etr_dump@4D800000 {
+			reg = <0x0 0x4D800000 0x0 0x100000>;
+			no-map;
+		};
+
+		q6_ipq5332_caldb: q6_ipq5332_caldb@4D900000 {
+			reg = <0x0 0x4D900000 0x0 0x500000>;
+			no-map;
+		};
+
+		q6_qcn6432_data_1: q6_qcn6432_data_1@4DE00000 {
+			reg = <0x0 0x4DE00000 0x0 0x1500000>;
+			no-map;
+		};
+
+		m3_dump_qcn6432_1: m3_dump_qcn6432_1@4F300000 {
+			reg = <0x0 0x4F300000 0x0 0x100000>;
+			no-map;
+                };
+
+		q6_qcn6432_etr_1: q6_qcn6432_etr_1@4F400000 {
+			reg = <0x0 0x4F400000 0x0 0x100000>;
+			no-map;
+		};
+
+		q6_qcn6432_caldb_1: q6_qcn6432_caldb_1@4F500000 {
+			reg = <0x0 0x4F500000 0x0 0x500000>;
+			no-map;
+		};
+
+		q6_qcn6432_data_2: q6_qcn6432_data_2@4FA00000 {
+			reg = <0x0 0x4FA00000 0x0 0x1500000>;
+			no-map;
+		};
+
+		m3_dump_qcn6432_2: m3_dump_qcn6432_2@50F00000 {
+			reg = <0x0 0x50F00000 0x0 0x100000>;
+			no-map;
+                };
+
+		q6_qcn6432_etr_2: q6_qcn6432_etr_2@51000000 {
+			reg = <0x0 0x51000000 0x0 0x100000>;
+			no-map;
+		};
+
+		q6_qcn6432_caldb_2: q6_qcn6432_caldb_2@51100000 {
+			reg = <0x0 0x51100000 0x0 0x500000>;
+			no-map;
+		};
+
+		mlo_global_mem0: mlo_global_mem_0@51600000 {
+			reg = <0x0 0x51600000 0x0 0xC00000>;
+			no-map;
+		};
+	};
+
+	aliases {
+		serial0 = &blsp1_uart0;
+		serial1 = &blsp1_uart1;
+		ethernet0 = "/soc/dp1";
+		ethernet1 = "/soc/dp2";
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
+	};
+
+	chosen {
+		stdout-path = "serial0";
+	};
+
+	soc@0 {
+		mdio:mdio@90000 {
+			pinctrl-0 = <&mdio1_pins &mdio0_pins>;
+			pinctrl-names = "default";
+			/*gpio51 for manhattan reset*/
+      phy-reset-gpio = <&tlmm 22 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 = <1>;
+				fixup;
+			};
+			phy1: ethernet-phy@1 {
+				reg = <2>;
+				fixup;
+			};
+			phy2: ethernet-phy@2 {
+				reg = <3>;
+				fixup;
+			};
+			phy3: ethernet-phy@3 {
+				reg = <4>;
+				fixup;
+			};
+
+			switch0@10 {
+				compatible = "qca,qca8386";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x10>;
+
+				ports {
+					#address-cells = <1>;
+					#size-cells = <0>;
+
+					port@0 {
+						reg = <0>;
+						label = "cpu";
+						ethernet = <&gmac2>;
+						dsa-tag-protocol = "qca_4b";
+					};
+
+					port@1 {
+						reg = <1>;
+						label = "lan1";
+						phy-handle = <&phy0>;
+						phy-mode = "usxgmii";
+					};
+
+					port@2 {
+						reg = <2>;
+						label = "lan2";
+						phy-handle = <&phy1>;
+						phy-mode = "usxgmii";
+					};
+
+					port@3 {
+						reg = <3>;
+						label = "lan3";
+						phy-handle = <&phy2>;
+						phy-mode = "usxgmii";
+					};
+
+					port@4 {
+						reg = <4>;
+						label = "lan4";
+						phy-handle = <&phy3>;
+						phy-mode = "usxgmii";
+					};
+
+					port@5 {
+						reg = <5>;
+						forced-speed = <2500>;
+						forced-duplex = <1>;
+					}; 
+				};
+			};
+		};
+
+		pwmleds {
+			compatible = "pwm-leds";
+
+			red {
+				label = "pwm:red";
+				pwms = <&pwm 3 1250000>;
+				max-brightness = <160>;
+				linux,default-trigger = "none";
+			};
+
+			green {
+				label = "pwm:green";
+				pwms = <&pwm 2 1250000>;
+				max-brightness = <160>;
+				linux,default-trigger = "none";
+			};
+
+			led_power: blue {
+				label = "pwm:blue";
+				pwms = <&pwm 1 1250000>;
+				max-brightness = <160>;
+				linux,default-trigger = "none";
+			};
+		};
+
+		gpio_keys {
+			compatible = "gpio-keys";
+			pinctrl-0 = <&button_pins>;
+			pinctrl-names = "default";
+			status = "okay";
+
+			button@1 {
+				label = "rst";
+				linux,code = <KEY_RESTART>;
+				gpios = <&tlmm 21 GPIO_ACTIVE_LOW>;
+				linux,input-type = <1>;
+				debounce-interval = <60>;
+			};
+		};
+
+		ess-instance {
+			num_devices = <0x2>;
+
+			ess-switch@3a000000 {
+				pinctrl-names = "default";
+				switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
+				switch_lan_bmp = <0x2>; /* lan port bitmap */
+				switch_wan_bmp = <0x4>; /* wan port bitmap */
+				switch_mac_mode = <0xc>; /* mac mode for uniphy instance0*/
+				switch_mac_mode1 = <0xc>; /* mac mode for uniphy instance1*/
+				switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/
+
+				qcom,port_phyinfo {
+					port@0 {
+						port_id = <1>;
+						forced-speed = <2500>;
+						forced-duplex = <1>;
+					};
+					port@1 {
+						port_id = <2>;
+						forced-speed = <2500>;
+						forced-duplex = <1>;
+					};
+				};
+			};
+
+			ess-switch1@1 {
+				compatible = "qcom,ess-switch-qca8386";
+				device_id = <1>;
+				switch_access_mode = "mdio";
+				mdio-bus = <&mdio>;
+				switch_mac_mode = <0xc>; /* mac mode for uniphy instance0 */
+				switch_mac_mode1 = <0xc>; /* mac mode1 for uniphy instance1 */
+				switch_cpu_bmp = <0x21>;  /* cpu port bitmap */
+				switch_lan_bmp = <0x0e>; /* lan port bitmap */
+				switch_wan_bmp = <0x10>;  /* wan port bitmap */
+//				link-polling-required = <0>;
+				fdb_sync = "interrupt";
+				link-intr-gpio = <&tlmm 24 GPIO_ACTIVE_HIGH>;
+
+				qcom,port_phyinfo {
+					port@0 {
+						port_id = <0>;
+						forced-speed = <2500>;
+						forced-duplex = <1>;
+					};
+					port@1 {
+						port_id = <1>;
+						phy_address = <1>;
+					};
+					port@2 {
+						port_id = <2>;
+						phy_address = <2>;
+					};
+					port@3 {
+						port_id = <3>;
+						phy_address = <3>;
+					};
+					port@4 {
+						port_id = <4>;
+						phy_address = <4>;
+					};
+					port@5 {
+						port_id = <5>;
+						forced-speed = <2500>;
+						forced-duplex = <1>; 
+					};
+				};
+
+				led_source@2 {
+					source = <2>;
+					mode = "normal";
+					speed = "all";
+					blink_en = "enable";
+					active = "high";
+				};
+				led_source@5 {
+					source = <5>;
+					mode = "normal";
+					speed = "all";
+					blink_en = "enable";
+					active = "high";
+				};
+				led_source@8 {
+					source = <8>;
+					mode = "normal";
+					speed = "all";
+					blink_en = "enable";
+					active = "high";
+				};
+				led_source@11 {
+					source = <11>;
+					mode = "normal";
+					speed = "all";
+					blink_en = "enable";
+					active = "high";
+				};
+			};
+		};
+
+		dp1 {
+			device_type = "network";
+			compatible = "qcom,nss-dp";
+			qcom,id = <2>;
+			reg = <0x3a504000 0x4000>;
+			qcom,mactype = <1>;
+			local-mac-address = [000000000000];
+			qcom,mht-dev = <1>;
+			qcom,is_switch_connected = <1>;
+			qcom,ppe-offload-disabled = <1>;
+			phy-mode = "sgmii";
+		};
+
+		gmac2:dp2 {
+			device_type = "network";
+			compatible = "qcom,nss-dp";
+			qcom,id = <1>;
+			reg = <0x3a500000 0x4000>;
+			qcom,mactype = <1>;
+			local-mac-address = [000000000000];
+			phy-mode = "sgmii";
+			qcom,mht-dev = <1>;
+			qcom,is_switch_connected = <1>;
+			qcom,ppe-offload-disabled = <1>;
+		};
+
+		/* 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 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 */
+		};
+
+		wsi: wsi {
+			id = <0>;
+			num_chip = <3>;
+			status = "okay";
+			chip_info = <0 2 1 2>,
+				    <1 2 2 0>,
+				    <2 2 0 1>;
+		};
+
+		q6v5_wcss: remoteproc@d100000 {
+			boot-args = <0x1 0x4 0x3 0x1 0x2f 0x2>,
+					<0x1 0x4 0x4 0x2 0x2c 0x2>;
+			memory-region = <&q6_mem_regions>,
+					<&mlo_global_mem0>;
+
+			/delete-node/ remoteproc_pd1;
+			/delete-node/ remoteproc_pd2;
+			/delete-node/ remoteproc_pd3;
+
+			q6_wcss_pd4: remoteproc_pd4 {
+				compatible = "qcom,ipq5332-mpd-upd-text";
+				firmware = "IPQ5332/q6_fw4.mdt";
+
+				q6_wcss_pd1: remoteproc_pd1 {
+					compatible = "qcom,ipq5332-wcss-ahb-mpd";
+					firmware = "IPQ5332/q6_fw1.mdt";
+					m3_firmware = "IPQ5332/iu_fw.mdt";
+					interrupts-extended = <&wcss_smp2p_in 8 0>,
+							<&wcss_smp2p_in 9 0>,
+							<&wcss_smp2p_in 12 0>,
+							<&wcss_smp2p_in 11 0>;
+					interrupt-names = "fatal",
+							"ready",
+							"spawn-ack",
+							"stop-ack";
+
+					qcom,smem-states = <&wcss_smp2p_out 8>,
+							<&wcss_smp2p_out 9>,
+							<&wcss_smp2p_out 10>;
+					qcom,smem-state-names = "shutdown",
+								"stop",
+								"spawn";
+				};
+
+				q6_wcss_pd2: remoteproc_pd2 {
+					compatible = "qcom,ipq5332-wcss-pcie-mpd";
+					firmware = "IPQ5332/q6_fw2.mdt";
+					m3_firmware = "qcn6432/iu_fw.mdt";
+					interrupts-extended = <&wcss_smp2p_in 16 0>,
+							<&wcss_smp2p_in 17 0>,
+							<&wcss_smp2p_in 20 0>,
+							<&wcss_smp2p_in 19 0>;
+					interrupt-names = "fatal",
+							"ready",
+							"spawn-ack",
+							"stop-ack";
+
+					qcom,smem-states = <&wcss_smp2p_out 16>,
+							<&wcss_smp2p_out 17>,
+							<&wcss_smp2p_out 18>;
+					qcom,smem-state-names = "shutdown",
+								"stop",
+								"spawn";
+					status = "ok";
+				};
+
+				q6_wcss_pd3: remoteproc_pd3 {
+					compatible = "qcom,ipq5332-wcss-pcie-mpd";
+					firmware = "IPQ5332/q6_fw3.mdt";
+					interrupts-extended = <&wcss_smp2p_in 24 0>,
+							<&wcss_smp2p_in 25 0>,
+							<&wcss_smp2p_in 28 0>,
+							<&wcss_smp2p_in 27 0>;
+					interrupt-names = "fatal",
+							"ready",
+							"spawn-ack",
+							"stop-ack";
+
+					qcom,smem-states = <&wcss_smp2p_out 24>,
+							<&wcss_smp2p_out 25>,
+							<&wcss_smp2p_out 26>;
+					qcom,smem-state-names = "shutdown",
+								"stop",
+								"spawn";
+					status = "ok";
+				};
+			};
+		};
+	};
+};
+
+&blsp1_uart0 {
+	pinctrl-0 = <&serial_0_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&blsp1_uart1 {
+	pinctrl-0 = <&serial_1_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&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>;
+	};
+};
+
+&tlmm {
+	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;
+		};
+	};
+
+	pwm_pins: pwm_pinmux {
+		/* PWM LED GREEN */
+		mux_1 {
+			pins = "gpio30";
+			function = "pwm1";
+			drive-strength = <8>;
+		};
+		/* PWM LED BLUE */
+		mux_2 {
+			pins = "gpio31";
+			function = "pwm1";
+			drive-strength = <8>;
+		};
+		/* PWM LED RED */
+		mux_3 {
+			pins = "gpio29";
+			function = "pwm1";
+			drive-strength = <8>;
+		};
+	};
+
+	serial_1_pins: serial1-pinmux {
+		pins = "gpio33", "gpio34", "gpio35", "gpio36";
+		function = "blsp1_uart2";
+		drive-strength = <8>;
+		bias-pull-up;
+	};
+
+
+	button_pins: button-state {
+		pins = "gpio21";
+		function = "gpio";
+		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;
+	};
+
+	mdio1_pins: mdio1-state {
+		mux_0 {
+			pins = "gpio27";
+			function = "mdc1";
+			drive-strength = <2>;
+			bias-pull-up;
+		};
+		mux_1 {
+			pins = "gpio28";
+			function = "mdio1";
+			drive-strength = <2>;
+			bias-pull-up;
+		};
+	};
+};
+
+&license_manager {
+	status = "okay";
+};
+
+&pwm {
+        pinctrl-0 = <&pwm_pins>;
+        used-pwm-indices = <1>, <1>, <0>, <1>;
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&hs_m31phy_0 {
+	status = "okay";
+};
+
+&wifi0 {
+	qcom,multipd_arch;
+	qcom,rproc = <&q6_wcss_pd1>;
+	qcom,rproc_rpd = <&q6v5_wcss>;
+	qcom,userpd-subsys-name = "q6v5_wcss_userpd1";
+	qcom,tgt-mem-mode = <0>;
+	qcom,bdf-addr = <0x4C200000 0x4C200000 0x4C200000 0x0 0x0 0x0>;
+	qcom,caldb-addr = <0x4D900000 0x4D900000 0x4D900000 0x0 0x0 0x0>;
+	qcom,caldb-size = <0x500000>;
+	qcom,board_id = <0x41>;
+	mem-region = <&q6_ipq5332_data>;
+	memory-region = <&q6_ipq5332_data>;
+	qcom,wsi = <&wsi>;
+	qcom,wsi_index = <0>;
+	status = "okay";
+};
+
+&wifi1 {
+	qcom,multipd_arch;
+	qcom,rproc = <&q6_wcss_pd2>;
+	qcom,rproc_rpd = <&q6v5_wcss>;
+	qcom,userpd-subsys-name = "q6v5_wcss_userpd2";
+	qcom,tgt-mem-mode = <0>;
+	qcom,bdf-addr = <0x4DE00000 0x4DE00000 0x4DE00000 0x0 0x0 0x0>;
+	qcom,caldb-addr = <0x4F500000 0x4F500000 0x4F500000 0x0 0x0 0x0>;
+	qcom,umac-irq-reset-addr = <0x20000884>;
+	qcom,caldb-size = <0x500000>;
+	qcom,board_id = <0x061>;
+	mem-region = <&q6_qcn6432_data_1>;
+	memory-region = <&q6_qcn6432_data_1>;
+	qcom,wsi = <&wsi>;
+	qcom,wsi_index = <1>;
+	status = "okay";
+	interrupts = <GIC_SPI 33 IRQ_TYPE_EDGE_RISING>;
+	interrupt-names = "umac_reset";
+};
+
+&wifi2 {
+	qcom,multipd_arch;
+	qcom,rproc = <&q6_wcss_pd3>;
+	qcom,rproc_rpd = <&q6v5_wcss>;
+	qcom,userpd-subsys-name = "q6v5_wcss_userpd3";
+	qcom,tgt-mem-mode = <0>;
+	qcom,bdf-addr = <0x4FA00000 0x4FA00000 0x4FA00000 0x0 0x0 0x0>;
+	qcom,caldb-addr = <0x51100000 0x51100000 0x51100000 0x0 0x0 0x0>;
+	qcom,umac-irq-reset-addr = <0x18000884>;
+	qcom,caldb-size = <0x500000>;
+	qcom,board_id = <0x0b1>;
+	mem-region = <&q6_qcn6432_data_2>;
+	memory-region = <&q6_qcn6432_data_2>;
+	qcom,wsi = <&wsi>;
+	qcom,wsi_index = <2>;
+	status = "okay";
+	interrupts = <GIC_SPI 410 IRQ_TYPE_EDGE_RISING>;
+	interrupt-names = "umac_reset";
+};

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

@@ -16,7 +16,7 @@
 
 / {
 	model = "SONICFI RAP750W-311A";
-	compatible = "sonicfi,rap750w-311a","qcom,ipq5332-ap-mi01.6", "qcom,ipq5332";
+	compatible = "sonicfi,rap750w-311a","qcom,ipq5332-ap-mi01.3-c2", "qcom,ipq5332";
 
 #ifdef __IPQ_MEM_PROFILE_512_MB__
        /*	512M Memory Layout for IPQ5332 + QCN6432
@@ -541,7 +541,7 @@
 			num_chip = <2>;
 			status = "okay";
 			chip_info = <0 1 1>,
-                                    <1 1 0>;
+				<1 1 0>;
 		};
 
 		q6v5_wcss: remoteproc@d100000 {

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

@@ -53,10 +53,10 @@ TARGET_DEVICES += sonicfi_rap7110c_341x
 
 define Device/sonicfi_rap750w_311a
   DEVICE_TITLE := SONICFI RAP750W-311A
-  DEVICE_DTS := ipq5332-rap750w-311a
+  DEVICE_DTS := ipq5332-sonicfi-rap750w-311a
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTS_CONFIG := config@mi01.3-c2
-  SUPPORTED_DEVICES := sonicfi,rap7110c-341x
+  SUPPORTED_DEVICES := sonicfi,rap750w-311a
   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
@@ -64,3 +64,16 @@ define Device/sonicfi_rap750w_311a
   DEVICE_PACKAGES := ath12k-wifi-sonicfi-rap750w-311a ath12k-firmware-ipq5332-peb
 endef
 TARGET_DEVICES += sonicfi_rap750w_311a
+
+define Device/cig_wf189w
+  DEVICE_TITLE := CIG WF189W
+  DEVICE_DTS := ipq5332-cig-wf189w
+  DEVICE_DTS_DIR := ../dts
+  DEVICE_DTS_CONFIG := config@mi04.1
+  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-cig-wf189w ath12k-firmware-ipq5332-peb-peb
+endef
+TARGET_DEVICES += cig_wf189w

feeds/qca-wifi-7/ipq53xx/patches-6.1/0659-Reduce-mdc-frequency.patch

@@ -0,0 +1,21 @@
+From 2bd43f099b44fb5a6f79f71051c58f900c54f6f9 Mon Sep 17 00:00:00 2001
+From: luozhan <luozhan@cigtech.com>
+Date: Thu, 3 Apr 2025 17:45:50 +0800
+Subject: [PATCH] Reduce mdc frequency
+
+---
+ drivers/net/mdio/mdio-ipq4019.c | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/mdio/mdio-ipq4019.c
++++ b/drivers/net/mdio/mdio-ipq4019.c
+@@ -919,6 +919,9 @@ static int ipq4019_mdio_probe(struct pla
+ 
+ 	/* MDIO default frequency is 6.25MHz */
+ 	priv->clk_div = 0xf;
++	if (!of_property_read_u32(pdev->dev.of_node, "tip,clk_div", &priv->clk_div))
++		dev_info(&pdev->dev, "overriding clk_div = %x\n", priv->clk_div);
++
+ 	priv->force_c22 = of_property_read_bool(pdev->dev.of_node, "force_clause22");
+ 
+ 	priv->preinit = ipq_mii_preinit;

feeds/qca-wifi-7/qca-ssdk-qca/patches/0005-qca-ssdk-Fix-QCA8385-Maximum-support-for-4096-VLAN-s.patch

@@ -0,0 +1,25 @@
+From 41861d8524e61b1c350f00c67e0ca8534b73d033 Mon Sep 17 00:00:00 2001
+From: huangyunxiang <huangyunxiang@cigtech.com>
+Date: Wed, 9 Apr 2025 10:03:52 +0800
+Subject: [PATCH] qca-ssdk:Fix QCA8385 Maximum support for 4096 VLAN settings
+
+---
+ include/init/ssdk_plat.h                                    | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/init/ssdk_plat.h b/init/ssdk_plat.h
+index 414918a5bd..92596477af 100644
+--- a/include/init/ssdk_plat.h
++++ b/include/init/ssdk_plat.h
+@@ -174,7 +174,7 @@
+ #define AR8327_NUM_PHYS                              5
+ #define AR8327_PORT_CPU                              0
+ #define AR8327_NUM_PORTS                             7
+-#define AR8327_MAX_VLANS                             128
++#define AR8327_MAX_VLANS                             4096
+ 
+ #define MII_PHYADDR_C45                              (1<<30)
+ 
+-- 
+2.34.1
+

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

@@ -157,15 +157,16 @@ function discover_dhcp() {
 function redirector_lookup() {
 	const path = '/tmp/ucentral.redirector';
 	ulog(LOG_INFO, 'Contact redirector service\n');
-	let serial = uci.get('ucentral', 'config', 'serial');
+	let serial = uci.get('system', '@system[-1]', 'mac');
 
 	fs.unlink(path);
-	system(`wget http://ucentral.io/${serial} -O /tmp/ucentral.redirector`);
+	system(`curl -k --cert /etc/ucentral/cert.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/cas.pem https://openlan.keys.tip.build/v1/devices/${serial} --output /tmp/ucentral.redirector`);
 	if (!fs.stat(path))
 		return;
 	let redir = readjsonfile(path);
-	if (redir?.server && redir?.port) {
-                if (gateway_write({ server: redir.server, port: redir.port, valid: false })) {
+	if (redir?.controller_endpoint) {
+		let controller_endpoint = split(redir.controller_endpoint, ':');
+		if (gateway_write({ server: controller_endpoint[0], port: controller_endpoint[1] || 15002, valid: false })) {
 			ulog(LOG_INFO, `Discovered cloud via lookup service ${redir.server}:${redir.port}\n`);
                         client_start();
                 	set_state(VALIDATING);

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:=d452d91d5df677d91e7ee3c04d8d9bfd66d5fbad58052228b27342bf55bef020
+PKG_MIRROR_HASH:=fe33f072d7bcbbb14c7c3415e0750699bb5dae8a9af06c59c90c020f8b192a15
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2025-01-27
-PKG_SOURCE_VERSION:=a2133a8e2ab1c8e2453f8132c9b83f4599fb4a11
+PKG_SOURCE_VERSION:=5a6d23b76bc51289ae99d22fdf406516b0c630e6
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
 

feeds/ucentral/ucentral-schema/files/etc/uci-defaults/99-ucentral-hostname

@@ -2,6 +2,7 @@
 
 hname=$(cat /etc/board.json  | jsonfilter -e '@.system.label_macaddr')
 [ -z "$hname" ] && hname=$(cat /sys/class/net/eth0/address)
+uci set system.@system[-1].mac=$hname
 hname=$(echo $hname | tr -d : | awk '{print tolower($0)}')
 uci set system.@system[-1].hostname=$hname
 uci set ucentral.config.serial=$hname

feeds/ucentral/udhcpinject/src/udhcpinject.c

@@ -34,10 +34,7 @@ static char *provided_ports = NULL;
 void cleanup_tc() {
     char cmd[1024];
     for (int i = 0; i < iface_count; i++) {
-        snprintf(cmd, sizeof(cmd), "tc filter del dev %s ingress 2>/dev/null",
-                 iface_map[i].iface);
-        system(cmd);
-        snprintf(cmd, sizeof(cmd), "tc qdisc del dev %s ingress 2>/dev/null",
+        snprintf(cmd, sizeof(cmd), "tc filter del dev %s ingress pref 32 2>/dev/null",
                  iface_map[i].iface);
         system(cmd);
     }
@@ -261,7 +258,6 @@ int parse_ports(const char *port_list) {
     return 0;
 }
 
-// Function to setup tc rules (same as before but using iface_map)
 int setup_tc() {
     char cmd[1024];
 
@@ -281,14 +277,15 @@ int setup_tc() {
             iface_map[i].iface);
         int result = system(cmd);
         if (result == 2) {
-            syslog(LOG_INFO, "Ingress qdisc already exists for %s on %s\n", iface_map[i].essid, iface_map[i].iface);
+            syslog(LOG_INFO, "Ingress qdisc already exists for %s\n", iface_map[i].iface);
         }
         else if (result == 1) {
-            syslog(LOG_INFO, "Failed to add ingress qdisc for %s on %s\n", iface_map[i].essid, iface_map[i].iface);
+            syslog(LOG_ERR, "Failed to add qdisc for %s\n", iface_map[i].iface);
+            return -1;
         }
 
         snprintf(cmd, sizeof(cmd),
-                 "tc filter add dev %s ingress protocol ip u32 "
+                 "tc filter add dev %s ingress protocol ip pref 32 u32 "
                  "match ip protocol 17 0xff "
                  "match u16 0x0044 0xffff at 20 "
                  "match u16 0x0043 0xffff at 22 "
@@ -564,6 +561,8 @@ int main(int argc, char *argv[]) {
     signal(SIGTERM, signal_handler);
     signal(SIGHUP, signal_handler);
 
+    sleep(5);
+
     provided_ssids = getenv("SSIDs");
     syslog(LOG_INFO, "Provided SSIDs: %s\n", provided_ssids);
     if (!provided_ssids && argc > 1) {
@@ -582,7 +581,6 @@ int main(int argc, char *argv[]) {
         return 1;
     }
 
-    sleep(5);
     if (parse_ssids(provided_ssids) != 0) {
         syslog(LOG_ERR, "Failed to parse SSIDs\n");
         cleanup();

patches/0088-feed.conf.default-use-the-github.com-based-trees.patch

@@ -0,0 +1,26 @@
+From 642f9c9340bfeaba24939bd01d9beca862183f0f Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Mon, 7 Apr 2025 18:09:27 +0200
+Subject: [PATCH] feed.conf.default: use the github.com based trees
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ feeds.conf.default | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/feeds.conf.default b/feeds.conf.default
+index d467db5627..6a1dcf1999 100644
+--- a/feeds.conf.default
++++ b/feeds.conf.default
+@@ -1,4 +1,4 @@
+-src-git packages https://git.openwrt.org/feed/packages.git;openwrt-23.05
+-src-git luci https://git.openwrt.org/project/luci.git;openwrt-23.05
+-src-git routing https://git.openwrt.org/feed/routing.git;openwrt-23.05
+-src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-23.05
++src-git packages https://github.com/openwrt/packages.git;openwrt-23.05
++src-git luci https://github.com/openwrt/luci.git;openwrt-23.05
++src-git routing https://github.com/openwrt/routing.git;openwrt-23.05
++src-git telephony https://github.com/openwrt/telephony.git;openwrt-23.05
+-- 
+2.34.1
+

profiles/cig_wf189w.yml

@@ -0,0 +1,14 @@
+---
+profile: cig_wf189w
+target: ipq53xx
+subtarget: generic
+description: Build image for the CIG WF189W
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-cig_wf189w-squashfs-sysupgrade.tar
+feeds:
+  - name: qca
+    path: ../../feeds/qca-wifi-7
+include:
+  - ucentral-ap
+packages:
+  - ipq53xx
+  - qca-ssdk-shell

profiles/sonicfi_rap750w-311a.yml

@@ -0,0 +1,16 @@
+---
+profile: sonicfi_rap750w_311a
+target: ipq53xx
+subtarget: generic
+description: Build image for the SONICFI RAP750W-311A
+image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-sonicfi_rap750w_311a-squashfs-sysupgrade.tar
+feeds:
+  - name: qca
+    path: ../../feeds/qca-wifi-7
+include:
+  - ucentral-ap
+packages:
+  - ipq53xx
+  - qca-ssdk-shell
+diffconfig: |
+  CONFIG_KERNEL_IPQ_MEM_PROFILE=512

test_chuiyeh

@@ -0,0 +1 @@
+test