IDF release/v3.3 68b237fe5 with Disable IRAM optimisation for WiFi

espressif · Nov 16, 2020 · 6d256b6 · 6d256b6
2 parents adafd9d + f6bf0f7
commit 6d256b6
Show file tree

Hide file tree

Showing 82 changed files with 109 additions and 11 deletions.
diff --git a/tools/sdk/bin/bootloader_dio_40m.bin b/tools/sdk/bin/bootloader_dio_40m.bin
diff --git a/tools/sdk/bin/bootloader_qout_80m.bin b/tools/sdk/bin/bootloader_qout_80m.bin
diff --git a/tools/sdk/include/config/sdkconfig.h b/tools/sdk/include/config/sdkconfig.h
@@ -87,6 +87,7 @@
 #define CONFIG_MFN56_1X 1
 #define CONFIG_LWIP_MAX_SOCKETS 10
 #define CONFIG_LWIP_NETIF_LOOPBACK 1
+#define CONFIG_LWIP_TCP_ISN_HOOK 1
 #define CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT "pthread"
 #define CONFIG_EMAC_TASK_PRIORITY 20
 #define CONFIG_TIMER_TASK_STACK_DEPTH 2048
@@ -244,7 +245,6 @@
 #define CONFIG_SPIFFS_GC_MAX_RUNS 10
 #define CONFIG_ARDUINO_RUN_CORE1 1
 #define CONFIG_ESP32_APPTRACE_DEST_NONE 1
-#define CONFIG_ESP32_WIFI_RX_IRAM_OPT 1
 #define CONFIG_HP_NANO1 1
 #define CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC 1
 #define CONFIG_MBEDTLS_SSL_PROTO_TLS1_2 1
@@ -392,7 +392,6 @@
 #define CONFIG_HD_NANO1 1
 #define CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG 1
 #define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
-#define CONFIG_ESP32_WIFI_IRAM_OPT 1
 #define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
-#define CONFIG_ARDUINO_IDF_COMMIT "66d3783c8"
+#define CONFIG_ARDUINO_IDF_COMMIT "68b237fe5"
 #define CONFIG_ARDUINO_IDF_BRANCH "release/v3.3"
diff --git a/tools/sdk/include/esp32/esp_mesh_internal.h b/tools/sdk/include/esp32/esp_mesh_internal.h
@@ -263,6 +263,16 @@ esp_err_t esp_mesh_set_announce_interval(int short_ms, int long_ms);
  */
 esp_err_t esp_mesh_get_announce_interval(int *short_ms, int *long_ms);
 
+/**
+ * @brief      Enable mesh print scan result
+ *
+ * @param[in]  enable  enable or not
+ *
+ * @return
+ *    - ESP_OK
+ */
+esp_err_t esp_mesh_print_scan_result(bool enable);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/tools/sdk/include/esp32/esp_panic.h b/tools/sdk/include/esp32/esp_panic.h
@@ -20,6 +20,7 @@ extern "C"
 #ifndef __ASSEMBLER__
 
 #include "esp_err.h"
+#include "soc/soc.h"
 
 
 /**
@@ -61,12 +62,36 @@ esp_err_t esp_set_watchpoint(int no, void *adr, int size, int flags);
  */
 void esp_clear_watchpoint(int no);
 
