Merge branch 'chip/esp32c5_mp_support_wifi' into 'master'

esp32c5 mp support wifi Closes IDF-9139 and IDF-10529 See merge request espressif/esp-idf!31901
espressif · Jul 26, 2024 · 7b5014a · 7b5014a
2 parents fc5ca21 + a397d31
commit 7b5014a
Show file tree

Hide file tree

Showing 59 changed files with 552 additions and 194 deletions.
diff --git a/components/esp_coex/lib b/components/esp_coex/lib
diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt
@@ -182,7 +182,6 @@ else() # Regular app build
         rom_linker_script("coexist")
         rom_linker_script("net80211")
         rom_linker_script("pp")
-
     elseif(target STREQUAL "esp32c5")
         # esp32c5.rom.api.ld has been split to several lds by components.
         # esp32c5.rom.api.ld is still reserved to map the APIs

diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.net80211.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.net80211.ld
@@ -65,7 +65,7 @@ wifi_get_macaddr = 0x40000bc4;
 wifi_rf_phy_disable = 0x40000bc8;
 wifi_rf_phy_enable = 0x40000bcc;
 wifi_is_started = 0x40000bd0;
-sta_input = 0x40000bd4;
+/*sta_input = 0x40000bd4;*/
 sta_rx_eapol = 0x40000bd8;
 sta_reset_beacon_timeout = 0x40000bdc;
 sta_get_beacon_timeout = 0x40000be0;

diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld
@@ -32,7 +32,7 @@ hal_mac_tx_clr_mplen = 0x40000c10;
 hal_mac_get_txq_state = 0x40000c14;
 hal_mac_clr_txq_state = 0x40000c18;
 hal_mac_get_txq_complete = 0x40000c1c;
-hal_mac_deinit_twt_tx = 0x40000c20;
+/*hal_mac_deinit_twt_tx = 0x40000c20;*/
 hal_mac_is_dma_enable = 0x40000c24;
 hal_he_get_bss_color = 0x40000c28;
 hal_he_set_ersu = 0x40000c2c;
@@ -62,7 +62,7 @@ ic_get_he_rts_threshold_bytes = 0x40000c88;
 lmacAdjustTimestamp = 0x40000c8c;
 lmacDiscardAgedMSDU = 0x40000c90;
 lmacDiscardMSDU = 0x40000c94;
-lmacEndFrameExchangeSequence = 0x40000c98;
+/*lmacEndFrameExchangeSequence = 0x40000c98;*/
 lmacIsIdle = 0x40000c9c;
 lmacIsLongFrame = 0x40000ca0;
 lmacMSDUAged = 0x40000ca4;
@@ -81,12 +81,12 @@ lmacDisableTransmit = 0x40000cd4;
 lmacDiscardFrameExchangeSequence = 0x40000cd8;
 lmacProcessCollision = 0x40000cdc;
 lmacProcessAckTimeout = 0x40000ce0;
-lmacProcessShortRetryFail = 0x40000ce4;
+/*lmacProcessShortRetryFail = 0x40000ce4;*/
 lmacProcessCollisions_task = 0x40000ce8;
 lmacProcessTxRtsError = 0x40000cec;
 lmacProcessTxError = 0x40000cf0;
 lmacProcessCtsTimeout = 0x40000cf4;
-lmacProcessLongRetryFail = 0x40000cf8;
+/*lmacProcessLongRetryFail = 0x40000cf8;*/
 lmacRetryTxFrame = 0x40000cfc;
 lmacEndRetryAMPDUFail = 0x40000d00;
 lmacProcessTxSuccess = 0x40000d04;
@@ -129,7 +129,7 @@ pm_on_isr_set_twt_target = 0x40000d94;
 pm_on_isr_twt_wake = 0x40000d98;
 pm_on_tsf_timer = 0x40000d9c;
 pm_on_twt_force_tx = 0x40000da0;
-pm_parse_beacon = 0x40000da4;
+/*pm_parse_beacon = 0x40000da4;*/
 pm_process_tim = 0x40000da8;
 pm_rx_beacon_process = 0x40000dac;
 pm_rx_data_process = 0x40000db0;
