fix(nw_split): Disable Network split for ESP32-C2 and ESP32-C3

Author: mantriyogesh

esp_hosted_fg/esp/esp_driver/network_adapter/CMakeLists.txt

@@ -27,7 +27,18 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(network_adapter)
 idf_build_set_property(COMPILE_OPTIONS "-fdiagnostics-color=always" APPEND)
 
-
-idf_component_get_property(lwip lwip COMPONENT_LIB)
-target_compile_options(${lwip} PRIVATE "-I${PROJECT_DIR}/main")
-target_compile_definitions(${lwip} PRIVATE "-DESP_IDF_LWIP_HOOK_FILENAME=\"esp_hosted_lwip_src_port_hook.h\"")
+if(NOT CONFIG_IDF_TARGET_ESP32C2 AND NOT CONFIG_IDF_TARGET_ESP32C3)
+    idf_component_get_property(lwip lwip COMPONENT_LIB)
+    if(TARGET ${lwip})
+        # Use generator expressions to only apply to non-INTERFACE targets
+        get_target_property(lwip_type ${lwip} TYPE)
+        if(NOT lwip_type STREQUAL "INTERFACE_LIBRARY")
+            message(STATUS "********** Configuring LWIP for network split mode with custom hook **********")
+            target_include_directories(${lwip} PRIVATE "${PROJECT_DIR}/main")
+            target_compile_definitions(${lwip} PRIVATE "-DESP_IDF_LWIP_HOOK_FILENAME=\"esp_hosted_lwip_src_port_hook.h\"")
+        endif()
+    endif()
+else()
+    message(STATUS "********** Skipping LWIP for network split mode with custom hook **********")
+    # Do not reference esp_http_client for esp32c2 and esp32c3
+endif()

esp_hosted_fg/esp/esp_driver/network_adapter/main/CMakeLists.txt

@@ -11,11 +11,17 @@ set(COMPONENT_SRCS
     "stats.c"
     "mempool_ll.c"
     "host_power_save.c"
-    "mqtt_example.c"
-    "http_req.c"
     "lwip_filter.c"
 )
 