+/**
+ * @brief Checks stack pointer in dram
+ */
+inline static bool esp_stack_ptr_in_dram(uint32_t sp)
+{
+    //Check if stack ptr is in between SOC_DRAM_LOW and SOC_DRAM_HIGH, and 16 byte aligned.
+    return !(sp < SOC_DRAM_LOW + 0x10 || sp > SOC_DRAM_HIGH - 0x10 || ((sp & 0xF) != 0));
+}
+
+#if CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY
+/**
+ * @brief Checks stack pointer in external ram
+ */
+inline static bool esp_stack_ptr_in_extram(uint32_t sp)
+{
+    //Check if stack ptr is in between SOC_EXTRAM_DATA_LOW and SOC_EXTRAM_DATA_HIGH, and 16 byte aligned.
+    return !(sp < SOC_EXTRAM_DATA_LOW + 0x10 || sp > SOC_EXTRAM_DATA_HIGH - 0x10 || ((sp & 0xF) != 0));
+}
+#endif
+
 /**
  * @brief Checks stack pointer
  */
 static inline bool esp_stack_ptr_is_sane(uint32_t sp)
 {
-	return !(sp < 0x3ffae010UL || sp > 0x3ffffff0UL || ((sp & 0xf) != 0));
+#if CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY
+    return (esp_stack_ptr_in_dram(sp) || esp_stack_ptr_in_extram(sp));
+#else
+    return esp_stack_ptr_in_dram(sp);
+#endif
 }
 #endif
 

diff --git a/tools/sdk/include/lwip/lwipopts.h b/tools/sdk/include/lwip/lwipopts.h
@@ -396,6 +396,17 @@
  */
 #define LWIP_TCP_RTO_TIME             CONFIG_LWIP_TCP_RTO_TIME
 
