From d092c1ba55d3ff4932572ba4e69c21d963e422e2 Mon Sep 17 00:00:00 2001
From: xuxiao <xuxiao@espressif.com>
Date: Mon, 21 Oct 2024 17:50:35 +0800
Subject: [PATCH] feat(wifi): add wifi support for esp32c5 eco1

---
 components/esp_phy/lib                        |  2 +-
 .../esp_rom/esp32c5/ld/esp32c5.rom.phy.ld     | 12 ++++++---
 .../esp_rom/esp32c5/ld/esp32c5.rom.pp.ld      | 26 ++++++++++++-------
 components/esp_wifi/lib                       |  2 +-
 .../wifi/iperf/sdkconfig.defaults.esp32c5     |  2 +-
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/components/esp_phy/lib b/components/esp_phy/lib
index 8fd02ff780..27f09b16e7 160000
--- a/components/esp_phy/lib
+++ b/components/esp_phy/lib
@@ -1 +1 @@
-Subproject commit 8fd02ff780e977e76e7ed78619629c8344f0fc50
+Subproject commit 27f09b16e732518b52c2ad4ff3ccfadefb21a809
diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.phy.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.phy.ld
index 9bd20793be..3c61a264b0 100644
--- a/components/esp_rom/esp32c5/ld/esp32c5.rom.phy.ld
+++ b/components/esp_rom/esp32c5/ld/esp32c5.rom.phy.ld
@@ -284,10 +284,14 @@ phy_wifi_set_tx_gain = 0x400014f4;
 phy_bt_get_tx_tab_ = 0x400014f8;
 phy_bt_set_tx_gain = 0x400014fc;
 phy_bt_tx_gain_init = 0x40001500;
-phy_pbus_xpd_rx_off = 0x40002518;
-phy_i2c_writeReg_Mask = 0x4000787e;
-phy_pbus_xpd_rx_on = 0x40002628;
-phy_pbus_xpd_tx_on = 0x4000274c;
+phy_pbus_xpd_rx_off = 0x40001528;
+phy_i2c_writeReg_Mask = 0x4000152c;
+phy_pbus_xpd_rx_on = 0x40001530;
+phy_pbus_xpd_tx_on = 0x40001534;
+phy_get_romfuncs = 0x40001538;
+phy_chip_set_chan_ana_ = 0x4000153c;
+phy_pbus_xpd_tx_off = 0x40001540;
 /* Data (.data, .bss, .rodata) */
 phy_rom_phyFuns = 0x4085fb80;
 phy_param_rom = 0x4085fc70;
+phy_rom_phyFuns_eco1 = 0x4085fc6c;
diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld
index 96c501f990..b63edf3cf5 100644
--- 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;
@@ -74,19 +74,19 @@ lmacReachLongLimit = 0x40000cb8;
 lmacReachShortLimit = 0x40000cbc;
 lmacRecycleMPDU = 0x40000cc0;
 lmacRxDone = 0x40000cc4;
-/*lmacSetTxFrame = 0x40000cc8;*/
+lmacSetTxFrame = 0x40000cc8;
 lmacTxDone = 0x40000ccc;
 lmacTxFrame = 0x40000cd0;
 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;
@@ -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;
@@ -260,7 +260,7 @@ trcAmpduSetState = 0x40000fa0;
 trc_set_bf_report_rate = 0x40000fa4;
 trc_onPPTxDone = 0x40000fa8;
 wDevCheckBlockError = 0x40000fac;
-/*wDev_AppendRxBlocks = 0x40000fb0;*/
+wDev_AppendRxBlocks = 0x40000fb0;
 wDev_DiscardFrame = 0x40000fb4;
 wDev_GetNoiseFloor = 0x40000fb8;
 wDev_IndicateAmpdu = 0x40000fbc;
@@ -335,6 +335,12 @@ is_use_muedca = 0x400010cc;
 pwr_hal_clear_mac_modem_state_wakeup_protect_signal = 0x400010d0;
 get_estimated_batime = 0x400010d4;
 get_sublen_offset = 0x400010d8;
+pm_coex_schm_overall_period_get = 0x40001504;
+ppRemoveHEAMPDUflags = 0x4000150c;
+tsf_hal_get_tbtt_interval = 0x40001510;
+pm_get_tbtt_count = 0x4000151c;
+tsf_hal_get_time = 0x40001520;
+tsf_hal_get_counter_value = 0x40001524;
 /* Data (.data, .bss, .rodata) */
 our_instances_ptr = 0x4004ffe0;
 pTxRx = 0x4085ff74;
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 952d21c8d1..9532814f14 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 952d21c8d1b5de2d966e3a0010317c41b060baad
+Subproject commit 9532814f14186bd643b2d8a65c957ed985a5ddee
diff --git a/examples/wifi/iperf/sdkconfig.defaults.esp32c5 b/examples/wifi/iperf/sdkconfig.defaults.esp32c5
index 7c3a67ad31..338b88f570 100644
--- a/examples/wifi/iperf/sdkconfig.defaults.esp32c5
+++ b/examples/wifi/iperf/sdkconfig.defaults.esp32c5
@@ -12,7 +12,7 @@ CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP_WIFI_RX_BA_WIN=22
 CONFIG_ESP_WIFI_NVS_ENABLED=n
 
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=57600
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=50400
 CONFIG_LWIP_TCP_WND_DEFAULT=65535
 CONFIG_LWIP_TCP_RECVMBOX_SIZE=48
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=64