@@ -145,13 +145,13 @@ pm_disconnected_wake = 0x40000dd4;
 /*pm_tx_data_process = 0x40000dd8;*/
 pm_is_twt_awake = 0x40000ddc;
 pm_enable_twt_keep_alive = 0x40000de0;
-pm_twt_on_tsf_timer = 0x40000de4;
+/*pm_twt_on_tsf_timer = 0x40000de4;*/
 pm_twt_process = 0x40000de8;
 pm_is_twt_start = 0x40000dec;
 pm_twt_set_target_wdev_time = 0x40000df0;
 pm_twt_set_target_tsf = 0x40000df4;
 pm_enable_twt_keep_alive_timer = 0x40000df8;
-pm_mac_try_enable_modem_state = 0x40000dfc;
+/*pm_mac_try_enable_modem_state = 0x40000dfc;*/
 pm_beacon_monitor_tbtt_timeout_process = 0x40000e00;
 /*pm_update_next_tbtt = 0x40000e04;*/
 pm_twt_disallow_tx = 0x40000e08;
@@ -209,11 +209,11 @@ ppDisableQueue = 0x40000ed4;
 ppCalVHTDeliNum = 0x40000ed8;
 ppCalTxVHTSMPDULength = 0x40000edc;
 ppCheckTxRTS = 0x40000ee0;
-ppProcessLifeTime = 0x40000ee4;
+/*ppProcessLifeTime = 0x40000ee4;*/
 ppProcTxCallback = 0x40000ee8;
 ppCalPreFecPaddingFactor = 0x40000eec;
 ppCalDeliNum = 0x40000ef0;
-ppRemoveHTC = 0x40000ef4;
+/*ppRemoveHTC = 0x40000ef4;*/
 ppCheckTxHEAMPDUlength = 0x40000ef8;
 ppCertSetRate = 0x40000efc;
 ppSelectTxFormat = 0x40000f00;
@@ -236,10 +236,10 @@ rcGetSched = 0x40000f40;
 rcLowerSched = 0x40000f44;
 rcSetTxAmpduLimit = 0x40000f48;
 rcTxUpdatePer = 0x40000f4c;
-rcUpdateAckSnr = 0x40000f50;
+/*rcUpdateAckSnr = 0x40000f50;*/
 rcUpdateRate = 0x40000f54;
-rcUpdateTxDone = 0x40000f58;
-rcUpdateTxDoneAmpdu2 = 0x40000f5c;
+/*rcUpdateTxDone = 0x40000f58;*/
+/*rcUpdateTxDoneAmpdu2 = 0x40000f5c;*/
 rcUpSched = 0x40000f60;
 rcReachRetryLimit = 0x40000f64;
 rcGetDCMMaxRate = 0x40000f68;
@@ -264,7 +264,7 @@ wDevCheckBlockError = 0x40000fac;
 wDev_DiscardFrame = 0x40000fb4;
 wDev_GetNoiseFloor = 0x40000fb8;
 wDev_IndicateAmpdu = 0x40000fbc;
-wDev_IndicateFrame = 0x40000fc0;
+/*wDev_IndicateFrame = 0x40000fc0;*/
 wdev_mac_reg_load = 0x40000fc4;
 wdev_mac_reg_store = 0x40000fc8;
 wdev_mac_special_reg_load = 0x40000fcc;

diff --git a/components/esp_wifi/include/esp_private/esp_wifi_he_types_private.h b/components/esp_wifi/include/esp_private/esp_wifi_he_types_private.h
@@ -430,6 +430,7 @@ typedef struct {
     int mubar;
     int bfrp;
     int nfrp;
+    int bar;
 } esp_test_rx_ctrl_t;
 
 typedef enum {
+ −		esp32/libcoexist.a
+ −		esp32c2/libcoexist.a
+ −		esp32c3/libcoexist.a
+ −		esp32c5/libcoexist.a
+ −		esp32c6/libcoexist.a
+ −		esp32h2/libcoexist.a
+ −		esp32s2/libcoexist.a
+ −		esp32s3/libcoexist.a