From a3f96471e42b31fa3e10a99ca28c531c75361ff3 Mon Sep 17 00:00:00 2001 From: liuning Date: Thu, 5 Jun 2025 20:48:46 +0800 Subject: [PATCH 1/5] fix(wifi): fix cant sleep if connection breaks during sending probe --- components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld index 454b2608b4d..9b374c811ff 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -57,7 +57,7 @@ lmac_stop_hw_txq = 0x40001df8; esf_buf_setup = 0x40001e0c; hal_crypto_set_key_entry = 0x40001e18; pm_start = 0x40001e34; -pm_stop = 0x40001e38; +/*pm_stop = 0x40001e38;*/ hal_set_sta_tbtt = 0x40001e4c; //pm_update_next_tbtt = 0x40001e50; pm_set_sleep_type = 0x40001e54; From 11536c7bcda82f784c481b557ecad2404cb021b0 Mon Sep 17 00:00:00 2001 From: liuning Date: Thu, 31 Oct 2024 17:22:56 +0800 Subject: [PATCH 2/5] fix(pm): fix ps none status check --- components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld index 1545e5454a3..b1b7edcdc88 100644 --- a/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld +++ b/components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld @@ -106,7 +106,7 @@ mac_tx_set_tb = 0x40000d38; mac_tx_set_mplen = 0x40000d3c; mac_tx_set_txop_q = 0x40000d40; mac_tx_set_pti = 0x40000d44; -pm_check_state = 0x40000d48; +/*pm_check_state = 0x40000d48;*/ pm_disable_dream_timer = 0x40000d4c; pm_disable_sleep_delay_timer = 0x40000d50; /*pm_dream = 0x40000d54;*/ From 027e174aa0058ad0ca9ad94ab59769cdb9163359 Mon Sep 17 00:00:00 2001 From: liuning Date: Fri, 1 Nov 2024 17:07:59 +0800 Subject: [PATCH 3/5] fix(pm): reserve txqblocks when mac init at offchannels --- components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld | 2 +- components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 2 +- components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld | 2 +- components/esp_rom/esp32c3/ld/esp32c3.rom.ld | 2 +- components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld | 2 +- components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld | 4 ++-- components/esp_rom/esp32s3/ld/esp32s3.rom.ld | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld index 9b374c811ff..48f40b79079 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld @@ -19,7 +19,7 @@ lmacDiscardMSDU = 0x40001b18; lmacEndFrameExchangeSequence = 0x40001b1c; lmacMSDUAged = 0x40001b28; //lmacSetTxFrame = 0x40001b4c; -pm_check_state = 0x40001b6c; +/* pm_check_state = 0x40001b6c; */ pm_dream = 0x40001b78; pm_on_beacon_rx = 0x40001ba0; //pm_parse_beacon = 0x40001bac; diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index e5ec55b3d13..a0a62510ad1 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -493,7 +493,7 @@ hal_mac_tx_get_blockack = 0x40001af4; /*hal_mac_tx_set_ppdu = 0x40001af8;*/ ic_get_trc = 0x40001afc; /* ic_mac_deinit = 0x40001b00; */ -ic_mac_init = 0x40001b04; +/* ic_mac_init = 0x40001b04; */ ic_interface_enabled = 0x40001b08; is_lmac_idle = 0x40001b0c; /*lmacAdjustTimestamp = 0x40001b10;*/ diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld index 5dec621359d..d10b0524dee 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld @@ -14,7 +14,7 @@ lmacTxDone = 0x4000162c; /*lmacTxFrame = 0x40001630;*/ mac_tx_set_htsig = 0x40001638; mac_tx_set_plcp1 = 0x40001640; -pm_check_state = 0x40001648; +/* pm_check_state = 0x40001648; */ /*pm_on_beacon_rx = 0x4000167c;*/ /*pm_parse_beacon = 0x40001688;*/ /*pm_process_tim = 0x4000168c;*/ diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld index 6d63dcfd986..954195f304b 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld @@ -683,7 +683,7 @@ hal_mac_tx_get_blockack = 0x400015d0; /* hal_mac_tx_set_ppdu = 0x400015d4;*/ ic_get_trc = 0x400015d8; /* ic_mac_deinit = 0x400015dc; */ -ic_mac_init = 0x400015e0; +/* ic_mac_init = 0x400015e0; */ ic_interface_enabled = 0x400015e4; is_lmac_idle = 0x400015e8; /*lmacAdjustTimestamp = 0x400015ec;*/ diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld index 7ff2770e505..9f640686ebf 100644 --- a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld +++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld @@ -31,7 +31,7 @@ hal_mac_tx_get_blockack = 0x40000bfc; //hal_mac_tx_set_ppdu = 0x40000c00; ic_get_trc = 0x40000c04; //ic_mac_deinit = 0x40000c08; -ic_mac_init = 0x40000c0c; +/* ic_mac_init = 0x40000c0c; */ ic_interface_enabled = 0x40000c10; is_lmac_idle = 0x40000c14; /*lmacAdjustTimestamp = 0x40000c18;*/ diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld index 1cb0a37bd1c..04aee41f522 100644 --- a/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld +++ b/components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld @@ -60,7 +60,7 @@ dbg_hal_check_clr_mplen_bitmap = 0x40000bdc; dbg_hal_check_set_mplen_bitmap = 0x40000be0; ic_get_trc = 0x40000be4; ic_mac_deinit = 0x40000be8; -ic_mac_init = 0x40000bec; +/* ic_mac_init = 0x40000bec; */ ic_interface_enabled = 0x40000bf0; is_lmac_idle = 0x40000bf4; ic_get_he_rts_threshold_bytes = 0x40000bf8; @@ -110,7 +110,7 @@ mac_tx_set_tb = 0x40000ca4; mac_tx_set_mplen = 0x40000ca8; mac_tx_set_txop_q = 0x40000cac; mac_tx_set_pti = 0x40000cb0; -pm_check_state = 0x40000cb4; +/* pm_check_state = 0x40000cb4; */ pm_disable_dream_timer = 0x40000cb8; pm_disable_sleep_delay_timer = 0x40000cbc; pm_dream = 0x40000cc0; diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld index 6cd7f0f08cb..86a98015e8c 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld @@ -936,7 +936,7 @@ hal_mac_tx_get_blockack = 0x400052b0; /* hal_mac_tx_set_ppdu = 0x400052bc;*/ ic_get_trc = 0x400052c8; /* ic_mac_deinit = 0x400052d4; */ -ic_mac_init = 0x400052e0; +/* ic_mac_init = 0x400052e0; */ ic_interface_enabled = 0x400052ec; is_lmac_idle = 0x400052f8; /*lmacAdjustTimestamp = 0x40005304;*/ From cd32a512fb8c91cd319adbbdeccdd18032497caf Mon Sep 17 00:00:00 2001 From: sibeibei Date: Fri, 11 Apr 2025 11:22:35 +0800 Subject: [PATCH 4/5] feat(coex): support backgorund scan for coex, fix some issues of scan when connected --- components/esp_wifi/include/esp_wifi_types_generic.h | 1 + 1 file changed, 1 insertion(+) diff --git a/components/esp_wifi/include/esp_wifi_types_generic.h b/components/esp_wifi/include/esp_wifi_types_generic.h index 285f5e6739a..c8598890540 100644 --- a/components/esp_wifi/include/esp_wifi_types_generic.h +++ b/components/esp_wifi/include/esp_wifi_types_generic.h @@ -244,6 +244,7 @@ typedef struct { wifi_scan_channel_bitmap_t channel_bitmap; /**< Channel bitmap for setting specific channels to be scanned. Please note that the 'channel' parameter above needs to be set to 0 to allow scanning by bitmap. Also, note that only allowed channels configured by wifi_country_t can be scanned. */ + bool coex_background_scan; /**< Enable it to scan return home channel under coexist */ } wifi_scan_config_t; /** From c0cdb94682e0806c2f0c6b1a0cbce67a582a8008 Mon Sep 17 00:00:00 2001 From: muhaidong Date: Mon, 29 Sep 2025 14:02:45 +0800 Subject: [PATCH 5/5] fix(wifi): fix some wifi bugs 20250929 1. fix scan done event miss issue 2. fix cant sleep if connection breaks during sending probe 3. fix some esp-now issues and lightsleep issues 4. feat(coex): support backgorund scan for coex, fix some issues of scan when connected --- components/esp_coex/lib | 2 +- components/esp_wifi/lib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_coex/lib b/components/esp_coex/lib index c62361f19c9..2d68674e3d5 160000 --- a/components/esp_coex/lib +++ b/components/esp_coex/lib @@ -1 +1 @@ -Subproject commit c62361f19c98a448255b53f8d31d3a23597e01e3 +Subproject commit 2d68674e3d522fb025e4666217f9cc1ca2af9399 diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 61c56d81241..eda58fb15f0 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 61c56d81241a74d4cb252293a79cc5d3e83989ca +Subproject commit eda58fb15f0cdd4cb8bac2b46ea97b31f0ef0316