From dd14e97375dd1a11dcc09f0d1ada9ff09f7e9bc4 Mon Sep 17 00:00:00 2001
From: ChenJianxing <chenjianxing@espressif.com>
Date: Mon, 22 Mar 2021 11:37:05 +0800
Subject: [PATCH] esp_wifi: support esp32s3 beta3 wifi

---
 components/esp_hw_support/sleep_modes.c      | 4 ++++
 components/esp_rom/esp32s3/ld/esp32s3.rom.ld | 3 ---
 components/esp_wifi/CMakeLists.txt           | 9 ---------
 components/esp_wifi/lib                      | 2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/components/esp_hw_support/sleep_modes.c b/components/esp_hw_support/sleep_modes.c
index 74cc4b54cf..d2e6af647a 100644
--- a/components/esp_hw_support/sleep_modes.c
+++ b/components/esp_hw_support/sleep_modes.c
@@ -552,8 +552,12 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags)
 
 #if !CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP
         /* If not possible stack is in RTC FAST memory, use the ROM function to calculate the CRC and save ~140 bytes IRAM */
+#if CONFIG_IDF_TARGET_ESP32S3//TODO: WIFI-3542
+        result = 0;
+#else
         set_rtc_memory_crc();
         result = call_rtc_sleep_start(reject_triggers);
+#endif
 #else
         /* Otherwise, need to call the dedicated soc function for this */
         result = rtc_deep_sleep_start(s_config.wakeup_triggers, reject_triggers);
diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
index abdcc4897a..8dc27077e2 100644
--- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
+++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1750,7 +1750,6 @@ lmacReachShortLimit = 0x40005070;
 lmacRecycleMPDU = 0x4000507c;
 lmacRxDone = 0x40005088;
 lmacSetTxFrame = 0x40005094;
-lmacTxDone = 0x400050a0;
 lmacTxFrame = 0x400050ac;
 mac_tx_set_duration = 0x400050b8;
 mac_tx_set_htsig = 0x400050c4;
@@ -1793,7 +1792,6 @@ ppEnqueueRxq = 0x40005274;
 ppEnqueueTxDone = 0x40005280;
 ppGetTxQFirstAvail_Locked = 0x4000528c;
 ppGetTxframe = 0x40005298;
-ppMapTxQueue = 0x400052a4;
 ppProcTxSecFrame = 0x400052b0;
 ppProcessRxPktHdr = 0x400052bc;
 ppProcessTxQ = 0x400052c8;
@@ -1828,7 +1826,6 @@ rcampduuprate = 0x40005418;
 rcClearCurAMPDUSched = 0x40005424;
 rcClearCurSched = 0x40005430;
 rcClearCurStat = 0x4000543c;
-rcGetSched = 0x40005448;
 rcLowerSched = 0x40005454;
 rcSetTxAmpduLimit = 0x40005460;
 rcTxUpdatePer = 0x4000546c;
diff --git a/components/esp_wifi/CMakeLists.txt b/components/esp_wifi/CMakeLists.txt
index 2b181538b2..4b8cb40376 100644
--- a/components/esp_wifi/CMakeLists.txt
+++ b/components/esp_wifi/CMakeLists.txt
@@ -8,15 +8,6 @@ else()
     set(ldfragments "linker.lf")
 endif()
 
-# remove these when wifi support is ready on esp32-s3
-if(${idf_target} STREQUAL "esp32s3")
-    idf_component_register(INCLUDE_DIRS "include"
-                           REQUIRES esp_event
-                           PRIV_REQUIRES wpa_supplicant nvs_flash esp_netif)
-    return()
-endif()
-
-
 if(IDF_TARGET_ESP32)
     # dport workaround headers are in esp32 component
     set(extra_priv_requires esp32)
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 24b64035ba..ade3a3a587 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 24b64035ba0741d438fa30b21a53065ba7f13c9b
+Subproject commit ade3a3a5871dc5052677651640e9e041c99c0f7d