mcux: wifi_nxp: upgrade version to r52.p4

Fix several bugs and upgrade wifi driver version to r52.p4

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

Author: MaochenWang1

mcux/middleware/wifi_nxp/CMakeLists.txt

@@ -345,7 +345,7 @@ zephyr_code_relocate(FILES
                      wifidriver/wifi-sdio.c
                      wifidriver/sdio.c
                      ${ZEPHYR_BASE}/subsys/sd/sdio.c
-                     LOCATION ${QUICK_ACCESS_CODE_AREA} NOKEEP)
+                     LOCATION ${QUICK_ACCESS_CODE_AREA_2} NOKEEP)
 
 zephyr_code_relocate(FILES ${ZEPHYR_BASE}/drivers/wifi/nxp/nxp_wifi_drv.c
                      FILTER ".*\\.nxp_wifi_send|.*\\.nxp_wifi_recv"

mcux/middleware/wifi_nxp/incl/nxp_wifi.h

@@ -268,7 +268,7 @@ extern "C" {
 #elif defined(CONFIG_WLAN_CALDATA_2ANT_LO_ISO)
 #define OVERRIDE_CALIBRATION_DATA "wifi_cal_data_iw612_2ant_lo_iso.h"
 #else
-#define OVERRIDE_CALIBRATION_DATA "wifi_cal_data_rw61x_override.h"
+#define OVERRIDE_CALIBRATION_DATA "wifi_cal_data_override.h"
 #endif
 #endif
 

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

@@ -650,7 +650,7 @@ void rx_mgmt_register_callback(int (*rx_mgmt_cb_fn)(const enum wlan_bss_type bss
 void rx_mgmt_deregister_callback(void);
 #endif
 
-int nxp_wifi_internal_tx(const struct device *dev, struct net_pkt *pkt);
+int nxp_wifi_internal_tx(const struct device *dev, struct net_pkt *pkt, bool pkt_fwd);
 void nxp_wifi_internal_register_rx_cb(int (*rx_cb_fn)(struct net_if *iface, struct net_pkt *pkt));
 const struct netif *net_if_get_binding(const char *ifname);
 #endif /* _WM_NET_H_ */

mcux/middleware/wifi_nxp/incl/wifidriver/wifi-decl.h

@@ -1667,7 +1667,23 @@ typedef PACK_START struct _wifi_mfg_cmd_tx_frame
     /** STBC */
     t_u32 stbc;
     /** power id */
-    t_u32 rsvd[2];
+    t_u32 rsvd[1];
+    /**signal bw*/
+    t_u32 signal_bw;
+    /** NumPkt */
+    t_u32 NumPkt;
+    /** MaxPE */
+    t_u32 MaxPE;
+    /** BeamChange */
+    t_u32 BeamChange;
+    /** Dcm */
+    t_u32 Dcm;
+    /** Doppler */
+    t_u32 Doppler;
+    /** MidP */
+    t_u32 MidP;
+    /** QNum */
+    t_u32 QNum;
 } PACK_END wifi_mfg_cmd_tx_frame_t;
 
 /** Configuration for Manufacturing command Tx Continuous */
@@ -1879,7 +1895,7 @@ typedef struct _wifi_dot1as_info_t
 
 #if CONFIG_SUBSCRIBE_EVENT_SUPPORT
 /** Type definition of mlan_ds_subscribe_evt for subscribe events */
-typedef struct _wifi_ds_subscribe_evt
+typedef PACK_START struct _wifi_ds_subscribe_evt
 {
     /** bitmap for subscribe event */
     t_u16 evt_bitmap;
@@ -1932,12 +1948,12 @@ typedef struct _wifi_ds_subscribe_evt
     /* Second minimum rate frequency */
     t_u16 link_rate_freq;
     /* Tx latency value (us) */
-    t_u16 link_tx_latency;
+    t_u32 link_tx_latency;
     /* Tx latency frequency */
-    t_u16 link_tx_lantency_freq;
+    t_u32 link_tx_lantency_freq;
     /* Number of pre missed beacons */
     t_u8 pre_beacon_miss;
-} wifi_ds_subscribe_evt;
+} PACK_END wifi_ds_subscribe_evt;
 #endif
 
 #if CONFIG_CSI

mcux/middleware/wifi_nxp/incl/wifidriver/wifi.h

@@ -24,7 +24,7 @@
 #if defined(SD9177)
 #define CONFIG_TCP_ACK_ENH 1
 #endif
-#if defined(SD9177) || defined(IW610)
+#if defined(SD9177) || defined(IW610) || defined(SD8978)
 #define CONFIG_FW_VDLL     1
 #if !CONFIG_WIFI_CAPA
 #undef CONFIG_WIFI_CAPA
@@ -47,16 +47,6 @@
 #define WIFI_WRITE_REG16(reg, val) (WIFI_REG16(reg) = (val))
 #define WIFI_WRITE_REG32(reg, val) (WIFI_REG32(reg) = (val))
 
-#ifdef RW610
-#define WLAN_CAU_ENABLE_ADDR         (0x45004008U)
-#define WLAN_CAU_TEMPERATURE_ADDR    (0x4500400CU)
-#define WLAN_CAU_TEMPERATURE_FW_ADDR (0x41382490U)
-#define WLAN_FW_WAKE_STATUS_ADDR     (0x40031068U)
-#define WLAN_PMIP_TSEN_ADDR          (0x45004010U)
-#define WLAN_V33_VSEN_ADDR           (0x45004028U)
-#define WLAN_ADC_CTRL_ADDR           (0x45004000U)
-#endif
-
 #ifdef RW610
 #define RW610_PACKAGE_TYPE_QFN 0
 #define RW610_PACKAGE_TYPE_CSP 1
@@ -1889,14 +1879,6 @@ int wifi_single_ant_duty_cycle(t_u16 enable, t_u16 nbTime, t_u16 wlanTime);
 int wifi_dual_ant_duty_cycle(t_u16 enable, t_u16 nbTime, t_u16 wlanTime, t_u16 wlanBlockTime);
 #endif
 
-#ifdef RW610
-/* get CAU module temperature and write to firmware */
-void wifi_cau_temperature_enable(void);
-int wifi_cau_temperature_write_to_firmware(void);
-int32_t wifi_get_temperature(void);
-void wifi_pmip_v33_enable();
-#endif
-
 #if (CONFIG_WIFI_IND_RESET) && (CONFIG_WIFI_IND_DNLD)
 int wifi_set_indrst_cfg(const wifi_indrst_cfg_t *indrst_cfg, mlan_bss_type bss_type);
 int wifi_get_indrst_cfg(wifi_indrst_cfg_t *indrst_cfg, mlan_bss_type bss_type);

mcux/middleware/wifi_nxp/incl/wlcmgr/wlan.h

@@ -19,7 +19,7 @@
 #include <wifi_events.h>
 #include <wifi.h>
 
-#define WLAN_DRV_VERSION "v1.3.r51.z_up.p13"
+#define WLAN_DRV_VERSION "v1.3.r52.z_up.p4"
 
 #if CONFIG_WPA2_ENTP
 #include <wm_mbedtls_helper_api.h>

mcux/middleware/wifi_nxp/port/net/zephyr/net.c

@@ -519,10 +519,8 @@ bool wrapper_net_is_ip_or_ipv6(const t_u8 *buffer)
 }
 
 extern int retry_attempts;
-#if CONFIG_WIFI_PKT_FWD
 #define MAX_RETRY_PKT_FWD 3
-#endif
-int nxp_wifi_internal_tx(const struct device *dev, struct net_pkt *pkt)
+int nxp_wifi_internal_tx(const struct device *dev, struct net_pkt *pkt, bool pkt_fwd)
 {
     int ret;
     interface_t *if_handle = (interface_t *)dev->data;
@@ -593,13 +591,11 @@ int nxp_wifi_internal_tx(const struct device *dev, struct net_pkt *pkt)
         }
         else
         {
-#if CONFIG_WIFI_PKT_FWD
-            if (interface == WLAN_BSS_TYPE_UAP)
+            if (pkt_fwd)
             {
                 retry = MAX_RETRY_PKT_FWD;
             }
             else
-#endif
             {
                 retry = retry_attempts;
             }
@@ -608,12 +604,9 @@ int nxp_wifi_internal_tx(const struct device *dev, struct net_pkt *pkt)
         wmm_outbuf = wifi_wmm_get_outbuf_enh(&outbuf_len, (mlan_wmm_ac_e)pkt_prio, interface, ra, &is_tx_pause);
         ret        = (wmm_outbuf == NULL) ? true : false;
 
-        /* uAP case doesn't need to delay to let powersave task run,
-         * as FW won't go into sleep mode when uAP enabled. And this
-         * delay will block uAP packet forward case */
-#if CONFIG_WIFI_PKT_FWD
-        if (interface != WLAN_BSS_TYPE_UAP)
-#endif
+        /* In packet forward case, this function is called by RX thread,
+         * so the time delay is not allowed */
+        if (!pkt_fwd)
         {
             if (ret == true && is_tx_pause == true)
             {
@@ -702,9 +695,9 @@ int nxp_wifi_internal_tx(const struct device *dev, struct net_pkt *pkt)
 int net_wifi_packet_send(uint8_t interface, void *stack_buffer)
 {
     if (interface == WLAN_BSS_TYPE_UAP)
-        return nxp_wifi_internal_tx(net_if_get_device((void *)g_uap.netif), (struct net_pkt *)stack_buffer);
+        return nxp_wifi_internal_tx(net_if_get_device((void *)g_uap.netif), (struct net_pkt *)stack_buffer, 1);
     else
-        return nxp_wifi_internal_tx(net_if_get_device((void *)g_mlan.netif), (struct net_pkt *)stack_buffer);
+        return nxp_wifi_internal_tx(net_if_get_device((void *)g_mlan.netif), (struct net_pkt *)stack_buffer, 1);
 }
 #endif
 

mcux/middleware/wifi_nxp/sdio_nxp_abs/fwdnld_sdio.c

@@ -167,7 +167,8 @@ int32_t wlan_reset_fw()
         goto done;
     }
 #if defined(SD8978) || defined(SD8987) || defined(SD9177) || defined(IW610)
-    rv = sdio_drv_creg_write(HOST_TO_CARD_EVENT_REG, 1, 0x10, &resp);
+    (void)sdio_drv_creg_read(HOST_TO_CARD_EVENT_REG, 1, &resp);
+    rv = sdio_drv_creg_write(HOST_TO_CARD_EVENT_REG, 1, resp | 0x10, &resp);
     if (rv == false)
     {
         sdio_io_e("Failed to write register.");

mcux/middleware/wifi_nxp/wifidriver/incl/mlan_fw.h

@@ -6724,7 +6724,23 @@ typedef MLAN_PACK_START struct _HostCmd_DS_MFG_CMD_TX_FRAME2
     /** STBC */
     t_u32 stbc;
     /** power id */
-    t_u32 rsvd[2];
+    t_u32 rsvd[1];
+    /**signal bw*/
+    t_u32 signal_bw;
+    /** NumPkt */
+    t_u32 NumPkt;
+    /** MaxPE */
+    t_u32 MaxPE;
+    /** BeamChange */
+    t_u32 BeamChange;
+    /** Dcm */
+    t_u32 Dcm;
+    /** Doppler */
+    t_u32 Doppler;
+    /** MidP */
+    t_u32 MidP;
+    /** QNum */
+    t_u32 QNum;
 } MLAN_PACK_END HostCmd_DS_MFG_CMD_TX_FRAME2;
 
 typedef MLAN_PACK_START struct _HostCmd_DS_MFG_CMD_TX_CONT
@@ -7257,9 +7273,9 @@ typedef MLAN_PACK_START struct
     /* Second minimum rate frequency */
     t_u16 link_rate_freq;
     /* Tx latency value (us) */
-    t_u16 link_tx_latency;
+    t_u32 link_tx_latency;
     /* Tx latency frequency */
-    t_u16 link_tx_lantency_freq;
+    t_u32 link_tx_lantency_freq;
 } MLAN_PACK_END MrvlIEtypes_LinkQualityThreshold_t;
 
 /** Supported operating classes element */

mcux/middleware/wifi_nxp/wifidriver/incl/mlan_ioctl.h

@@ -3718,7 +3718,7 @@ typedef struct _mlan_ds_misc_country_code
 #define DEFAULT_PRE_BEACON_MISS 30
 
 /** Type definition of mlan_ds_subscribe_evt for MLAN_OID_MISC_CFP_CODE */
-typedef struct _mlan_ds_subscribe_evt
+typedef MLAN_PACK_START struct _mlan_ds_subscribe_evt
 {
     /** evt action */
     t_u16 evt_action;
@@ -3773,12 +3773,12 @@ typedef struct _mlan_ds_subscribe_evt
     /* Second minimum rate frequency */
     t_u16 link_rate_freq;
     /* Tx latency value (us) */
-    t_u16 link_tx_latency;
+    t_u32 link_tx_latency;
     /* Tx latency frequency */
-    t_u16 link_tx_lantency_freq;
+    t_u32 link_tx_lantency_freq;
     /* Number of pre missed beacons */
     t_u8 pre_beacon_miss;
-} mlan_ds_subscribe_evt;
+} MLAN_PACK_END mlan_ds_subscribe_evt;
 /** Max OTP user data length */
 #define MAX_OTP_USER_DATA_LEN 252U
 
@@ -3914,7 +3914,23 @@ typedef MLAN_PACK_START struct _mlan_ds_mfg_cmd_tx_frame2
     /** STBC */
     t_u32 stbc;
     /** power id */
-    t_u32 rsvd[2];
+    t_u32 rsvd[1];
+    /**signal bw*/
+    t_u32 signal_bw;
+    /** NumPkt */
+    t_u32 NumPkt;
+    /** MaxPE */
+    t_u32 MaxPE;
+    /** BeamChange */
+    t_u32 BeamChange;
+    /** Dcm */
+    t_u32 Dcm;
+    /** Doppler */
+    t_u32 Doppler;
+    /** MidP */
+    t_u32 MidP;
+    /** QNum */
+    t_u32 QNum;
 } MLAN_PACK_END mlan_ds_mfg_cmd_tx_frame2;
 
 /** Configuration for Manufacturing command Tx Continuous */