+/**
+ * Set TCP hook for Initial Sequence Number (ISN)
+ */
+#ifdef CONFIG_LWIP_TCP_ISN_HOOK
+#include <lwip/arch.h>
+struct ip_addr;
+u32_t lwip_hook_tcp_isn(const struct ip_addr *local_ip, u16_t local_port,
+                        const struct ip_addr *remote_ip, u16_t remote_port);
+#define LWIP_HOOK_TCP_ISN               lwip_hook_tcp_isn
+#endif
+
 /*
    ----------------------------------
    ---------- Pbuf options ----------

diff --git a/tools/sdk/include/lwip/netdb.h b/tools/sdk/include/lwip/netdb.h
@@ -32,9 +32,17 @@
 
 #include "lwip/netdb.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef ESP_PLATFORM
 int getnameinfo(const struct sockaddr *addr, socklen_t addrlen,
                 char *host, socklen_t hostlen,
                 char *serv, socklen_t servlen, int flags);
 
 #endif
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/tools/sdk/include/lwip/tcp_isn.h b/tools/sdk/include/lwip/tcp_isn.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2016 The MINIX 3 Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * Author: David van Moolenbroek <david@minix3.org>
+ */
+
+#ifndef LWIP_TCP_ISN_H
+#define LWIP_TCP_ISN_H
+
+#include "lwip/opt.h"
+#include "lwip/ip_addr.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void lwip_init_tcp_isn(u32_t boot_time, const u8_t *secret_16_bytes);
+u32_t lwip_hook_tcp_isn(const ip_addr_t *local_ip, u16_t local_port,
+                        const ip_addr_t *remote_ip, u16_t remote_port);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_TCP_ISN_H */
diff --git a/tools/sdk/ld/esp32.project.ld b/tools/sdk/ld/esp32.project.ld
diff --git a/tools/sdk/lib/libapp_trace.a b/tools/sdk/lib/libapp_trace.a
diff --git a/tools/sdk/lib/libapp_update.a b/tools/sdk/lib/libapp_update.a
diff --git a/tools/sdk/lib/libasio.a b/tools/sdk/lib/libasio.a
diff --git a/tools/sdk/lib/libbootloader_support.a b/tools/sdk/lib/libbootloader_support.a
diff --git a/tools/sdk/lib/libbt.a b/tools/sdk/lib/libbt.a
diff --git a/tools/sdk/lib/libcoap.a b/tools/sdk/lib/libcoap.a
diff --git a/tools/sdk/lib/libcoexist.a b/tools/sdk/lib/libcoexist.a
diff --git a/tools/sdk/lib/libconsole.a b/tools/sdk/lib/libconsole.a
diff --git a/tools/sdk/lib/libcore.a b/tools/sdk/lib/libcore.a
diff --git a/tools/sdk/lib/libcxx.a b/tools/sdk/lib/libcxx.a
diff --git a/tools/sdk/lib/libdriver.a b/tools/sdk/lib/libdriver.a
diff --git a/tools/sdk/lib/libefuse.a b/tools/sdk/lib/libefuse.a
diff --git a/tools/sdk/lib/libesp-tls.a b/tools/sdk/lib/libesp-tls.a
diff --git a/tools/sdk/lib/libesp32-camera.a b/tools/sdk/lib/libesp32-camera.a
diff --git a/tools/sdk/lib/libesp32.a b/tools/sdk/lib/libesp32.a
diff --git a/tools/sdk/lib/libesp_adc_cal.a b/tools/sdk/lib/libesp_adc_cal.a
diff --git a/tools/sdk/lib/libesp_event.a b/tools/sdk/lib/libesp_event.a
diff --git a/tools/sdk/lib/libesp_http_client.a b/tools/sdk/lib/libesp_http_client.a
diff --git a/tools/sdk/lib/libesp_http_server.a b/tools/sdk/lib/libesp_http_server.a
diff --git a/tools/sdk/lib/libesp_https_ota.a b/tools/sdk/lib/libesp_https_ota.a
diff --git a/tools/sdk/lib/libesp_https_server.a b/tools/sdk/lib/libesp_https_server.a
diff --git a/tools/sdk/lib/libesp_ringbuf.a b/tools/sdk/lib/libesp_ringbuf.a
diff --git a/tools/sdk/lib/libesp_websocket_client.a b/tools/sdk/lib/libesp_websocket_client.a
diff --git a/tools/sdk/lib/libespcoredump.a b/tools/sdk/lib/libespcoredump.a
diff --git a/tools/sdk/lib/libespnow.a b/tools/sdk/lib/libespnow.a
diff --git a/tools/sdk/lib/libethernet.a b/tools/sdk/lib/libethernet.a
diff --git a/tools/sdk/lib/libexpat.a b/tools/sdk/lib/libexpat.a
diff --git a/tools/sdk/lib/libface_detection.a b/tools/sdk/lib/libface_detection.a
diff --git a/tools/sdk/lib/libface_recognition.a b/tools/sdk/lib/libface_recognition.a
diff --git a/tools/sdk/lib/libfatfs.a b/tools/sdk/lib/libfatfs.a
diff --git a/tools/sdk/lib/libfb_gfx.a b/tools/sdk/lib/libfb_gfx.a
diff --git a/tools/sdk/lib/libfreemodbus.a b/tools/sdk/lib/libfreemodbus.a
diff --git a/tools/sdk/lib/libfreertos.a b/tools/sdk/lib/libfreertos.a
diff --git a/tools/sdk/lib/libheap.a b/tools/sdk/lib/libheap.a
diff --git a/tools/sdk/lib/libimage_util.a b/tools/sdk/lib/libimage_util.a
diff --git a/tools/sdk/lib/libjsmn.a b/tools/sdk/lib/libjsmn.a
diff --git a/tools/sdk/lib/libjson.a b/tools/sdk/lib/libjson.a
diff --git a/tools/sdk/lib/liblibsodium.a b/tools/sdk/lib/liblibsodium.a
diff --git a/tools/sdk/lib/liblog.a b/tools/sdk/lib/liblog.a
diff --git a/tools/sdk/lib/liblwip.a b/tools/sdk/lib/liblwip.a
diff --git a/tools/sdk/lib/libmbedtls.a b/tools/sdk/lib/libmbedtls.a
diff --git a/tools/sdk/lib/libmdns.a b/tools/sdk/lib/libmdns.a
diff --git a/tools/sdk/lib/libmesh.a b/tools/sdk/lib/libmesh.a
diff --git a/tools/sdk/lib/libmicro-ecc.a b/tools/sdk/lib/libmicro-ecc.a
diff --git a/tools/sdk/lib/libmqtt.a b/tools/sdk/lib/libmqtt.a
diff --git a/tools/sdk/lib/libnet80211.a b/tools/sdk/lib/libnet80211.a
diff --git a/tools/sdk/lib/libnewlib.a b/tools/sdk/lib/libnewlib.a
diff --git a/tools/sdk/lib/libnghttp.a b/tools/sdk/lib/libnghttp.a
diff --git a/tools/sdk/lib/libnvs_flash.a b/tools/sdk/lib/libnvs_flash.a
diff --git a/tools/sdk/lib/libopenssl.a b/tools/sdk/lib/libopenssl.a
diff --git a/tools/sdk/lib/libpp.a b/tools/sdk/lib/libpp.a
diff --git a/tools/sdk/lib/libprotobuf-c.a b/tools/sdk/lib/libprotobuf-c.a
diff --git a/tools/sdk/lib/libprotocomm.a b/tools/sdk/lib/libprotocomm.a
diff --git a/tools/sdk/lib/libpthread.a b/tools/sdk/lib/libpthread.a
diff --git a/tools/sdk/lib/libsdmmc.a b/tools/sdk/lib/libsdmmc.a
diff --git a/tools/sdk/lib/libsmartconfig.a b/tools/sdk/lib/libsmartconfig.a
diff --git a/tools/sdk/lib/libsmartconfig_ack.a b/tools/sdk/lib/libsmartconfig_ack.a
diff --git a/tools/sdk/lib/libsoc.a b/tools/sdk/lib/libsoc.a
diff --git a/tools/sdk/lib/libspi_flash.a b/tools/sdk/lib/libspi_flash.a
diff --git a/tools/sdk/lib/libspiffs.a b/tools/sdk/lib/libspiffs.a
diff --git a/tools/sdk/lib/libtcp_transport.a b/tools/sdk/lib/libtcp_transport.a
diff --git a/tools/sdk/lib/libtcpip_adapter.a b/tools/sdk/lib/libtcpip_adapter.a
diff --git a/tools/sdk/lib/libulp.a b/tools/sdk/lib/libulp.a
diff --git a/tools/sdk/lib/libunity.a b/tools/sdk/lib/libunity.a
diff --git a/tools/sdk/lib/libvfs.a b/tools/sdk/lib/libvfs.a
diff --git a/tools/sdk/lib/libwear_levelling.a b/tools/sdk/lib/libwear_levelling.a
diff --git a/tools/sdk/lib/libwifi_provisioning.a b/tools/sdk/lib/libwifi_provisioning.a
diff --git a/tools/sdk/lib/libwpa.a b/tools/sdk/lib/libwpa.a
diff --git a/tools/sdk/lib/libwpa2.a b/tools/sdk/lib/libwpa2.a
diff --git a/tools/sdk/lib/libwpa_supplicant.a b/tools/sdk/lib/libwpa_supplicant.a
diff --git a/tools/sdk/lib/libwps.a b/tools/sdk/lib/libwps.a
diff --git a/tools/sdk/lib/libxtensa-debug-module.a b/tools/sdk/lib/libxtensa-debug-module.a
diff --git a/tools/sdk/sdkconfig b/tools/sdk/sdkconfig
@@ -457,8 +457,8 @@ CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=
 CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
 CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
 CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE=
-CONFIG_ESP32_WIFI_IRAM_OPT=y
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
+CONFIG_ESP32_WIFI_IRAM_OPT=
+CONFIG_ESP32_WIFI_RX_IRAM_OPT=
 
 #
 # PHY
@@ -690,6 +690,7 @@ CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
 #
 # TCP
 #
+CONFIG_LWIP_TCP_ISN_HOOK=y
 CONFIG_LWIP_MAX_ACTIVE_TCP=16
 CONFIG_LWIP_MAX_LISTENING_TCP=16
 CONFIG_TCP_MAXRTX=12