+if(CONFIG_ESP_HOSTED_COPROCESSOR_EXAMPLE_MQTT)
+    list(APPEND COMPONENT_SRCS mqtt_example.c)
+endif()
+
+if(CONFIG_ESP_HOSTED_COPROCESSOR_EXAMPLE_HTTP_CLIENT)
+    list(APPEND COMPONENT_SRCS http_req.c)
+endif()
+
 set(COMPONENT_ADD_INCLUDEDIRS
     "."
     "${common_dir}/include"

esp_hosted_fg/esp/esp_driver/network_adapter/main/Kconfig.projbuild

@@ -480,6 +480,7 @@ menu "Example Configuration"
 	endmenu
 
 	config NETWORK_SPLIT_ENABLED
+		depends on !IDF_TARGET_ESP32C2 && !IDF_TARGET_ESP32C3
 		bool "Allow Network Split using packet port number"
 		default y
 		help
@@ -631,12 +632,13 @@ menu "Example Configuration"
 	endmenu
 
 	config ESP_HOSTED_CLI_ENABLED
+		depends on !IDF_TARGET_ESP32C2 && !IDF_TARGET_ESP32C3
 		bool "Start CLI at slave"
 		default y
 
 	choice "Wi-Fi control"
 		prompt "Wi-Fi control"
-		default SLAVE_MANAGES_WIFI
+		default BOTH_MANAGES_WIFI
 
 		config SLAVE_MANAGES_WIFI
 			bool "Slave manages Wi-Fi"
@@ -738,6 +740,8 @@ menu "Example Configuration"
 
 
 	menu "Example to run"
+		depends on NETWORK_SPLIT_ENABLED
+
 		config ESP_HOSTED_COPROCESSOR_EXAMPLE_MQTT
 			bool "MQTT client example"
 			default y

esp_hosted_fg/esp/esp_driver/network_adapter/main/http_req.c

@@ -7,6 +7,9 @@
    CONDITIONS OF ANY KIND, either express or implied.
 */
 #include <string.h>
+#include "sdkconfig.h"
+
+#ifdef CONFIG_ESP_HOSTED_COPROCESSOR_EXAMPLE_HTTP_CLIENT
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "esp_system.h"
@@ -17,9 +20,9 @@
 #include "lwip/sys.h"
 #include "lwip/netdb.h"
 #include "lwip/dns.h"
-#include "sdkconfig.h"
 
-#ifdef ESP_HOSTED_COPROCESSOR_EXAMPLE_HTTP_CLIENT
+
+
 extern volatile uint8_t station_connected;
 /* Constants that aren't configurable in menuconfig */
 #define WEB_SERVER CONFIG_HTTP_WEBSERVER

esp_hosted_fg/esp/esp_driver/network_adapter/main/idf_component.yml

@@ -1,11 +1,21 @@
 dependencies:
   cmd_system:
     path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_system
+    rules:
+      - if: target not in ["esp32c2", "esp32c3"]
   espressif/iperf:
     version: "*"
+    rules:
+      - if: target not in ["esp32c2", "esp32c3"]
   espressif/iperf-cmd:
     version: "~0.1.1"
+    rules:
+      - if: target not in ["esp32c2", "esp32c3"]
   esp-qa/wifi-cmd:
     version: "~0.1.0"
+    rules:
+      - if: target not in ["esp32c2", "esp32c3"]
   esp-qa/ping-cmd:
     version: "~0.0.1"
+    rules:
+      - if: target not in ["esp32c2", "esp32c3"]

esp_hosted_fg/esp/esp_driver/network_adapter/main/lwip_filter.c

@@ -9,7 +9,7 @@
 #include "host_power_save.h"
 #include "lwip_filter.h"
 
-#ifdef CONFIG_NETWORK_SPLIT_ENABLED
+#if defined(CONFIG_NETWORK_SPLIT_ENABLED) && defined(CONFIG_LWIP_ENABLE)
 #include "lwip/opt.h"
 #include "lwip/err.h"
 #include "lwip/sys.h"
@@ -522,4 +522,4 @@ hosted_l2_bridge filter_and_route_packet(void *frame_data, uint16_t frame_length
 int configure_host_static_port_forwarding_rules(const char *ports_str_tcp_src, const char *ports_str_tcp_dst, const char *ports_str_udp_src, const char *ports_str_udp_dst) {
     return punch_hole_for_host_ports_from_config(ports_str_tcp_src, ports_str_tcp_dst, ports_str_udp_src, ports_str_udp_dst);
 }
-#endif
+#endif

esp_hosted_fg/esp/esp_driver/network_adapter/main/lwip_filter.h

@@ -11,11 +11,11 @@ typedef enum {
 	INVALID_BRIDGE,
 } hosted_l2_bridge;
 
-#ifdef CONFIG_NETWORK_SPLIT_ENABLED
+#if defined(CONFIG_NETWORK_SPLIT_ENABLED) && defined(CONFIG_LWIP_ENABLE)
 #include "esp_hosted_lwip_src_port_hook.h"
 
 hosted_l2_bridge filter_and_route_packet(void *frame_data, uint16_t frame_length);
 
 int configure_host_static_port_forwarding_rules(const char *ports_str_tcp_src, const char *ports_str_tcp_dst,
                                                 const char *ports_str_udp_src, const char *ports_str_udp_dst);
-#endif
+#endif

esp_hosted_fg/esp/esp_driver/network_adapter/main/mqtt_example.c

@@ -11,6 +11,10 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <string.h>
+#include "sdkconfig.h"
+
+#ifdef CONFIG_ESP_HOSTED_COPROCESSOR_EXAMPLE_MQTT
+
 #include "esp_wifi.h"
 #include "esp_system.h"
 #include "nvs_flash.h"
@@ -23,15 +27,15 @@
 #include "freertos/semphr.h"
 #include "freertos/queue.h"
 
-#include "lwip/sockets.h"
-#include "lwip/dns.h"
-#include "lwip/netdb.h"
 
 #include "esp_log.h"
 #include "mqtt_client.h"
 #include "host_power_save.h"
 
-#ifdef CONFIG_ESP_HOSTED_COPROCESSOR_EXAMPLE_MQTT
+#include "lwip/sockets.h"
+#include "lwip/dns.h"
+#include "lwip/netdb.h"
+
 static const char *TAG = "mqtt_example";
 static esp_mqtt_client_handle_t client;
 static uint8_t client_started;

esp_hosted_fg/esp/esp_driver/network_adapter/sdkconfig.defaults.esp32c2

@@ -34,13 +34,13 @@ CONFIG_ESP_CACHE_MALLOC=y
 # 6.1 LWIP split
 #---------------
 
-CONFIG_NETWORK_SPLIT_ENABLED=y
-CONFIG_LWIP_TCP_LOCAL_PORT_RANGE_START=61440
-CONFIG_LWIP_TCP_LOCAL_PORT_RANGE_END=65535
-CONFIG_LWIP_UDP_LOCAL_PORT_RANGE_START=61440
-CONFIG_LWIP_UDP_LOCAL_PORT_RANGE_END=65535
+CONFIG_NETWORK_SPLIT_ENABLED=n
+#CONFIG_LWIP_TCP_LOCAL_PORT_RANGE_START=61440
+#CONFIG_LWIP_TCP_LOCAL_PORT_RANGE_END=65535
+#CONFIG_LWIP_UDP_LOCAL_PORT_RANGE_START=61440
+#CONFIG_LWIP_UDP_LOCAL_PORT_RANGE_END=65535
 
-CONFIG_ESP_DEFAULT_LWIP_SLAVE=y
+#CONFIG_ESP_DEFAULT_LWIP_SLAVE=y
 
 # 6.2 LWIP split examples
 #-------------------------
@@ -59,7 +59,7 @@ CONFIG_ESP_HOSTED_COPROCESSOR_EXAMPLE_MQTT=n
 
 # 8. Wifi config
 #----------------
-CONFIG_WIFI_CMD_BASIC_ONLY=y
+#CONFIG_WIFI_CMD_BASIC_ONLY=y
 
 CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=8
 CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=16
@@ -74,22 +74,22 @@ CONFIG_ESP_WIFI_IRAM_OPT=y
 
 # 9. LWIP config
 #----------------
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=11520
-CONFIG_LWIP_TCP_WND_DEFAULT=11520
-CONFIG_LWIP_TCP_RECVMBOX_SIZE=16
-CONFIG_LWIP_UDP_RECVMBOX_SIZE=16
-CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
-CONFIG_LWIP_TCP_SACK_OUT=y
-CONFIG_LWIP_TCPIP_CORE_LOCKING=y
-CONFIG_LWIP_TCPIP_CORE_LOCKING_INPUT=y
+#CONFIG_LWIP_TCP_SND_BUF_DEFAULT=11520
+#CONFIG_LWIP_TCP_WND_DEFAULT=11520
+#CONFIG_LWIP_TCP_RECVMBOX_SIZE=16
+#CONFIG_LWIP_UDP_RECVMBOX_SIZE=16
+#CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
+#CONFIG_LWIP_TCP_SACK_OUT=y
+#CONFIG_LWIP_TCPIP_CORE_LOCKING=y
+#CONFIG_LWIP_TCPIP_CORE_LOCKING_INPUT=y
 
 
 # 10. Optimizations
 #-------------------
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 #CONFIG_COMPILER_OPTIMIZATION_PERF=y
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+#CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 
 
 # 11. Stats
@@ -99,9 +99,9 @@ CONFIG_ESP_PKT_STATS=y
 
 # 12. Priorities
 #----------------
-CONFIG_IPERF_TRAFFIC_TASK_PRIORITY=18
-CONFIG_IPERF_REPORT_TASK_PRIORITY=18
-CONFIG_ESP_DEFAULT_TASK_PRIO=18
+#CONFIG_IPERF_TRAFFIC_TASK_PRIORITY=18
+#CONFIG_IPERF_REPORT_TASK_PRIORITY=18
+#CONFIG_ESP_DEFAULT_TASK_PRIO=18
 
 
 #13. Mem optimizations
@@ -117,11 +117,13 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=n
 CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
 
 CONFIG_ESP_DEFAULT_TASK_STACK_SIZE=2048
-CONFIG_C2_C5_MODULE_SUB_BOARD=y
+#CONFIG_C2_C5_MODULE_SUB_BOARD=y
 
 #15. C2 26 MHz XTAL chips
 # C2 generally in MP has 26MHz.
 # If your C2 has 40MHz, just comment below lines
 #---------------------------------
 CONFIG_SOC_XTAL_SUPPORT_26M=y
 CONFIG_XTAL_FREQ_26=y
+
+

esp_hosted_fg/esp/esp_driver/network_adapter/sdkconfig.defaults.esp32c2.wifionly

@@ -8,11 +8,11 @@ CONFIG_BT_ENABLED=n
 CONFIG_BT_CONTROLLER_ONLY=y
 CONFIG_BT_LE_SLEEP_ENABLE=y
 
-# 3.1 BLE over SPI/SDIO
+# 2.1 BLE over SPI/SDIO
 #-----------------------
 CONFIG_BT_LE_HCI_INTERFACE_USE_RAM=y
 
-# 3.2 BLE over UART
+# 2.2 BLE over UART
 #-------------------
 #UART pins, Enable below config, delete sdkconfig and rebuild
 #CONFIG_BT_LE_HCI_INTERFACE_USE_UART=y
@@ -21,47 +21,25 @@ CONFIG_BT_LE_HCI_INTERFACE_USE_RAM=y
 #CONFIG_BT_LE_HCI_UART_RX_PIN=18
 
 
-# 4. Partition Table
+# 3. Partition Table
 #--------------------
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.esp32c2.csv"
 
-# 5. Mempool
+# 4. Mempool
 #------------
 CONFIG_ESP_CACHE_MALLOC=y
 
 
-# 6.1 LWIP split
+# 5 LWIP split
 #---------------
 
-CONFIG_NETWORK_SPLIT_ENABLED=y
-CONFIG_LWIP_TCP_LOCAL_PORT_RANGE_START=61440
-CONFIG_LWIP_TCP_LOCAL_PORT_RANGE_END=65535
-CONFIG_LWIP_UDP_LOCAL_PORT_RANGE_START=61440
-CONFIG_LWIP_UDP_LOCAL_PORT_RANGE_END=65535
+CONFIG_LWIP_ENABLE=n
+CONFIG_NETWORK_SPLIT_ENABLED=n
 
-CONFIG_ESP_DEFAULT_LWIP_SLAVE=y
 
-# 6.2 LWIP split examples
-#-------------------------
-CONFIG_ESP_HOSTED_COPROCESSOR_EXAMPLE_MQTT=n
-CONFIG_ESP_HOSTED_CLI_ENABLED=y
-CONFIG_SLAVE_MANAGES_WIFI=y
-
-# 7. Transport config
-#---------------------
-# CONFIG_ESP_SDIO_NSEND_PSAMPLE=y
-# CONFIG_ESP_SDIO_DEFAULT_SPEED=y
-# CONFIG_ESP_SDIO_STREAMING_MODE=n
-
-# For SPI Full duplex C6 on ESP32-P4-Function-EV-Board, please uncomment below
-#CONFIG_C6_SPI_WITH_P4=y
-
-
-# 8. Wifi config
+# 6. Wifi config
 #----------------
-CONFIG_WIFI_CMD_BASIC_ONLY=y
-
 CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=14
 CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=14
 CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=18
@@ -73,54 +51,36 @@ CONFIG_ESP_WIFI_RX_BA_WIN=14
 CONFIG_ESP_WIFI_RX_IRAM_OPT=y
 CONFIG_ESP_WIFI_IRAM_OPT=y
 
-# 9. LWIP config
-#----------------
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=11520
-CONFIG_LWIP_TCP_WND_DEFAULT=11520
-CONFIG_LWIP_TCP_RECVMBOX_SIZE=16
-CONFIG_LWIP_UDP_RECVMBOX_SIZE=16
-CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
-CONFIG_LWIP_TCP_SACK_OUT=y
-CONFIG_LWIP_TCPIP_CORE_LOCKING=y
-CONFIG_LWIP_TCPIP_CORE_LOCKING_INPUT=y
-
 
-# 10. Optimizations
+# 7. Optimizations
 #-------------------
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 #CONFIG_COMPILER_OPTIMIZATION_PERF=y
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 
 
-# 11. Stats
+# 8. Stats
 #-----------
-#CONFIG_ESP_HOSTED_FUNCTION_PROFILING=y
 CONFIG_ESP_PKT_STATS=y
 
-# 12. Priorities
-#----------------
-CONFIG_IPERF_TRAFFIC_TASK_PRIORITY=18
-CONFIG_IPERF_REPORT_TASK_PRIORITY=18
-CONFIG_ESP_DEFAULT_TASK_PRIO=18
 
 
-#13. Mem optimizations
+# 9. Mem optimizations
 #---------------------
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_120=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=120
 CONFIG_FREERTOS_UNICORE=y
 
-#14. C2 specific opts
+#10. C2 specific opts
 #---------------------
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=n
 CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
 
 CONFIG_ESP_DEFAULT_TASK_STACK_SIZE=2048
-CONFIG_C2_C5_MODULE_SUB_BOARD=y
 
-#15. C2 26 MHz XTAL chips
+#11. C2 26 MHz XTAL chips
 # C2 generally in MP has 26MHz.
 # If your C2 has 40MHz, just comment below lines
 #---------------------------------