mcux: wifi_nxp: update wifi driver version to v1.3.r50.z_up.p6

Update wifi_nxp version to v1.3.r50.z_up.p6 to include bug fixes.
Support intra-BSS forwarding.
Support STA and uAP interface de-couple.

Signed-off-by: Maochen Wang <[email protected]>

Author: MaochenWang1

mcux/middleware/wifi_nxp/CMakeLists.txt

@@ -200,6 +200,13 @@ file(GLOB WIFI_SRC ./wifidriver/*.c)
 list(FILTER WIFI_SRC EXCLUDE REGEX ".*imu.c$")
 list(FILTER WIFI_SRC EXCLUDE REGEX ".*sdio.c$")
 list(FILTER WIFI_SRC EXCLUDE REGEX ".*firmware_dnld.c$")
+list(FILTER WIFI_SRC EXCLUDE REGEX ".*uap.*.c$")
+
+zephyr_library_sources_ifdef(CONFIG_NXP_WIFI_SOFTAP_SUPPORT
+    wifidriver/wifi-uap.c
+    wifidriver/mlan_uap_ioctl.c
+    wifidriver/mlan_uap_cmdevent.c
+)
 
 zephyr_library_sources_ifdef(CONFIG_NXP_RW610
     wifidriver/wifi-imu.c
@@ -281,16 +288,26 @@ zephyr_code_relocate(FILES
 file(GLOB ZPERF_SRC ${ZEPHYR_BASE}/subsys/net/lib/zperf/*.c)
 zephyr_code_relocate(FILES ${ZPERF_SRC} LOCATION RAM_TEXT)
 
-file(GLOB SOCKET_SRC ${ZEPHYR_BASE}/subsys/net/lib/sockets/*.c)
-zephyr_code_relocate(FILES ${SOCKET_SRC} LOCATION RAM_TEXT)
-
-file(GLOB NET_SRC ${ZEPHYR_BASE}/subsys/net/ip/*.c)
-zephyr_code_relocate(FILES ${NET_SRC} LOCATION RAM_TEXT)
-
-file(GLOB ETH_SRC ${ZEPHYR_BASE}/subsys/net/l2/ethernet/*.c)
-zephyr_code_relocate(FILES ${ETH_SRC} LOCATION RAM_TEXT)
-
-zephyr_code_relocate(FILES ${ZEPHYR_BASE}/lib/net_buf/buf.c LOCATION RAM_TEXT)
+zephyr_code_relocate(FILES
+                     ${ZEPHYR_BASE}/subsys/net/lib/sockets/sockets_packet.c
+                     ${ZEPHYR_BASE}/subsys/net/lib/sockets/sockets.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/connection.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/ipv4.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/ipv4_fragment.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/ipv6.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/ipv6_fragment.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/net_context.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/net_core.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/net_if.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/net_pkt.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/net_tc.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/packet_socket.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/tcp.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/udp.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/utils.c
+                     ${ZEPHYR_BASE}/subsys/net/l2/ethernet/ethernet.c
+                     ${ZEPHYR_BASE}/lib/net_buf/buf.c
+                     LOCATION RAM_TEXT)
 
 zephyr_code_relocate(FILES
                      ${ZEPHYR_BASE}/kernel/mem_slab.c

mcux/middleware/wifi_nxp/README.txt

@@ -7,22 +7,83 @@ doxy/refman/.
 *
 * \section intro Introduction
 *
-* NXP's WiFi functionality enables customers to
-* quickly develop applications of interest to add connectivity to
-* different sensors and appliances.
+* NXP wireless SoCs require a combination of firmware binary image 
+* streamed into the radio subsystem, and driver source code compiled
+* onto the application MCU. The radio driver source code
+* provides APIs that enable a developer to send and receive packets over
+* the radio interfaces by communicating with the firmware images that 
+* are streamed into the radio subsystems on start-up.
 *
 * \subsection devdoc Developer Documentation
 *
-* This manual provides developer reference documentation for WiFi driver and
-* WLAN Connection Manager.
-*
-* In addition to the reference documentation in this manual, you can
-* also explore the source code.
+* This manual provides developer reference documentation for Wi-Fi driver and
+* Wi-Fi Connection Manager.
+* Refer to the source code for additional information.
 *
 * \note
 * The File Documentation provides documentation for all the APIs that are
-* available in WiFi driver and connection manager.
-*
+* available in Wi-Fi driver and connection manager.\n
+* \n
+* Abbreviations and acronyms\n
+* ACS      auto channel selection\n
+* AID      association ID\n
+* AMPDU    aggregate medium access control protocol data unit\n
+* AP       Access Point\n
+* ARP      address resolution protocol\n
+* BSS      basic service set\n
+* BSSID    basic servivce set ID\n
+* BTM      BSS transition management\n
+* CA       Certificate Authority\n
+* CCK      complementary code keying\n
+* CLI      command line input\n
+* CSI      channel state information\n
+* CW       continuous wave\n
+* DH       Diffie Hellman\n
+* DPP      device provisioning protocol\n
+* DTIM     delivery traffic indication map\n
+* EAP      Extensible Authentication Protocol\n
+* EAP TLS  Extensible Authentication Protocol Transport Layer Security\n
+* FCS      frame check sequence\n
+* FTM      fine timing measurement\n
+* GI       guard interval\n
+* HE       802.11ax high efficiency\n
+* HT       802.11n high throughput\n
+* HTC      high throughput control\n
+* LDPC     low density parity check\n
+* MBO      multi band operation\n
+* MEF      memory efficient filtering\n
+* MFPC     Management Frame Protection Capable\n
+* MFPR     Management frame protection required\n
+* NSS      N*N MIMO spatial stream\n
+* OBSS     overlapping basic service set\n
+* OCE      Optimized connectivity experience\n
+* OMI      operating mode indication\n
+* OWE      opportunistic wireless encryption\n
+* PBC      push button configuration\n
+* PEAP     Protected Extensible Authentication Protocol\n
+* PKEX     Public Key Exchange\n
+* PMF      protected management frame\n
+* PMK      pairwise master key\n
+* PMKSA    pairwise master key security association\n
+* PS       power save\n
+* PTA      packet traffic arbitration\n
+* PWE      Password Element\n
+* QoS      quality of service\n
+* RSSI     received signal strength indicator\n
+* RTS      request to send\n
+* SAD      software antenna diversity\n
+* SAE      Simultaneous Authentication of Equals\n
+* SSID     service set ID\n
+* STBC     space time block code\n
+* TBTT     target beacon transmission time\n
+* TIM      Traffic Indication Map\n
+* TRPC     transient receptor potential canonical\n
+* TSF      timing synchronization function\n
+* TSP      thermal safeguard protection\n
+* TWT      target wake time\n
+* UAPSD    unscheduled automatic power save delivery\n
+* VHT      802.11ac very high throughput\n
+* WLCMGR   Wi-Fi command manager
 */
 
 

mcux/middleware/wifi_nxp/incl/nxp_wifi.h

@@ -130,10 +130,6 @@ extern "C" {
 #define CONFIG_ECSA 1
 #endif
 
-#if CONFIG_NXP_TX_AMPDU_PROT_MODE
-#define CONFIG_TX_AMPDU_PROT_MODE 1
-#endif
-
 #if CONFIG_NXP_WIFI_UNII4_BAND_SUPPORT
 #define CONFIG_UNII4_BAND_SUPPORT 1
 #endif
@@ -142,6 +138,10 @@ extern "C" {
 #define CONFIG_WIFI_RECOVERY 1
 #endif
 
+#if CONFIG_NXP_WIFI_PKT_FWD
+#define CONFIG_WIFI_PKT_FWD 1
+#endif
+
 #if CONFIG_NXP_WIFI_TSP
 #define CONFIG_TSP 1
 #endif
@@ -250,6 +250,39 @@ extern "C" {
 #define CONFIG_WLAN_CALDATA_3ANT_DIVERSITY 1
 #endif
 
+#if CONFIG_NXP_OVERRIDE_CALIBRATION_DATA
+#define OVERRIDE_CALIBRATION_DATA "wifi_cal_data_rw61x_override.h"
+#endif
+
+#if !CONFIG_NXP_OVERRIDE_CALIBRATION_DATA
+#if defined(RW610)
+/*
+ * FRDMRW610
+ */
+#if defined(FRDMRW610)
+/* FRDMRW610 1ANT */
+#define DEFAULT_CALDATA_RW610 "wifi_cal_data_frdmrw61x_1ant.h"
+#else
+/*
+ * RW610
+ */
+/* RW610 1ANT */
+#if CONFIG_WLAN_CALDATA_1ANT
+#define DEFAULT_CALDATA_RW610 "wifi_cal_data_rw61x_1ant.h"
+/* RW610 3ANT_DIVERSITY */
+#elif CONFIG_WLAN_CALDATA_3ANT_DIVERSITY
+#define DEFAULT_CALDATA_RW610 "wifi_cal_data_rw61x_3ant_diversity.h"
+/* RW610 1ANT_DIVERSITY */
+#elif CONFIG_WLAN_CALDATA_1ANT_WITH_DIVERSITY
+#define DEFAULT_CALDATA_RW610 "wifi_cal_data_rw61x_1ant_diversity.h"
+/* RW610 2ANT */
+#else
+#define DEFAULT_CALDATA_RW610 "wifi_cal_data_rw61x_2ant.h"
+#endif
+#endif
+#endif /* RW610 */
+#endif /* CONFIG_NXP_OVERRIDE_CALIBRATION_DATA */
+
 #if CONFIG_NXP_WIFI_EU_VALIDATION
 #define CONFIG_EU_VALIDATION 1
 #endif
@@ -451,6 +484,10 @@ extern "C" {
 #define CONFIG_DHCP_SERVER_DEBUG 1
 #endif
 
+#if CONFIG_NXP_WIFI_HTC_DEBUG
+#define CONFIG_WIFI_HTC_DEBUG 1
+#endif
+
 #if CONFIG_NXP_WIFI_SMOKE_TESTS
 #define CONFIG_WIFI_SMOKE_TESTS 1
 #endif
@@ -463,10 +500,6 @@ extern "C" {
 #define CONFIG_SIGMA_AGENT 1
 #endif
 
-#if CONFIG_NXP_WIFI_CUSTOM_CALDATA
-#define CONFIG_CUSTOM_CALDATA 1
-#endif
-
 #if CONFIG_WIFI_NM_WPA_SUPPLICANT
 #define CONFIG_WPA_SUPP 1
 #endif
@@ -516,18 +549,32 @@ extern "C" {
 
 #if CONFIG_11AX
 
-#if !CONFIG_11K
-#define CONFIG_11K 1
+#if !CONFIG_WPA_SUPP
+#define CONFIG_DRIVER_MBO 1
 #endif
 
-#if !CONFIG_11V
-#define CONFIG_11V 1
 #endif
 
-#if !CONFIG_WPA_SUPP
-#define CONFIG_DRIVER_MBO 1
+#ifndef CONFIG_NXP_WIFI_SOFTAP_SUPPORT
+#if UAP_SUPPORT
+#undef UAP_SUPPORT
+#define UAP_SUPPORT 0
+#endif
+
+#if UAP_HOST_MLME
+#undef UAP_HOST_MLME
+#define UAP_HOST_MLME 0
 #endif
 
+#if CONFIG_UAP_AMPDU_TX
+#undef CONFIG_UAP_AMPDU_TX
+#define CONFIG_UAP_AMPDU_TX 0
+#endif
+
+#if CONFIG_UAP_AMPDU_RX
+#undef CONFIG_UAP_AMPDU_RX
+#define CONFIG_UAP_AMPDU_RX 0
+#endif
 #endif
 
 #ifdef __cplusplus

mcux/middleware/wifi_nxp/incl/port/net/zephyr/wm_net.h

@@ -306,6 +306,28 @@ static inline void *net_stack_buffer_get_payload(void *buf)
     return net_pkt_data((struct net_pkt *)buf);
 }
 
+#if CONFIG_WIFI_PKT_FWD
+/** Send packet from Wi-Fi driver
+ *
+ * \param[in] interface Wi-Fi interface.
+ * \param[in] stack_buffer net stack buffer pointer.
+ *
+ * \return WM_SUCCESS on success
+ * \return -WM_FAIL otherwise
+ */
+int net_wifi_packet_send(uint8_t interface, void *stack_buffer);
+
+/** Generate TX net packet buffer
+ *
+ * \param[in] interface Wi-Fi interface.
+ * \param[in] payload source data payload pointer.
+ * \param[in] datalen data length.
+ *
+ * \return net packet
+ */
+struct net_pkt *gen_tx_pkt_from_data(uint8_t interface, uint8_t *payload, uint16_t datalen);
+#endif
+
 /** Converts Internet host address in network byte order to a string in IPv4
  * dotted-decimal notation
  *
@@ -370,12 +392,14 @@ int net_wlan_deinit(void);
  */
 struct netif *net_get_sta_interface(void);
 
+#if UAP_SUPPORT
 /** Get uAP interface netif structure pointer
  *
  * \rerurn A pointer to uAP interface netif structure
  *
  */
 struct netif *net_get_uap_interface(void);
+#endif
 
 /** Get interface name for given netif
  *
@@ -405,6 +429,7 @@ int net_alloc_client_data_id();
 void *net_get_sta_handle(void);
 #define net_get_mlan_handle() net_get_sta_handle()
 
+#if UAP_SUPPORT
 /** Get micro-AP interface handle
  *
  * Some APIs require the interface handle to be passed to them. The handle can
@@ -413,6 +438,7 @@ void *net_get_sta_handle(void);
  * \return micro-AP interface handle
  */
 void *net_get_uap_handle(void);
+#endif
 
 /** Take interface up
  *