mcux: upgrade wifi_nxp

- When using code relocation, add the NOKEEP flag to discard
unused code to reduce ITCM memory usage.
- move wifidriver/sdio.c and /subsys/sd/sdio.c into ITCM.
  move nxp_wifi_send() and nxp_wifi_recv() into ITCM.
  Use DTCM_TEXT instead of DTCM, then only text code will be
relocated into DTCM.
- remove unused code in wifi_core_task for RW610.

Signed-off-by: Gang Li <[email protected]>

Author: gangli02

mcux/middleware/wifi_nxp/CMakeLists.txt

@@ -324,7 +324,7 @@ if(CONFIG_NXP_RW610)
 	set(QUICK_ACCESS_CODE_AREA_2 RAM_TEXT)
 else()
 	set(QUICK_ACCESS_CODE_AREA ITCM_TEXT)
-	set(QUICK_ACCESS_CODE_AREA_2 DTCM)
+	set(QUICK_ACCESS_CODE_AREA_2 DTCM_TEXT)
 endif()
 
 # critical path code relocated to SRAM
@@ -337,52 +337,55 @@ zephyr_code_relocate(FILES
                      wifidriver/mlan_11n_rxreorder.c
                      wifidriver/mlan_wmm.c
                      wifidriver/wifi.c
-                     LOCATION ${QUICK_ACCESS_CODE_AREA})
+                     LOCATION ${QUICK_ACCESS_CODE_AREA} NOKEEP)
 
 if(CONFIG_SDIO_STACK)
 zephyr_code_relocate(FILES
                      sdio_nxp_abs/mlan_sdio.c
                      wifidriver/wifi-sdio.c
-                     LOCATION ${QUICK_ACCESS_CODE_AREA})
+                     wifidriver/sdio.c
+                     ${ZEPHYR_BASE}/subsys/sd/sdio.c
+                     LOCATION ${QUICK_ACCESS_CODE_AREA} NOKEEP)
+
+zephyr_code_relocate(FILES ${ZEPHYR_BASE}/drivers/wifi/nxp/nxp_wifi_drv.c
+                     FILTER ".*\\.nxp_wifi_send|.*\\.nxp_wifi_recv"
+                     LOCATION ${QUICK_ACCESS_CODE_AREA} NOKEEP)
 endif()
 
 if(CONFIG_NXP_RW610)
 zephyr_code_relocate(FILES
                      wifidriver/wifi-imu.c
                      ${MCUX_SDK_DIR}/drivers/imu/fsl_imu.c
                      ${MCUX_SDK_DIR}/components/imu_adapter/fsl_adapter_imu.c
-                     LOCATION ${QUICK_ACCESS_CODE_AREA})
+                     LOCATION ${QUICK_ACCESS_CODE_AREA} NOKEEP)
 endif()
 
 zephyr_code_relocate(FILES
                      ${MCUX_SDK_DIR}/components/osa/fsl_os_abstraction_zephyr.c
-                     LOCATION ${QUICK_ACCESS_CODE_AREA})
+                     LOCATION ${QUICK_ACCESS_CODE_AREA} NOKEEP)
 
 if(DEFINED CONFIG_SOC_SDKNG_UNSUPPORTED)
 zephyr_code_relocate(FILES
                      ${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk/utilities/misc_utilities/fsl_memcpy.S
-                     LOCATION ${QUICK_ACCESS_CODE_AREA})
+                     LOCATION ${QUICK_ACCESS_CODE_AREA} NOKEEP)
 else()
 zephyr_code_relocate(FILES
                      ${ZEPHYR_HAL_NXP_MODULE_DIR}/mcux/mcux-sdk-ng/components/misc_utilities/fsl_memcpy.S
-                     LOCATION ${QUICK_ACCESS_CODE_AREA})
+                     LOCATION ${QUICK_ACCESS_CODE_AREA} NOKEEP)
 endif()
 
 file(GLOB ZPERF_SRC ${ZEPHYR_BASE}/subsys/net/lib/zperf/*.c)
-zephyr_code_relocate(FILES ${ZPERF_SRC} LOCATION ${QUICK_ACCESS_CODE_AREA_2})
-
-zephyr_code_relocate(FILES
-                     ${ZEPHYR_BASE}/subsys/net/ip/connection.c
-                     ${ZEPHYR_BASE}/subsys/net/ip/packet_socket.c
-                     ${ZEPHYR_BASE}/subsys/net/ip/utils.c
-                     LOCATION ${QUICK_ACCESS_CODE_AREA_2})
+zephyr_code_relocate(FILES ${ZPERF_SRC} LOCATION ${QUICK_ACCESS_CODE_AREA_2} NOKEEP)
 
 zephyr_code_relocate(FILES
                      ${ZEPHYR_BASE}/subsys/net/ip/ipv6_fragment.c
                      ${ZEPHYR_BASE}/subsys/net/ip/ipv4_fragment.c
-                     LOCATION RAM_TEXT)
+                     LOCATION RAM_TEXT NOKEEP)
 
 zephyr_code_relocate(FILES
+                     ${ZEPHYR_BASE}/subsys/net/ip/connection.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/packet_socket.c
+                     ${ZEPHYR_BASE}/subsys/net/ip/utils.c
                      ${ZEPHYR_BASE}/subsys/net/lib/sockets/sockets_packet.c
                      ${ZEPHYR_BASE}/subsys/net/lib/sockets/sockets.c
                      ${ZEPHYR_BASE}/subsys/net/ip/ipv4.c
@@ -396,7 +399,7 @@ zephyr_code_relocate(FILES
                      ${ZEPHYR_BASE}/subsys/net/ip/udp.c
                      ${ZEPHYR_BASE}/subsys/net/l2/ethernet/ethernet.c
                      ${ZEPHYR_BASE}/lib/net_buf/buf.c
-                     LOCATION ${QUICK_ACCESS_CODE_AREA})
+                     LOCATION ${QUICK_ACCESS_CODE_AREA} NOKEEP)
 
 zephyr_code_relocate(FILES
                      ${ZEPHYR_BASE}/kernel/mem_slab.c
@@ -408,7 +411,7 @@ zephyr_code_relocate(FILES
                      ${ZEPHYR_BASE}/kernel/sem.c
                      ${ZEPHYR_BASE}/kernel/thread.c
                      ${ZEPHYR_BASE}/kernel/work.c
-                     LOCATION ${QUICK_ACCESS_CODE_AREA})
+                     LOCATION ${QUICK_ACCESS_CODE_AREA} NOKEEP)
 endif()
 endif()
 

mcux/middleware/wifi_nxp/wifidriver/wifi.c

@@ -1775,30 +1775,20 @@ static void wifi_core_task(void *argv)
         g_txrx_flag = true;
         //		SDIOC_IntMask(SDIOC_INT_CDINT, UNMASK);
         //		SDIOC_IntSigMask(SDIOC_INT_CDINT, UNMASK);
-#ifndef RW610
         sdio_enable_interrupt();
-#endif
 
         OSA_EXIT_CRITICAL();
 
         (void)OSA_TaskNotifyGet(osaWaitForever_c);
 
         // wakelock_get(WL_ID_WIFI_CORE_INPUT);
 
-#if defined(RW610)
-        (void)wifi_imu_lock();
-#else
         /* Protect the SDIO from other parallel activities */
         (void)wifi_sdio_lock();
 
         (void)wlan_process_int_status(mlan_adap);
-#endif
 
-#if defined(RW610)
-        wifi_imu_unlock();
-#else
         wifi_sdio_unlock();
-#endif
         // wakelock_put(WL_ID_WIFI_CORE_INPUT);
     } /* for ;; */
 }